diff --git a/cpu/simple/cpu.hh b/cpu/simple/cpu.hh
index 30fea0f86..0fb6235b4 100644
--- a/cpu/simple/cpu.hh
+++ b/cpu/simple/cpu.hh
@@ -36,6 +36,9 @@
 #include "cpu/pc_event.hh"
 #include "cpu/sampler/sampler.hh"
 #include "cpu/static_inst.hh"
+#include "mem/packet.hh"
+#include "mem/port.hh"
+#include "mem/request.hh"
 #include "sim/eventq.hh"
 
 // forward declarations
diff --git a/mem/port.hh b/mem/port.hh
index 1cbb18f00..81150b2a3 100644
--- a/mem/port.hh
+++ b/mem/port.hh
@@ -46,14 +46,6 @@
 #include "mem/packet.hh"
 #include "mem/request.hh"
 
-/** The immediate result of a Send call.  Can be used to determine if a fast path
-    access can occur, or if a retry may come. */
-enum SendResult
-{
-    Success,
-    Failure
-};
-
 /**
  * Ports are used to interface memory objects to
  * each other.  They will always come in pairs, and we refer to the other