diff --git a/src/servers/media/AppManager.cpp b/src/servers/media/AppManager.cpp
index 2f82755cae..da3a576c9a 100644
--- a/src/servers/media/AppManager.cpp
+++ b/src/servers/media/AppManager.cpp
@@ -37,7 +37,7 @@
 #include <OS.h>
 #include <Roster.h>
 
-#include <debug.h>
+#include <MediaDebug.h>
 #include <MediaMisc.h>
 
 #include "BufferManager.h"
diff --git a/src/servers/media/BufferManager.cpp b/src/servers/media/BufferManager.cpp
index 2db9a55116..c6e706b563 100644
--- a/src/servers/media/BufferManager.cpp
+++ b/src/servers/media/BufferManager.cpp
@@ -9,7 +9,7 @@
 
 #include <Autolock.h>
 
-#include "debug.h"
+#include "MediaDebug.h"
 #include "SharedBufferList.h"
 
 
diff --git a/src/servers/media/DefaultManager.cpp b/src/servers/media/DefaultManager.cpp
index 33ebbbeb00..420386c1bc 100644
--- a/src/servers/media/DefaultManager.cpp
+++ b/src/servers/media/DefaultManager.cpp
@@ -16,7 +16,7 @@
 #include <TimeSource.h>
 #include <string.h>
 
-#include "debug.h"
+#include "MediaDebug.h"
 #include "DormantNodeManager.h"
 #include "media_server.h"
 #include "NodeManager.h"
diff --git a/src/servers/media/MediaFilesManager.cpp b/src/servers/media/MediaFilesManager.cpp
index 429b64320f..17d30e1773 100644
--- a/src/servers/media/MediaFilesManager.cpp
+++ b/src/servers/media/MediaFilesManager.cpp
@@ -16,7 +16,7 @@
 #include <MediaFiles.h>
 #include <Path.h>
 
-#include <debug.h>
+#include <MediaDebug.h>
 #include <MediaSounds.h>
 
 
diff --git a/src/servers/media/NodeManager.cpp b/src/servers/media/NodeManager.cpp
index 4c9e1a8b2b..7f69cf7f87 100644
--- a/src/servers/media/NodeManager.cpp
+++ b/src/servers/media/NodeManager.cpp
@@ -41,7 +41,7 @@
 #include <OS.h>
 #include <Path.h>
 
-#include <debug.h>
+#include <MediaDebug.h>
 #include <MediaMisc.h>
 #include <Notifications.h>
 
diff --git a/src/servers/media/NotificationManager.cpp b/src/servers/media/NotificationManager.cpp
index de6accb4f5..09b7715c5a 100644
--- a/src/servers/media/NotificationManager.cpp
+++ b/src/servers/media/NotificationManager.cpp
@@ -35,7 +35,7 @@
 #include <OS.h>
 
 #include "DataExchange.h"
-#include "debug.h"
+#include "MediaDebug.h"
 #include "media_server.h"
 #include "NodeManager.h"
 #include "Notifications.h"
diff --git a/src/servers/media/media_server.cpp b/src/servers/media/media_server.cpp
index cd06cb9c68..0de4e66e49 100644
--- a/src/servers/media/media_server.cpp
+++ b/src/servers/media/media_server.cpp
@@ -50,12 +50,12 @@ char __dont_remove_copyright_from_binary[] = "Copyright (c) 2002, 2003 "
 #include "AppManager.h"
 #include "BufferManager.h"
 #include "DataExchange.h"
-#include "MediaMisc.h"
+#include "MediaDebug.h"
 #include "MediaFilesManager.h"
+#include "MediaMisc.h"
 #include "NodeManager.h"
 #include "NotificationManager.h"
 #include "ServerInterface.h"
-#include "debug.h"
 #include "media_server.h"
 
 
diff --git a/src/servers/media_addon/MediaAddonServer.cpp b/src/servers/media_addon/MediaAddonServer.cpp
index 6201700c4c..ce82926cac 100644
--- a/src/servers/media_addon/MediaAddonServer.cpp
+++ b/src/servers/media_addon/MediaAddonServer.cpp
@@ -47,9 +47,9 @@
 #include <String.h>
 
 #include <AddOnMonitorHandler.h>
-#include <debug.h>
 #include <DataExchange.h>
 #include <DormantNodeManager.h>
+#include <MediaDebug.h>
 #include <MediaMisc.h>
 #include <MediaRosterEx.h>
 #include <MediaSounds.h>
diff --git a/src/servers/media_addon/SystemTimeSource.cpp b/src/servers/media_addon/SystemTimeSource.cpp
index bac891a54f..943151a76d 100644
--- a/src/servers/media_addon/SystemTimeSource.cpp
+++ b/src/servers/media_addon/SystemTimeSource.cpp
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "debug.h"
+#include "MediaDebug.h"
 #include "SystemTimeSource.h"