diff --git a/slsReceiverSoftware/include/CircularFifo.h b/slsReceiverSoftware/include/CircularFifo.h
index 4f88de63d..2fba93459 100755
--- a/slsReceiverSoftware/include/CircularFifo.h
+++ b/slsReceiverSoftware/include/CircularFifo.h
@@ -29,7 +29,6 @@ template <typename Element> class CircularFifo {
         sem_init(&free_mutex, 0, size);
     }
 
-    
     CircularFifo(const CircularFifo &) = delete;
     CircularFifo(CircularFifo&&) = delete;
 
diff --git a/slsReceiverSoftware/include/Receiver.h b/slsReceiverSoftware/include/Receiver.h
index dc0bc5e35..7a26b66a9 100755
--- a/slsReceiverSoftware/include/Receiver.h
+++ b/slsReceiverSoftware/include/Receiver.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "ClientInterface.h"
 #include "sls_detector_defs.h"
-
 #include <memory>
 
+class ClientInterface;
+
 class Receiver : private virtual slsDetectorDefs {
 	
  public:
@@ -26,6 +26,8 @@ class Receiver : private virtual slsDetectorDefs {
 	 */
 	Receiver(int tcpip_port_no = 1954);
 
+	~Receiver();
+
 	/**
 	 * get get Receiver Version
 	 \returns id
diff --git a/slsReceiverSoftware/include/BinaryFile.h b/slsReceiverSoftware/src/BinaryFile.h
similarity index 100%
rename from slsReceiverSoftware/include/BinaryFile.h
rename to slsReceiverSoftware/src/BinaryFile.h
diff --git a/slsReceiverSoftware/include/BinaryFileStatic.h b/slsReceiverSoftware/src/BinaryFileStatic.h
similarity index 100%
rename from slsReceiverSoftware/include/BinaryFileStatic.h
rename to slsReceiverSoftware/src/BinaryFileStatic.h
diff --git a/slsReceiverSoftware/include/ClientInterface.h b/slsReceiverSoftware/src/ClientInterface.h
similarity index 100%
rename from slsReceiverSoftware/include/ClientInterface.h
rename to slsReceiverSoftware/src/ClientInterface.h
diff --git a/slsReceiverSoftware/include/DataProcessor.h b/slsReceiverSoftware/src/DataProcessor.h
similarity index 100%
rename from slsReceiverSoftware/include/DataProcessor.h
rename to slsReceiverSoftware/src/DataProcessor.h
diff --git a/slsReceiverSoftware/include/DataStreamer.h b/slsReceiverSoftware/src/DataStreamer.h
similarity index 100%
rename from slsReceiverSoftware/include/DataStreamer.h
rename to slsReceiverSoftware/src/DataStreamer.h
diff --git a/slsReceiverSoftware/include/Fifo.h b/slsReceiverSoftware/src/Fifo.h
similarity index 100%
rename from slsReceiverSoftware/include/Fifo.h
rename to slsReceiverSoftware/src/Fifo.h
diff --git a/slsReceiverSoftware/include/File.h b/slsReceiverSoftware/src/File.h
similarity index 100%
rename from slsReceiverSoftware/include/File.h
rename to slsReceiverSoftware/src/File.h
diff --git a/slsReceiverSoftware/include/GeneralData.h b/slsReceiverSoftware/src/GeneralData.h
similarity index 100%
rename from slsReceiverSoftware/include/GeneralData.h
rename to slsReceiverSoftware/src/GeneralData.h
diff --git a/slsReceiverSoftware/include/HDF5File.h b/slsReceiverSoftware/src/HDF5File.h
similarity index 100%
rename from slsReceiverSoftware/include/HDF5File.h
rename to slsReceiverSoftware/src/HDF5File.h
diff --git a/slsReceiverSoftware/include/HDF5FileStatic.h b/slsReceiverSoftware/src/HDF5FileStatic.h
similarity index 100%
rename from slsReceiverSoftware/include/HDF5FileStatic.h
rename to slsReceiverSoftware/src/HDF5FileStatic.h
diff --git a/slsReceiverSoftware/include/Implementation.h b/slsReceiverSoftware/src/Implementation.h
similarity index 100%
rename from slsReceiverSoftware/include/Implementation.h
rename to slsReceiverSoftware/src/Implementation.h
diff --git a/slsReceiverSoftware/include/Listener.h b/slsReceiverSoftware/src/Listener.h
similarity index 100%
rename from slsReceiverSoftware/include/Listener.h
rename to slsReceiverSoftware/src/Listener.h
diff --git a/slsReceiverSoftware/src/Receiver.cpp b/slsReceiverSoftware/src/Receiver.cpp
index 7b2b04b4a..e3bde8f1f 100755
--- a/slsReceiverSoftware/src/Receiver.cpp
+++ b/slsReceiverSoftware/src/Receiver.cpp
@@ -1,4 +1,5 @@
 #include "Receiver.h"
+#include "ClientInterface.h"
 #include "sls_detector_exceptions.h"
 #include "versionAPI.h"
 #include "container_utils.h" 
@@ -13,6 +14,7 @@
 #include <string>
 #include <syscall.h>
 
+Receiver::~Receiver() = default;
 
 Receiver::Receiver(int argc, char *argv[]):
 		tcpipInterface (nullptr) {
diff --git a/slsReceiverSoftware/include/ThreadObject.h b/slsReceiverSoftware/src/ThreadObject.h
similarity index 100%
rename from slsReceiverSoftware/include/ThreadObject.h
rename to slsReceiverSoftware/src/ThreadObject.h
diff --git a/slsReceiverSoftware/src/main.cpp b/slsReceiverSoftware/src/main.cpp
index ef99ab8a7..e30785470 100755
--- a/slsReceiverSoftware/src/main.cpp
+++ b/slsReceiverSoftware/src/main.cpp
@@ -4,6 +4,7 @@
 #include "logger.h"
 #include "Receiver.h"
 #include "sls_detector_defs.h"
+#include "container_utils.h"
 
 #include <csignal>	//SIGINT
 #include <cstdlib>		//system
diff --git a/slsReceiverSoftware/src/multiReceiver.cpp b/slsReceiverSoftware/src/multiReceiver.cpp
index 87fd37b6e..b6c0c24e5 100755
--- a/slsReceiverSoftware/src/multiReceiver.cpp
+++ b/slsReceiverSoftware/src/multiReceiver.cpp
@@ -18,6 +18,7 @@ It is linked in manual/manual-api from slsReceiverSoftware/include ]
 
 #include "sls_detector_defs.h"
 #include "Receiver.h"
+#include "container_utils.h"
 
 #include <csignal>	//SIGINT
 #include <cstdlib>	//system
diff --git a/slsReceiverSoftware/include/receiver_defs.h b/slsReceiverSoftware/src/receiver_defs.h
similarity index 98%
rename from slsReceiverSoftware/include/receiver_defs.h
rename to slsReceiverSoftware/src/receiver_defs.h
index 7e591c374..8fc71782c 100755
--- a/slsReceiverSoftware/include/receiver_defs.h
+++ b/slsReceiverSoftware/src/receiver_defs.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "sls_detector_defs.h"
-#include <stdint.h> 
+#include <cstdint> 
 
 #define MAX_DIMENSIONS					(2)
 #define MAX_NUMBER_OF_LISTENING_THREADS (2)
diff --git a/slsReceiverSoftware/tests/CMakeLists.txt b/slsReceiverSoftware/tests/CMakeLists.txt
index a23a7a637..0766f44be 100755
--- a/slsReceiverSoftware/tests/CMakeLists.txt
+++ b/slsReceiverSoftware/tests/CMakeLists.txt
@@ -2,4 +2,6 @@ target_sources(tests PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/test-GeneralData.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test-FileNames.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test-CircularFifo.cpp
-)
\ No newline at end of file
+)
+
+target_include_directories(tests PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../src>")
\ No newline at end of file