diff --git a/UserTools/Factory/Factory.cpp b/UserTools/Factory/Factory.cpp
index 0651246b9..c986c48b7 100644
--- a/UserTools/Factory/Factory.cpp
+++ b/UserTools/Factory/Factory.cpp
@@ -173,5 +173,6 @@ if (tool=="BeamQuality") ret=new BeamQuality;
 if (tool=="BackTracker") ret=new BackTracker;
 if (tool=="PrintDQ") ret=new PrintDQ;
 if (tool=="AssignBunchTimingMC") ret=new AssignBunchTimingMC;
+if (tool=="FitRWMWaveform") ret=new FitRWMWaveform;
 return ret;
 }
diff --git a/UserTools/Unity.h b/UserTools/Unity.h
index 5f43815d1..7e64d4e9b 100644
--- a/UserTools/Unity.h
+++ b/UserTools/Unity.h
@@ -181,3 +181,4 @@
 #include "BackTracker.h"
 #include "PrintDQ.h"
 #include "AssignBunchTimingMC.h"
+#include "FitRWMWaveform.h"