6 files changed, 8 insertions, 8 deletions
diff --git a/src/unittest/cprintftest.cc b/src/unittest/cprintftest.cc
index 6722ce6a3..ee5701d13 100644
--- a/src/unittest/cprintftest.cc
+++ b/src/unittest/cprintftest.cc
@@ -30,8 +30,8 @@
 
 #include <iostream>
 #include <list>
-#include <string>
 #include <sstream>
+#include <string>
 
 #include "base/cprintf.hh"
 #include "base/misc.hh"
diff --git a/src/unittest/cprintftime.cc b/src/unittest/cprintftime.cc
index f35e0aa25..3192d8e4d 100644
--- a/src/unittest/cprintftime.cc
+++ b/src/unittest/cprintftime.cc
@@ -30,8 +30,8 @@
 
 #include <iostream>
 #include <list>
-#include <string>
 #include <sstream>
+#include <string>
 
 #include "base/cprintf.hh"
 
diff --git a/src/unittest/initest.cc b/src/unittest/initest.cc
index 67ac44874..077b59d36 100644
--- a/src/unittest/initest.cc
+++ b/src/unittest/initest.cc
@@ -29,13 +29,13 @@
  *          Steve Reinhardt
  */
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <string>
 #include <vector>
 
-#include "base/inifile.hh"
 #include "base/cprintf.hh"
+#include "base/inifile.hh"
 
 using namespace std;
 
diff --git a/src/unittest/rangemaptest.cc b/src/unittest/rangemaptest.cc
index 5ea117cb8..af00e4e58 100644
--- a/src/unittest/rangemaptest.cc
+++ b/src/unittest/rangemaptest.cc
@@ -28,8 +28,8 @@
  * Authors: Ali Saidi
  */
 
-#include <iostream>
 #include <cassert>
+#include <iostream>
 
 #include "base/range_map.hh"
 #include "base/types.hh"
diff --git a/src/unittest/stattest.cc b/src/unittest/stattest.cc
index 529511c71..e7654ae5b 100644
--- a/src/unittest/stattest.cc
+++ b/src/unittest/stattest.cc
@@ -32,11 +32,11 @@
 #include <iostream>
 #include <string>
 
+#include "base/stats/mysql.hh"
+#include "base/stats/text.hh"
 #include "base/cprintf.hh"
 #include "base/misc.hh"
 #include "base/statistics.hh"
-#include "base/stats/text.hh"
-#include "base/stats/mysql.hh"
 #include "base/types.hh"
 #include "sim/core.hh"
 #include "sim/stat_control.hh"
diff --git a/src/unittest/symtest.cc b/src/unittest/symtest.cc
index 10ffb42e5..a40210ba7 100644
--- a/src/unittest/symtest.cc
+++ b/src/unittest/symtest.cc
@@ -30,8 +30,8 @@
 
 #include <iostream>
 
-#include "base/str.hh"
 #include "base/loader/symtab.hh"
+#include "base/str.hh"
 
 using namespace std;