diff --git a/StRoot/StFwdUtils/StFwdAnalysisMaker.cxx b/StRoot/StFwdUtils/StFwdAnalysisMaker.cxx
index 8ff49c18799..96fe40f80e9 100644
--- a/StRoot/StFwdUtils/StFwdAnalysisMaker.cxx
+++ b/StRoot/StFwdUtils/StFwdAnalysisMaker.cxx
@@ -2,6 +2,7 @@
 #include "StFwdTrackMaker/Common.h"
 
 #include "TMath.h"
+#include "TVector3.h"
 
 #include <limits>
 #include <map>
@@ -39,6 +40,7 @@
 #include "StMuDSTMaker/COMMON/StMuDstMaker.h"
 #include "StMuDSTMaker/COMMON/StMuDst.h"
 #include "StMuDSTMaker/COMMON/StMuFwdTrack.h"
+#include "StMuDSTMaker/COMMON/StMuFwdTrackCollection.h"
 
 
 #include "tables/St_g2t_fts_hit_Table.h"
diff --git a/StRoot/StFwdUtils/StFwdAnalysisMaker.h b/StRoot/StFwdUtils/StFwdAnalysisMaker.h
index 0be9c1a611d..d5072c46fc5 100644
--- a/StRoot/StFwdUtils/StFwdAnalysisMaker.h
+++ b/StRoot/StFwdUtils/StFwdAnalysisMaker.h
@@ -1,23 +1,13 @@
 #ifndef ST_FWD_ANALYSIS_MAKER_H
 #define ST_FWD_ANALYSIS_MAKER_H
 
-#include "StChain/StMaker.h"
-#include "TVector3.h"
-// ROOT includes
-#include "TNtuple.h"
-#include "TTree.h"
-// STL includes
-#include <vector>
-#include <memory>
 #include <map>
 
-class StFwdTrack;
-
-
-class StFwdAnalysisMaker : public StMaker {
+#include "StChain/StMaker.h"
 
-    ClassDef(StFwdAnalysisMaker, 0);
 
+class StFwdAnalysisMaker : public StMaker
+{
   public:
     StFwdAnalysisMaker();
     ~StFwdAnalysisMaker(){/* nada */};
@@ -29,10 +19,11 @@ class StFwdAnalysisMaker : public StMaker {
     void ProcessFwdTracks();
     void ProcessFwdMuTracks();
 
-  private:
   protected:
 
-  std::map<TString, TH1*> mHists;
+    std::map<TString, TH1*> mHists;
+
+  ClassDef(StFwdAnalysisMaker, 0);
 };
 
 #endif