includes: sort all includes
diff --git a/util/statetrace/arch/amd64/tracechild.cc b/util/statetrace/arch/amd64/tracechild.cc
index 5d3b660..1aec5ec 100644
--- a/util/statetrace/arch/amd64/tracechild.cc
+++ b/util/statetrace/arch/amd64/tracechild.cc
@@ -28,12 +28,13 @@
* Authors: Gabe Black
*/
-#include <iostream>
-#include <iomanip>
-#include <errno.h>
#include <sys/ptrace.h>
#include <stdint.h>
-#include <string.h>
+
+#include <cerrno>
+#include <cstring>
+#include <iomanip>
+#include <iostream>
#include "arch/amd64/tracechild.hh"
diff --git a/util/statetrace/arch/amd64/tracechild.hh b/util/statetrace/arch/amd64/tracechild.hh
index 6f28bc0..7adbec5 100644
--- a/util/statetrace/arch/amd64/tracechild.hh
+++ b/util/statetrace/arch/amd64/tracechild.hh
@@ -31,9 +31,10 @@
#ifndef REGSTATE_AMD64_HH
#define REGSTATE_AMD64_HH
-#include <sys/user.h>
-#include <sys/types.h>
#include <sys/ptrace.h>
+#include <sys/types.h>
+#include <sys/user.h>
+
#include <cassert>
#include <string>
diff --git a/util/statetrace/arch/arm/tracechild.cc b/util/statetrace/arch/arm/tracechild.cc
index 97b8d06..5dde3d5 100644
--- a/util/statetrace/arch/arm/tracechild.cc
+++ b/util/statetrace/arch/arm/tracechild.cc
@@ -41,11 +41,12 @@
* Gabe Black
*/
-#include <iostream>
-#include <errno.h>
#include <stdint.h>
-#include <cstring>
+
+#include <cerrno>
#include <cstdio>
+#include <cstring>
+#include <iostream>
#include "arch/arm/tracechild.hh"
diff --git a/util/statetrace/arch/arm/tracechild.hh b/util/statetrace/arch/arm/tracechild.hh
index f4e8ca6..9a4dc19 100644
--- a/util/statetrace/arch/arm/tracechild.hh
+++ b/util/statetrace/arch/arm/tracechild.hh
@@ -44,12 +44,13 @@
#ifndef TRACECHILD_ARM_HH
#define TRACECHILD_ARM_HH
+#include <sys/ptrace.h>
+#include <sys/user.h>
+
#include <cassert>
#include <string>
-#include <sys/user.h>
-#include <sys/ptrace.h>
-#include "base/tracechild.hh"
+#include "base/tracechild.hh"
class ARMTraceChild : public TraceChild
{
diff --git a/util/statetrace/arch/i686/tracechild.cc b/util/statetrace/arch/i686/tracechild.cc
index f9e3744..44508c1 100644
--- a/util/statetrace/arch/i686/tracechild.cc
+++ b/util/statetrace/arch/i686/tracechild.cc
@@ -28,11 +28,12 @@
* Authors: Gabe Black
*/
-#include <iostream>
-#include <errno.h>
#include <sys/ptrace.h>
#include <stdint.h>
+#include <cerrno>
+#include <iostream>
+
#include "arch/i686/tracechild.hh"
using namespace std;
diff --git a/util/statetrace/arch/i686/tracechild.hh b/util/statetrace/arch/i686/tracechild.hh
index 1c1a365..60bc5ed 100644
--- a/util/statetrace/arch/i686/tracechild.hh
+++ b/util/statetrace/arch/i686/tracechild.hh
@@ -31,9 +31,10 @@
#ifndef REGSTATE_I686_HH
#define REGSTATE_I686_HH
-#include <sys/user.h>
-#include <sys/types.h>
#include <sys/ptrace.h>
+#include <sys/types.h>
+#include <sys/user.h>
+
#include <cassert>
#include <string>
diff --git a/util/statetrace/arch/sparc/tracechild.cc b/util/statetrace/arch/sparc/tracechild.cc
index b18739e..fad4a00 100644
--- a/util/statetrace/arch/sparc/tracechild.cc
+++ b/util/statetrace/arch/sparc/tracechild.cc
@@ -28,11 +28,12 @@
* Authors: Gabe Black
*/
-#include <iostream>
-#include <errno.h>
#include <sys/ptrace.h>
#include <stdint.h>
+#include <cerrno>
+#include <iostream>
+
#include "arch/sparc/tracechild.hh"
using namespace std;
diff --git a/util/statetrace/arch/sparc/tracechild.hh b/util/statetrace/arch/sparc/tracechild.hh
index 2767060..30f7f26 100644
--- a/util/statetrace/arch/sparc/tracechild.hh
+++ b/util/statetrace/arch/sparc/tracechild.hh
@@ -32,12 +32,13 @@
#define TRACECHILD_SPARC_HH
#include <asm-sparc64/reg.h>
-#include <cassert>
-#include <ostream>
-#include <stdint.h>
-#include <string>
#include <sys/ptrace.h>
#include <sys/types.h>
+#include <stdint.h>
+
+#include <cassert>
+#include <ostream>
+#include <string>
#include "base/tracechild.hh"
