diff --git a/slsDetectorServers/matterhonServer/include/BaseMatterhornServer.h b/slsDetectorServers/matterhonServer/include/BaseMatterhornServer.h
index 7dbec3502..64acfedd6 100644
--- a/slsDetectorServers/matterhonServer/include/BaseMatterhornServer.h
+++ b/slsDetectorServers/matterhonServer/include/BaseMatterhornServer.h
@@ -6,7 +6,11 @@
 #include "sls/sls_detector_defs.h"
 #include "sls/versionAPI.h"
 #include <array>
+#include <cstring>
+#include <functional>
 #include <memory>
+#include <string>
+#include <unordered_map>
 
 namespace sls {
 
diff --git a/slsDetectorServers/matterhonServer/include/StopServer.h b/slsDetectorServers/matterhonServer/include/StopServer.h
index f7a195c32..ff314a69f 100644
--- a/slsDetectorServers/matterhonServer/include/StopServer.h
+++ b/slsDetectorServers/matterhonServer/include/StopServer.h
@@ -3,7 +3,7 @@
 
 namespace sls {
 
-// TODO: should this inherit from MatterhornServer or a base class
+// TODO: should this inherit from MatterhornServer or a base class - depending on virtual or not 
 class StopServer : public MatterhornServer {
   public:
     StopServer(uint16_t port);