diff --git a/apps/srt-live-transmit.cpp b/apps/srt-live-transmit.cpp
index a4ed93a29..0a918e6b0 100644
--- a/apps/srt-live-transmit.cpp
+++ b/apps/srt-live-transmit.cpp
@@ -65,7 +65,7 @@
 #include <thread>
 #include <list>
 
-
+#include "srt_compat.h"
 #include "apputil.hpp"  // CreateAddr
 #include "uriparser.hpp"  // UriParser
 #include "socketoptions.hpp"
diff --git a/apps/srt-tunnel.cpp b/apps/srt-tunnel.cpp
index 569a0c26e..90bd43eae 100644
--- a/apps/srt-tunnel.cpp
+++ b/apps/srt-tunnel.cpp
@@ -27,6 +27,7 @@
 #include <mutex>
 #include <condition_variable>
 
+#include "srt_compat.h"
 #include "apputil.hpp"  // CreateAddr
 #include "uriparser.hpp"  // UriParser
 #include "socketoptions.hpp"
diff --git a/srtcore/common.cpp b/srtcore/common.cpp
index fe5217dfd..6d747ecaa 100644
--- a/srtcore/common.cpp
+++ b/srtcore/common.cpp
@@ -68,8 +68,6 @@ modified by
 #include "packet.h"
 #include "threadname.h"
 
-#include <srt_compat.h> // SysStrError
-
 using namespace std;
 using namespace srt::sync;
 using namespace srt_logging;
diff --git a/srtcore/logging.cpp b/srtcore/logging.cpp
index ee9270b03..d0ba3fd4a 100644
--- a/srtcore/logging.cpp
+++ b/srtcore/logging.cpp
@@ -14,7 +14,7 @@ written by
  *****************************************************************************/
 
 
-
+#include "srt_compat.h"
 #include "logging.h"
 
 using namespace std;
diff --git a/srtcore/logging.h b/srtcore/logging.h
index 993f8ad2c..3abfe0326 100644
--- a/srtcore/logging.h
+++ b/srtcore/logging.h
@@ -33,7 +33,6 @@ written by
 #include "utilities.h"
 #include "threadname.h"
 #include "logging_api.h"
-#include "srt_compat.h"
 #include "sync.h"
 
 #ifdef __GNUC__