diff --git a/src/mixer/Makefile.am b/src/mixer/Makefile.am
index 4c61d4776799a97fa6d1c8319ee9196a1db08528..eb66270f6c2027dda0ddbd2b2610c70a7d76216b 100644
--- a/src/mixer/Makefile.am
+++ b/src/mixer/Makefile.am
@@ -22,7 +22,9 @@ libmixer_la_SOURCES =  	 AudioInput.cpp \
 			 Mixer.cpp
 
 
-AM_CXXFLAGS = -I$(top_srcdir)/include $(libccext2_CFLAGS) $(USER_INCLUDES)
+
+#AM_CXXFLAGS = -I$(top_srcdir)/include $(USER_INCLUDES)
+AM_CXXFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libs $(libccext2_CFLAGS) $(libdbuscpp_CFLAGS) $(libccrtp1_CFLAGS) $(USER_INCLUDES)
 
 noinst_HEADERS = AudioInput.h \
 		 AudioMixer2Channels.h \
diff --git a/src/mixer/OutputStream.h b/src/mixer/OutputStream.h
index 6b98b1eef8b4be23b966b39445b00168325953ce..a5416092de95f5b89518446c6450e99f12a01c8b 100644
--- a/src/mixer/OutputStream.h
+++ b/src/mixer/OutputStream.h
@@ -5,7 +5,8 @@
 
 #include <semaphore.h>
 
-#include "../global.h"
+//#include "../global.h"
+#include <cc++/config.h>
 
 /** @interface */
 //! Interface for the output buffers.