7 files changed, 12 insertions, 6 deletions
diff --git a/src/arch/x86/insts/badmicroop.cc b/src/arch/x86/insts/badmicroop.cc
index 96125f175..21af1281b 100644
--- a/src/arch/x86/insts/badmicroop.cc
+++ b/src/arch/x86/insts/badmicroop.cc
@@ -37,8 +37,9 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/generated/decoder.hh"
 #include "arch/x86/insts/badmicroop.hh"
+
+#include "arch/x86/generated/decoder.hh"
 #include "arch/x86/isa_traits.hh"
 
 namespace X86ISA
diff --git a/src/arch/x86/insts/microfpop.cc b/src/arch/x86/insts/microfpop.cc
index 000cbf635..52004d9ba 100644
--- a/src/arch/x86/insts/microfpop.cc
+++ b/src/arch/x86/insts/microfpop.cc
@@ -37,9 +37,10 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/insts/microfpop.hh"
+
 #include <string>
 
-#include "arch/x86/insts/microfpop.hh"
 #include "arch/x86/regs/misc.hh"
 
 namespace X86ISA
diff --git a/src/arch/x86/insts/microldstop.cc b/src/arch/x86/insts/microldstop.cc
index ea38ebfe1..e99e0b9f8 100644
--- a/src/arch/x86/insts/microldstop.cc
+++ b/src/arch/x86/insts/microldstop.cc
@@ -38,10 +38,10 @@
  * Authors: Gabe Black
  */
 
-#include <string>
-
 #include "arch/x86/insts/microldstop.hh"
 
+#include <string>
+
 namespace X86ISA
 {
     std::string LdStOp::generateDisassembly(Addr pc,
diff --git a/src/arch/x86/insts/micromediaop.cc b/src/arch/x86/insts/micromediaop.cc
index fa4d3a473..dc524dafe 100644
--- a/src/arch/x86/insts/micromediaop.cc
+++ b/src/arch/x86/insts/micromediaop.cc
@@ -28,9 +28,10 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/insts/micromediaop.hh"
+
 #include <string>
 
-#include "arch/x86/insts/micromediaop.hh"
 #include "arch/x86/regs/misc.hh"
 
 namespace X86ISA
diff --git a/src/arch/x86/insts/microop.cc b/src/arch/x86/insts/microop.cc
index 35ee9efaa..923fb15b0 100644
--- a/src/arch/x86/insts/microop.cc
+++ b/src/arch/x86/insts/microop.cc
@@ -38,6 +38,7 @@
  */
 
 #include "arch/x86/insts/microop.hh"
+
 #include "arch/x86/regs/misc.hh"
 
 namespace X86ISA
diff --git a/src/arch/x86/insts/microregop.cc b/src/arch/x86/insts/microregop.cc
index b49cda376..5bc6e2fd8 100644
--- a/src/arch/x86/insts/microregop.cc
+++ b/src/arch/x86/insts/microregop.cc
@@ -37,9 +37,10 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/insts/microregop.hh"
+
 #include <string>
 
-#include "arch/x86/insts/microregop.hh"
 #include "arch/x86/regs/misc.hh"
 #include "base/condcodes.hh"
 #include "debug/X86.hh"
diff --git a/src/arch/x86/insts/static_inst.cc b/src/arch/x86/insts/static_inst.cc
index 709e0a610..ff425f6bf 100644
--- a/src/arch/x86/insts/static_inst.cc
+++ b/src/arch/x86/insts/static_inst.cc
@@ -39,6 +39,7 @@
  */
 
 #include "arch/x86/insts/static_inst.hh"
+
 #include "arch/x86/regs/segment.hh"
 #include "cpu/reg_class.hh"