diff --git a/src/arch/x86/linux/system.cc b/src/arch/x86/linux/system.cc
index 9827638e7..f750019a8 100644
--- a/src/arch/x86/linux/system.cc
+++ b/src/arch/x86/linux/system.cc
@@ -37,6 +37,7 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/isa_traits.hh"
 #include "arch/x86/linux/system.hh"
 #include "arch/x86/regs/int.hh"
 #include "arch/vtophys.hh"
@@ -44,6 +45,7 @@
 #include "cpu/thread_context.hh"
 #include "mem/physical.hh"
 #include "params/LinuxX86System.hh"
+#include "sim/byteswap.hh"
 
 
 using namespace LittleEndianGuest;
diff --git a/src/arch/x86/stacktrace.cc b/src/arch/x86/stacktrace.cc
index 87767583b..e2ec04fa7 100644
--- a/src/arch/x86/stacktrace.cc
+++ b/src/arch/x86/stacktrace.cc
@@ -37,6 +37,7 @@
 #include "base/trace.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
+#include "mem/vport.hh"
 #include "sim/system.hh"
 
 using namespace std;