2 files changed, 5 insertions, 3 deletions

diff --git a/lib/rbcodec/codecs/libopus/libopus.make b/lib/rbcodec/codecs/libopus/libopus.make
index ab93a5a5cc..5cfb34aac3 100644
--- a/lib/rbcodec/codecs/libopus/libopus.make
+++ b/lib/rbcodec/codecs/libopus/libopus.make
@@ -13,10 +13,12 @@ OPUSLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libopus/SOURCES)
 OPUSLIB_OBJ := $(call c2obj, $(OPUSLIB_SRC))
 
 # codec specific compilation flags
-$(OPUSLIB) : CODECFLAGS += -DHAVE_CONFIG_H \
+# prepend paths to avoid name clash issues
+$(OPUSLIB) : CODECFLAGS := -DHAVE_CONFIG_H \
    -I$(RBCODECLIB_DIR)/codecs/libopus \
    -I$(RBCODECLIB_DIR)/codecs/libopus/celt \
-   -I$(RBCODECLIB_DIR)/codecs/libopus/silk
+   -I$(RBCODECLIB_DIR)/codecs/libopus/silk \
+   $(CODECFLAGS)
 
 $(OPUSLIB): $(OPUSLIB_OBJ)
         $(SILENT)$(shell rm -f $@)
diff --git a/lib/rbcodec/codecs/libopus/opus_config.h b/lib/rbcodec/codecs/libopus/opus_config.h
index 922ec607e5..39abc8d8d4 100644
--- a/lib/rbcodec/codecs/libopus/opus_config.h
+++ b/lib/rbcodec/codecs/libopus/opus_config.h
@@ -1,7 +1,7 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#include "config.h"
+#include "rbcodecconfig.h"
 #include "codeclib.h"
 #include "ogg/ogg.h"