diff --git a/src/libraries/JANA/Engine/JExecutionEngine.cc b/src/libraries/JANA/Engine/JExecutionEngine.cc index 1879accfd..132b6cdc2 100644 --- a/src/libraries/JANA/Engine/JExecutionEngine.cc +++ b/src/libraries/JANA/Engine/JExecutionEngine.cc @@ -13,6 +13,7 @@ #include #include #include +#include thread_local int jana2_worker_id = -1; thread_local JBacktrace* jana2_worker_backtrace = nullptr; diff --git a/src/libraries/JANA/JApplicationFwd.h b/src/libraries/JANA/JApplicationFwd.h index f98d866fc..a976f659e 100644 --- a/src/libraries/JANA/JApplicationFwd.h +++ b/src/libraries/JANA/JApplicationFwd.h @@ -26,7 +26,6 @@ class JApplication; extern JApplication* japp; #include -#include #include diff --git a/src/libraries/JANA/Topology/JTopologyBuilder.h b/src/libraries/JANA/Topology/JTopologyBuilder.h index ce3f0676c..685efc09f 100644 --- a/src/libraries/JANA/Topology/JTopologyBuilder.h +++ b/src/libraries/JANA/Topology/JTopologyBuilder.h @@ -9,7 +9,6 @@ #include #include #include -#include // TODO: Should't be here #include #include @@ -18,8 +17,6 @@ class JParameterManager; class JComponentManager; class JArrow; -class JQueue; -class JQueue; class JFoldArrow; class JUnfoldArrow; @@ -44,7 +41,6 @@ class JTopologyBuilder : public JService { // Things that probably shouldn't be here std::function m_configure_topology; JEventPool* event_pool = nullptr; // TODO: Move into pools eventually - JPerfMetrics metrics; JProcessorMapping mapping; public: