3 files changed, 2 insertions, 11 deletions
diff --git a/src/mem/ruby/common/NetDest.hh b/src/mem/ruby/common/NetDest.hh
index 0e113c269..f982b7c38 100644
--- a/src/mem/ruby/common/NetDest.hh
+++ b/src/mem/ruby/common/NetDest.hh
@@ -37,9 +37,6 @@
 #include <iostream>
 #include <vector>
 
-#include "debug/RubyMemory.hh"
-#include "mem/protocol/MachineType.hh"
-#include "mem/ruby/common/Global.hh"
 #include "mem/ruby/common/Set.hh"
 #include "mem/ruby/system/MachineID.hh"
 
@@ -111,11 +108,7 @@ class NetDest
         return vec_index;
     }
 
-    NodeID
-    bitIndex(NodeID index) const
-    {
-        return index;
-    }
+    NodeID bitIndex(NodeID index) const { return index; }
 
     std::vector<Set> m_bits;  // a vector of bit vectors - i.e. Sets
 };
@@ -129,4 +122,3 @@ operator<<(std::ostream& out, const NetDest& obj)
 }
 
 #endif // __MEM_RUBY_COMMON_NETDEST_HH__
-
diff --git a/src/mem/ruby/common/Set.cc b/src/mem/ruby/common/Set.cc
index 7ab03c5aa..c674655ab 100644
--- a/src/mem/ruby/common/Set.cc
+++ b/src/mem/ruby/common/Set.cc
@@ -29,11 +29,11 @@
 // modified (rewritten) 05/20/05 by Dan Gibson to accomimdate FASTER
 // >32 bit set sizes
 
+#include <cassert>
 #include <cstdio>
 
 #include "base/misc.hh"
 #include "mem/ruby/common/Set.hh"
-#include "mem/ruby/system/System.hh"
 
 Set::Set()
 {
diff --git a/src/mem/ruby/common/SubBlock.hh b/src/mem/ruby/common/SubBlock.hh
index 6edb82ecc..35e99b956 100644
--- a/src/mem/ruby/common/SubBlock.hh
+++ b/src/mem/ruby/common/SubBlock.hh
@@ -34,7 +34,6 @@
 
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/DataBlock.hh"
-#include "mem/ruby/common/Global.hh"
 
 class SubBlock
 {