diff -r f48f031fef13 -r b007a030d5a1 src/mem/ruby/common/Set.hh
--- a/src/mem/ruby/common/Set.hh	Tue Jan 03 18:08:32 2012 -0600
+++ b/src/mem/ruby/common/Set.hh	Tue Jan 03 18:12:22 2012 -0600
@@ -35,8 +35,20 @@
 #include <iostream>
 #include <limits>
 
-#include "mem/ruby/common/Global.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/common/TypeDefines.hh"
+
+/*
+ * This defines the number of longs (32-bits on 32 bit machines,
+ * 64-bit on 64-bit AMD machines) to use to hold the set...
+ * the default is 4, allowing 128 or 256 different members
+ * of the set.
+ *
+ * This should never need to be changed for correctness reasons,
+ * though increasing it will increase performance for larger
+ * set sizes at the cost of a (much) larger memory footprint
+ *
+ */
+const int NUMBER_WORDS_PER_SET = 1;
 
 class Set
 {
diff -r f48f031fef13 -r b007a030d5a1 src/mem/ruby/system/System.hh
--- a/src/mem/ruby/system/System.hh	Tue Jan 03 18:08:32 2012 -0600
+++ b/src/mem/ruby/system/System.hh	Tue Jan 03 18:12:22 2012 -0600
@@ -49,19 +49,6 @@
 class Network;
 class Profiler;
 
-/*
- * This defines the number of longs (32-bits on 32 bit machines,
- * 64-bit on 64-bit AMD machines) to use to hold the set...
- * the default is 4, allowing 128 or 256 different members
- * of the set.
- *
- * This should never need to be changed for correctness reasons,
- * though increasing it will increase performance for larger
- * set sizes at the cost of a (much) larger memory footprint
- *
- */
-const int NUMBER_WORDS_PER_SET = 1;
-
 class RubySystem : public SimObject
 {
   public: