diff --git a/apps/mosquitto_ctrl/Makefile b/apps/mosquitto_ctrl/Makefile
index 5ed418b2..2d9948e2 100644
--- a/apps/mosquitto_ctrl/Makefile
+++ b/apps/mosquitto_ctrl/Makefile
@@ -13,6 +13,9 @@ endif
 endif
 
 LOCAL_CPPFLAGS:=-I../mosquitto_passwd -I../../plugins/dynamic-security -DWITH_CJSON
+ifeq ($(WITH_BUNDLED_DEPS),yes)
+LOCAL_CPPFLAGS+=-I../../deps
+endif
 
 OBJS=	mosquitto_ctrl.o \
 		broker.o \
diff --git a/config.mk b/config.mk
index 0c4f15bb..1fe340d5 100644
--- a/config.mk
+++ b/config.mk
@@ -360,6 +360,7 @@ endif
 ifeq ($(WITH_BUNDLED_DEPS),yes)
 	BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -I../deps
 	LIB_CPPFLAGS:=$(LIB_CPPFLAGS) -I../deps
+	CLIENT_CPPFLAGS:=$(CLIENT_CPPFLAGS) -I../deps
 	PLUGIN_CPPFLAGS:=$(PLUGIN_CPPFLAGS) -I../../deps
 endif
 
diff --git a/plugins/dynamic-security/Makefile b/plugins/dynamic-security/Makefile
index c4968ea7..13191f84 100644
--- a/plugins/dynamic-security/Makefile
+++ b/plugins/dynamic-security/Makefile
@@ -4,6 +4,9 @@ include ../../config.mk
 
 PLUGIN_NAME=mosquitto_dynamic_security
 LOCAL_CPPFLAGS=-I../../lib/ -I../../src/ -DWITH_CJSON -DWITH_TLS
+ifeq ($(WITH_BUNDLED_DEPS),yes)
+	LOCAL_CPPFLAGS:=$(LOCAL_CPPFLAGS) -I../deps
+endif
 
 OBJS=	\
 		acl.o \
diff --git a/plugins/examples/delayed-auth/Makefile b/plugins/examples/delayed-auth/Makefile
index f038e066..d5df8f5e 100644
--- a/plugins/examples/delayed-auth/Makefile
+++ b/plugins/examples/delayed-auth/Makefile
@@ -3,7 +3,10 @@ include ../../../config.mk
 .PHONY : all binary check clean reallyclean test install uninstall
 
 PLUGIN_NAME=mosquitto_delayed_auth
-PLUGIN_CFLAGS+=-I../../../include -I../../../
+PLUGIN_CPPFLAGS+=-I../../../include -I../../../
+ifeq ($(WITH_BUNDLED_DEPS),yes)
+PLUGIN_CPPFLAGS+=-I../../../deps
+endif
 
 all : binary