diff --git a/src/zm_rtsp_server_adts_source.cpp b/src/zm_rtsp_server_adts_source.cpp
index 403876d97..bc553d555 100644
--- a/src/zm_rtsp_server_adts_source.cpp
+++ b/src/zm_rtsp_server_adts_source.cpp
@@ -6,6 +6,9 @@
 **
 ** -------------------------------------------------------------------------*/
 
+#include "zm.h"
+
+#if HAVE_RTSP_SERVER
 #include <sstream>
 #include <iomanip>
 
@@ -13,7 +16,6 @@
 #include <Base64.hh>
 
 #include "zm_rtsp_server_adts_source.h"
-#if HAVE_RTSP_SERVER
 
 static unsigned const samplingFrequencyTable[16] = {
   96000, 88200, 64000, 48000,
diff --git a/src/zm_rtsp_server_adts_source.h b/src/zm_rtsp_server_adts_source.h
index 42e6dd88a..bb9c8db91 100644
--- a/src/zm_rtsp_server_adts_source.h
+++ b/src/zm_rtsp_server_adts_source.h
@@ -9,6 +9,9 @@
 **
 ** -------------------------------------------------------------------------*/
 
+#include "zm.h"
+
+#if HAVE_RTSP_SERVER
 
 #ifndef ADTS_ZoneMinder_DEVICE_SOURCE
 #define ADTS_ZoneMinder_DEVICE_SOURCE
@@ -65,3 +68,4 @@ class ADTS_ZoneMinderDeviceSource : public ZoneMinderDeviceSource {
     int channels;
 };
 #endif
+#endif
diff --git a/src/zm_rtsp_server_device_source.h b/src/zm_rtsp_server_device_source.h
index 3c445806d..45843630e 100644
--- a/src/zm_rtsp_server_device_source.h
+++ b/src/zm_rtsp_server_device_source.h
@@ -6,6 +6,9 @@
 **
 ** -------------------------------------------------------------------------*/
 
+#include "zm.h"
+
+#if HAVE_RTSP_SERVER
 
 #ifndef DEVICE_SOURCE
 #define DEVICE_SOURCE
@@ -76,3 +79,4 @@ class ZoneMinderDeviceSource: public FramedSource {
 };
 
 #endif
+#endif
diff --git a/src/zm_rtsp_server_frame.h b/src/zm_rtsp_server_frame.h
index 83e8ee5a8..1a6396711 100644
--- a/src/zm_rtsp_server_frame.h
+++ b/src/zm_rtsp_server_frame.h
@@ -1,7 +1,11 @@
 #pragma once
 #include "zm_logger.h"
+#include "zm.h"
+
+#if HAVE_RTSP_SERVER
 
 #include <sys/time.h>
+#include <string.h>
 // ---------------------------------
 // Captured frame
 // ---------------------------------
@@ -56,3 +60,4 @@ class NAL_Frame {
   private:
     int m_ref_count;
 };
+#endif
diff --git a/src/zm_rtsp_server_h264_device_source.cpp b/src/zm_rtsp_server_h264_device_source.cpp
index 298527e5c..526a8530d 100644
--- a/src/zm_rtsp_server_h264_device_source.cpp
+++ b/src/zm_rtsp_server_h264_device_source.cpp
@@ -6,6 +6,10 @@
 **
 ** -------------------------------------------------------------------------*/
 
+#include "zm.h"
+
+#if HAVE_RTSP_SERVER
+
 #include <sstream>
 #include <iomanip>
 
@@ -13,7 +17,6 @@
 #include <Base64.hh>
 
 #include "zm_rtsp_server_h264_device_source.h"
-#if HAVE_RTSP_SERVER
 
 // ---------------------------------
 // H264 ZoneMinder FramedSource
diff --git a/src/zm_rtsp_server_server_media_subsession.cpp b/src/zm_rtsp_server_server_media_subsession.cpp
index bd4dd27a4..41a4a252b 100644
--- a/src/zm_rtsp_server_server_media_subsession.cpp
+++ b/src/zm_rtsp_server_server_media_subsession.cpp
@@ -4,14 +4,15 @@
 ** 
 ** -------------------------------------------------------------------------*/
 
+#include "zm.h"
+
+#if HAVE_RTSP_SERVER
 #include <sstream>
 
 #include "zm_rtsp_server_server_media_subsession.h"
 #include "zm_rtsp_server_device_source.h"
 #include "zm_rtsp_server_adts_source.h"
 
-
-#if HAVE_RTSP_SERVER
 // ---------------------------------
 //   BaseServerMediaSubsession
 // ---------------------------------
diff --git a/src/zm_rtsp_server_server_media_subsession.h b/src/zm_rtsp_server_server_media_subsession.h
index c5d28fed3..27fbc0c3f 100644
--- a/src/zm_rtsp_server_server_media_subsession.h
+++ b/src/zm_rtsp_server_server_media_subsession.h
@@ -9,6 +9,10 @@
 
 #pragma once
 
+#include "zm.h"
+
+#if HAVE_RTSP_SERVER
+
 #include <sys/stat.h>
 
 #include <string>
@@ -44,3 +48,4 @@ class BaseServerMediaSubsession {
 	protected:
 		StreamReplicator* m_replicator;
 };
+#endif
diff --git a/src/zm_rtsp_server_thread.cpp b/src/zm_rtsp_server_thread.cpp
index 8ba91845d..7e1349849 100644
--- a/src/zm_rtsp_server_thread.cpp
+++ b/src/zm_rtsp_server_thread.cpp
@@ -1,4 +1,7 @@
 
+#include "zm.h"
+
+#if HAVE_RTSP_SERVER
 #include "zm_rtsp_server_thread.h"
 #include "zm_rtsp_server_device_source.h"
 #include "zm_rtsp_server_h264_device_source.h"
@@ -6,8 +9,6 @@
 #include "zm_rtsp_server_unicast_server_media_subsession.h"
 #include <StreamReplicator.hh>
 
-
-#if HAVE_RTSP_SERVER
 RTSPServerThread::RTSPServerThread(Monitor *p_monitor) : 
   monitor(p_monitor),
   terminate(0)
diff --git a/src/zm_rtsp_server_unicast_server_media_subsession.cpp b/src/zm_rtsp_server_unicast_server_media_subsession.cpp
index 80d796067..63b3d27e9 100644
--- a/src/zm_rtsp_server_unicast_server_media_subsession.cpp
+++ b/src/zm_rtsp_server_unicast_server_media_subsession.cpp
@@ -7,10 +7,10 @@
 **
 ** -------------------------------------------------------------------------*/
 
-
+#include "zm.h"
+#if HAVE_RTSP_SERVER
 #include "zm_rtsp_server_unicast_server_media_subsession.h"
 #include "zm_rtsp_server_device_source.h"
-#if HAVE_RTSP_SERVER
 
 // -----------------------------------------
 //    ServerMediaSubsession for Unicast