diff --git a/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/AlgoDataTypes.h b/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/AlgoDataTypes.h
index 81b67922005bdcab75c92c8d040740aa4fce3870..1287d8375586730dfcf43c4c0ec7ca0d76379e62 100644
--- a/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/AlgoDataTypes.h
+++ b/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/AlgoDataTypes.h
@@ -5,9 +5,10 @@
 #ifndef GLOBALSIM_ALGODATATYPES_H
 #define GLOBALSIM_ALGODATATYPES_H
 
-#include "AlgoConstants.h"
+//need the << operator on these two
 #include "GenericTob.h"
 #include "eEmTob.h"
+
 #include <bitset>
 #include <ostream>
 #include <vector>
@@ -17,10 +18,7 @@ namespace GlobalSim {
 
   template<typename BITSET>
   int bitSetToInt(BITSET bitset) {
-
-
     if (!bitset[bitset.size()-1]) { return bitset.to_ulong();}
-
     bitset.flip();
     return -(bitset.to_ulong() + 1);
   }
diff --git a/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.cxx b/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.cxx
index 9ce12af97e283bcfdcdbe94a5ebf960b9ed50dc8..a47fbae5dd3c83c215134479f94a86e737331d03 100644
--- a/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.cxx
+++ b/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.cxx
@@ -4,6 +4,7 @@
 
 
 #include "GenericTob.h"
+#include "AlgoDataTypes.h"
 
 namespace GlobalSim {
 
diff --git a/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.h b/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.h
index 124f873d5563f1bb21e34ac4b218132d9c14f0fe..208b3f9d43f2a8e9bc016957ab16f45d95e1e5c9 100644
--- a/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.h
+++ b/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.h
@@ -5,15 +5,9 @@
 #ifndef GLOBALSIM_GENERICTOB_H
 #define GLOBALSIM_GENERICTOB_H
 
-
-#include "AlgoConstants.h"
-#include "AlgoDataTypes.h"
-#include "eEmTob.h"
-
+#include "eEmTob.h" //for eEmTobPtr
 #include <bitset>
-#include <ostream>
-#include <vector>
-#include <memory>
+#include <iosfwd>
 
 namespace GlobalSim {