diff --git a/config.mk b/config.mk
index 51e36e0d..0ac24b3d 100644
--- a/config.mk
+++ b/config.mk
@@ -135,7 +135,10 @@ endif
 
 STATIC_LIB_DEPS:=
 
-LIB_CPPFLAGS=$(CPPFLAGS) -I. -I.. -I../lib -I../src/deps
+LIB_CPPFLAGS=$(CPPFLAGS) -I. -I.. -I../lib
+ifeq ($(WITH_BUNDLED_DEPS),yes)
+	LIB_CPPFLAGS:=$(LIB_CPPFLAGS) -I../src/deps
+endif
 LIB_CFLAGS:=$(CFLAGS)
 LIB_CXXFLAGS:=$(CXXFLAGS)
 LIB_LDFLAGS:=$(LDFLAGS)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 7ce86e78..f81dce7c 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,11 +1,14 @@
 add_subdirectory(cpp)
 
 include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/lib
-			${mosquitto_SOURCE_DIR}/src/deps
 			${STDBOOL_H_PATH} ${STDINT_H_PATH}
 			${OPENSSL_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR})
 link_directories(${mosquitto_SOURCE_DIR}/lib)
 
+if (WITH_BUNDLED_DEPS)
+        include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/src/deps)
+endif (WITH_BUNDLED_DEPS)
+
 set(C_SRC
 	actions.c
 	callbacks.c
diff --git a/test/unit/Makefile b/test/unit/Makefile
index 0a461b1c..60860286 100644
--- a/test/unit/Makefile
+++ b/test/unit/Makefile
@@ -2,7 +2,11 @@ include ../../config.mk
 
 .PHONY: all check test test-broker test-lib clean coverage
 
-CPPFLAGS:=$(CPPFLAGS) -I../.. -I../../lib -I../../src -I../../src/deps
+CPPFLAGS:=$(CPPFLAGS) -I../.. -I../../lib -I../../src
+ifeq ($(WITH_BUNDLED_DEPS),yes)
+        CPPFLAGS:=$(CPPFLAGS) -I../../src/deps
+endif
+
 CFLAGS:=$(CFLAGS) -coverage -Wall -ggdb
 LDFLAGS:=$(LDFLAGS) -coverage
 LDADD:=$(LDADD) -lcunit