6 files changed, 15 insertions, 19 deletions
diff --git a/libs/ardour/ardour/debug.h b/libs/ardour/ardour/debug.h
index 94974a1dcd..dc2ee6442f 100644
--- a/libs/ardour/ardour/debug.h
+++ b/libs/ardour/ardour/debug.h
@@ -70,6 +70,11 @@ namespace PBD {
 		LIBARDOUR_API extern DebugBits Soundcloud;
 		LIBARDOUR_API extern DebugBits Butler;
 		LIBARDOUR_API extern DebugBits GenericMidi;
+		LIBARDOUR_API extern DebugBits BackendMIDI;
+		LIBARDOUR_API extern DebugBits BackendAudio;
+		LIBARDOUR_API extern DebugBits BackendTiming;
+		LIBARDOUR_API extern DebugBits BackendThreads;
+
 	}
 }
 
diff --git a/libs/ardour/debug.cc b/libs/ardour/debug.cc
index d7b7269e25..9d6ceb1a9d 100644
--- a/libs/ardour/debug.cc
+++ b/libs/ardour/debug.cc
@@ -67,4 +67,7 @@ PBD::DebugBits PBD::DEBUG::Soundcloud = PBD::new_debug_bit ("Soundcloud");
 PBD::DebugBits PBD::DEBUG::Butler = PBD::new_debug_bit ("Butler");
 PBD::DebugBits PBD::DEBUG::GenericMidi = PBD::new_debug_bit ("genericmidi");
 
-
+PBD::DebugBits PBD::DEBUG::BackendMIDI = PBD::new_debug_bit ("backendmidi");
+PBD::DebugBits PBD::DEBUG::BackendAudio = PBD::new_debug_bit ("backendaudio");
+PBD::DebugBits PBD::DEBUG::BackendTiming = PBD::new_debug_bit ("backendtiming");
+PBD::DebugBits PBD::DEBUG::BackendThreads = PBD::new_debug_bit ("backendthreads");
diff --git a/libs/backends/portaudio/debug.h b/libs/backends/portaudio/debug.h
index 0270efa2a6..260d9c9b10 100644
--- a/libs/backends/portaudio/debug.h
+++ b/libs/backends/portaudio/debug.h
@@ -1,13 +1,11 @@
 #ifndef PORTAUDIO_BACKEND_DEBUG_H
 #define PORTAUDIO_BACKEND_DEBUG_H
 
-#include "pbd/debug.h"
+#include "ardour/debug.h"
 
-using namespace PBD;
-
-#define DEBUG_AUDIO(msg) DEBUG_TRACE (DEBUG::BackendAudio, msg);
-#define DEBUG_MIDI(msg) DEBUG_TRACE (DEBUG::BackendMIDI, msg);
-#define DEBUG_TIMING(msg) DEBUG_TRACE (DEBUG::BackendTiming, msg);
-#define DEBUG_THREADS(msg) DEBUG_TRACE (DEBUG::BackendThreads, msg);
+#define DEBUG_AUDIO(msg) DEBUG_TRACE (PBD::DEBUG::BackendAudio, msg);
+#define DEBUG_MIDI(msg) DEBUG_TRACE (PBD::DEBUG::BackendMIDI, msg);
+#define DEBUG_TIMING(msg) DEBUG_TRACE (PBD::DEBUG::BackendTiming, msg);
+#define DEBUG_THREADS(msg) DEBUG_TRACE (PBD::DEBUG::BackendThreads, msg);
 
 #endif // PORTAUDIO_BACKEND_DEBUG_H
diff --git a/libs/backends/portaudio/portaudio_io.cc b/libs/backends/portaudio/portaudio_io.cc
index b44f402a2b..2d64e63922 100644
--- a/libs/backends/portaudio/portaudio_io.cc
+++ b/libs/backends/portaudio/portaudio_io.cc
@@ -38,6 +38,7 @@
 #define INTERLEAVED_INPUT
 #define INTERLEAVED_OUTPUT
 
+using namespace PBD;
 using namespace ARDOUR;
 
 PortAudioIO::PortAudioIO ()
diff --git a/libs/pbd/debug.cc b/libs/pbd/debug.cc
index acfca82b05..3055c396c6 100644
--- a/libs/pbd/debug.cc
+++ b/libs/pbd/debug.cc
@@ -64,12 +64,6 @@ DebugBits PBD::DEBUG::UndoHistory = PBD::new_debug_bit ("undohistory");
    from dynamically loaded code, for use in command line parsing, is way above the pay grade
    of this debug tracing scheme.
 */
-DebugBits PBD::DEBUG::BackendMIDI = PBD::new_debug_bit ("BackendMIDI");
-DebugBits PBD::DEBUG::BackendAudio = PBD::new_debug_bit ("BackendAudio");
-DebugBits PBD::DEBUG::BackendTiming = PBD::new_debug_bit ("BackendTiming");
-DebugBits PBD::DEBUG::BackendThreads = PBD::new_debug_bit ("BackendThreads");
-
-
 DebugBits PBD::DEBUG::WavesMIDI = PBD::new_debug_bit ("WavesMIDI");
 DebugBits PBD::DEBUG::WavesAudio = PBD::new_debug_bit ("WavesAudio");
 
diff --git a/libs/pbd/pbd/debug.h b/libs/pbd/pbd/debug.h
index 3e23af009c..065bc4cae0 100644
--- a/libs/pbd/pbd/debug.h
+++ b/libs/pbd/pbd/debug.h
@@ -57,11 +57,6 @@ namespace PBD {
 		LIBPBD_API extern DebugBits FileUtils;
 		LIBPBD_API extern DebugBits UndoHistory;
 
-		LIBPBD_API extern DebugBits BackendMIDI;
-		LIBPBD_API extern DebugBits BackendAudio;
-		LIBPBD_API extern DebugBits BackendTiming;
-		LIBPBD_API extern DebugBits BackendThreads;
-
 		/* See notes in ../debug.cc on why these are defined here */
 
                 LIBPBD_API extern DebugBits WavesMIDI;