diff --git a/libs/rapidjson/rapidjson/document.h b/libs/rapidjson/rapidjson/document.h
index e3e20dfbd..f4073113d 100755
--- a/libs/rapidjson/rapidjson/document.h
+++ b/libs/rapidjson/rapidjson/document.h
@@ -17,13 +17,13 @@
 
 /*! \file document.h */
 
-#include "reader.h"
+#include "encodedstream.h"
 #include "internal/meta.h"
 #include "internal/strfunc.h"
 #include "memorystream.h"
-#include "encodedstream.h"
-#include <new>      // placement new
+#include "reader.h"
 #include <limits>
+#include <new>      // placement new
 
 RAPIDJSON_DIAG_PUSH
 #ifdef _MSC_VER
diff --git a/libs/rapidjson/rapidjson/encodedstream.h b/libs/rapidjson/rapidjson/encodedstream.h
index 145068386..252fdd575 100755
--- a/libs/rapidjson/rapidjson/encodedstream.h
+++ b/libs/rapidjson/rapidjson/encodedstream.h
@@ -15,8 +15,8 @@
 #ifndef RAPIDJSON_ENCODEDSTREAM_H_
 #define RAPIDJSON_ENCODEDSTREAM_H_
 
-#include "stream.h"
 #include "memorystream.h"
+#include "stream.h"
 
 #ifdef __GNUC__
 RAPIDJSON_DIAG_PUSH
diff --git a/libs/rapidjson/rapidjson/internal/strtod.h b/libs/rapidjson/rapidjson/internal/strtod.h
index 289c413b0..2bcbc8df9 100755
--- a/libs/rapidjson/rapidjson/internal/strtod.h
+++ b/libs/rapidjson/rapidjson/internal/strtod.h
@@ -15,9 +15,9 @@
 #ifndef RAPIDJSON_STRTOD_
 #define RAPIDJSON_STRTOD_
 
-#include "ieee754.h"
 #include "biginteger.h"
 #include "diyfp.h"
+#include "ieee754.h"
 #include "pow10.h"
 
 RAPIDJSON_NAMESPACE_BEGIN
diff --git a/libs/rapidjson/rapidjson/rapidjson.h b/libs/rapidjson/rapidjson/rapidjson.h
index 053b2ce43..daf30fe00 100755
--- a/libs/rapidjson/rapidjson/rapidjson.h
+++ b/libs/rapidjson/rapidjson/rapidjson.h
@@ -164,8 +164,8 @@
 #include "msinttypes/inttypes.h"
 #else
 // Other compilers should have this.
-#include <stdint.h>
 #include <inttypes.h>
+#include <stdint.h>
 #endif
 //!@endcond
 #ifdef RAPIDJSON_DOXYGEN_RUNNING
diff --git a/libs/rapidjson/rapidjson/reader.h b/libs/rapidjson/rapidjson/reader.h
index 19f8849b1..d196d54a9 100755
--- a/libs/rapidjson/rapidjson/reader.h
+++ b/libs/rapidjson/rapidjson/reader.h
@@ -18,11 +18,11 @@
 /*! \file reader.h */
 
 #include "allocators.h"
-#include "stream.h"
 #include "encodedstream.h"
 #include "internal/meta.h"
 #include "internal/stack.h"
 #include "internal/strtod.h"
+#include "stream.h"
 #include <limits>
 
 #if defined(RAPIDJSON_SIMD) && defined(_MSC_VER)
diff --git a/slsDetectorSoftware/include/detectorData.h b/slsDetectorSoftware/include/detectorData.h
index 9be0215ca..528def82d 100755
--- a/slsDetectorSoftware/include/detectorData.h
+++ b/slsDetectorSoftware/include/detectorData.h
@@ -1,5 +1,5 @@
-#include <unistd.h>
 #include <cstring>
+#include <unistd.h>
 #pragma once
 /**
    @short data structure to hold the detector data after postprocessing
diff --git a/slsDetectorSoftware/src/CmdProxy.h b/slsDetectorSoftware/src/CmdProxy.h
index 4e4a3e0f7..51a88adbc 100644
--- a/slsDetectorSoftware/src/CmdProxy.h
+++ b/slsDetectorSoftware/src/CmdProxy.h
@@ -2,8 +2,8 @@
 
 #include "Detector.h"
 #include "Result.h"
-#include "sls_detector_exceptions.h"
 #include "network_utils.h"
+#include "sls_detector_exceptions.h"
 #include <iostream>
 #include <map>
 #include <string>
diff --git a/slsDetectorSoftware/src/multiSlsDetector.cpp b/slsDetectorSoftware/src/multiSlsDetector.cpp
index 6154122b0..a6773b9d4 100755
--- a/slsDetectorSoftware/src/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/src/multiSlsDetector.cpp
@@ -8,10 +8,10 @@
 #include "sls_detector_exceptions.h"
 #include "versionAPI.h"
 
+#include "ToString.h"
 #include "container_utils.h"
 #include "network_utils.h"
 #include "string_utils.h"
-#include "ToString.h"
 
 #include <cstring>
 #include <iomanip>
diff --git a/slsDetectorSoftware/src/slsDetector.cpp b/slsDetectorSoftware/src/slsDetector.cpp
index c3f75ad2c..9f877e8e6 100755
--- a/slsDetectorSoftware/src/slsDetector.cpp
+++ b/slsDetectorSoftware/src/slsDetector.cpp
@@ -1,12 +1,12 @@
 #include "slsDetector.h"
 #include "ClientSocket.h"
 #include "SharedMemory.h"
+#include "ToString.h"
 #include "file_utils.h"
 #include "network_utils.h"
 #include "sls_detector_exceptions.h"
 #include "string_utils.h"
 #include "versionAPI.h"
-#include "ToString.h"
 
 #include <arpa/inet.h>
 #include <array>
diff --git a/slsSupportLib/include/ToString.h b/slsSupportLib/include/ToString.h
index 0b7bbb32d..6e9cca336 100644
--- a/slsSupportLib/include/ToString.h
+++ b/slsSupportLib/include/ToString.h
@@ -9,9 +9,9 @@
 
 #include "TimeHelper.h"
 #include "TypeTraits.h"
+#include "sls_detector_defs.h"
 #include "sls_detector_exceptions.h"
 #include "string_utils.h"
-#include "sls_detector_defs.h"
 #include <chrono>
 #include <iomanip>
 #include <sstream>
diff --git a/slsSupportLib/include/ZmqSocket.h b/slsSupportLib/include/ZmqSocket.h
index 2e2f23d26..216bde8af 100755
--- a/slsSupportLib/include/ZmqSocket.h
+++ b/slsSupportLib/include/ZmqSocket.h
@@ -10,15 +10,15 @@
 #include "ansi.h"
 #include "sls_detector_exceptions.h"
 
-#include <iostream>
-#include <zmq.h>
-#include <errno.h>
-#include <netdb.h>				//gethostbyname()
 #include <arpa/inet.h>			//inet_ntoa
+#include <errno.h>
+#include <iostream>
+#include <netdb.h>				//gethostbyname()
 #include <rapidjson/document.h> //json header in zmq stream
 #include <string.h>
 #include <unistd.h> 			//usleep in some machines
 #include <vector>
+#include <zmq.h>
 using namespace rapidjson;
 
 
diff --git a/slsSupportLib/include/file_utils.h b/slsSupportLib/include/file_utils.h
index 0b9ceadbb..dd208e62d 100755
--- a/slsSupportLib/include/file_utils.h
+++ b/slsSupportLib/include/file_utils.h
@@ -3,9 +3,9 @@
 
 #include "sls_detector_defs.h"
 
-#include <string>
+#include <cstdio>
 #include <fstream>
-#include <stdio.h>
+#include <string>
 
 
 /** (used by multi and sls)
diff --git a/slsSupportLib/include/logger.h b/slsSupportLib/include/logger.h
index 8de0c2f49..3715532a7 100755
--- a/slsSupportLib/include/logger.h
+++ b/slsSupportLib/include/logger.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <sstream>
-#include <string>
-#include <stdio.h>
-#include <unistd.h>
 #include <ansi.h>
+#include <sstream>
+#include <stdio.h>
+#include <string>
+#include <unistd.h>
 
 
 
diff --git a/slsSupportLib/include/network_utils.h b/slsSupportLib/include/network_utils.h
index df411468d..82ac96b2f 100755
--- a/slsSupportLib/include/network_utils.h
+++ b/slsSupportLib/include/network_utils.h
@@ -1,7 +1,7 @@
 #pragma once
+#include <array>
 #include <iostream>
 #include <string>
-#include <array>
 
 namespace sls {
 
@@ -10,8 +10,8 @@ class IpAddr {
     uint32_t addr_{0};
 
   public:
-    constexpr IpAddr() noexcept{}
-    constexpr IpAddr(uint32_t address) noexcept : addr_{address} {}
+    constexpr IpAddr() noexcept = default;
+    explicit constexpr IpAddr(uint32_t address) noexcept : addr_{address} {}
     IpAddr(const std::string &address);
     IpAddr(const char *address);
     std::string str() const;
@@ -38,8 +38,8 @@ class MacAddr {
     std::string to_hex(const char delimiter = 0) const;
 
   public:
-    constexpr MacAddr() noexcept{}
-    constexpr MacAddr(uint64_t mac) noexcept : addr_{mac} {}
+    constexpr MacAddr() noexcept = default;
+    explicit constexpr MacAddr(uint64_t mac) noexcept : addr_{mac} {}
     MacAddr(std::string mac);
     MacAddr(const char *address);
     std::string str() const;
diff --git a/slsSupportLib/include/sls_detector_defs.h b/slsSupportLib/include/sls_detector_defs.h
index 3f01b9e68..5e6823adf 100755
--- a/slsSupportLib/include/sls_detector_defs.h
+++ b/slsSupportLib/include/sls_detector_defs.h
@@ -20,8 +20,8 @@
 //C++ includes
 #include "sls_detector_exceptions.h"
 #include <algorithm>
-#include <cstdint>
 #include <bitset>
+#include <cstdint>
 #include <string>
 #else
 //C includes
diff --git a/slsSupportLib/include/sls_detector_exceptions.h b/slsSupportLib/include/sls_detector_exceptions.h
index 2d3fc3dd5..af00c0515 100755
--- a/slsSupportLib/include/sls_detector_exceptions.h
+++ b/slsSupportLib/include/sls_detector_exceptions.h
@@ -54,7 +54,7 @@ public:
 	GuiError(const std::string& msg):RuntimeError(msg) {}
 };
 
-} //  namespce sls
+} //  namespace sls