diff --git a/config.mk b/config.mk
index c22252c7..c7f8decb 100644
--- a/config.mk
+++ b/config.mk
@@ -179,14 +179,14 @@ LIB_CXXFLAGS:=$(CXXFLAGS)
 LIB_LDFLAGS:=$(LDFLAGS)
 LIB_LIBADD:=$(LIBADD)
 
-BROKER_CPPFLAGS:=$(LIB_CPPFLAGS) -I../lib -I../common
+BROKER_CPPFLAGS:=$(LIB_CPPFLAGS) -I${R}/lib -I${R}/common
 BROKER_CFLAGS:=${CFLAGS} -DVERSION="\"${VERSION}\"" -DWITH_BROKER
 BROKER_LDFLAGS:=${LDFLAGS}
 BROKER_LDADD:=
 
-CLIENT_CPPFLAGS:=$(CPPFLAGS) -I.. -I../include
+CLIENT_CPPFLAGS:=$(CPPFLAGS) -I${R} -I${R}/include
 CLIENT_CFLAGS:=${CFLAGS} -DVERSION="\"${VERSION}\""
-CLIENT_LDFLAGS:=$(LDFLAGS) -L../lib
+CLIENT_LDFLAGS:=$(LDFLAGS) -L${R}/lib
 CLIENT_LDADD:=
 
 PASSWD_LDADD:=
@@ -211,7 +211,7 @@ ifeq ($(UNAME),Linux)
 endif
 
 ifeq ($(WITH_SHARED_LIBRARIES),yes)
-	CLIENT_LDADD:=${CLIENT_LDADD} ../lib/libmosquitto.so.${SOVERSION}
+	CLIENT_LDADD:=${CLIENT_LDADD} ${R}/lib/libmosquitto.so.${SOVERSION}
 endif
 
 ifeq ($(UNAME),SunOS)
@@ -358,8 +358,8 @@ ifeq ($(WITH_UNIX_SOCKETS),yes)
 endif
 
 ifeq ($(WITH_WEBSOCKETS),yes)
-	BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_WEBSOCKETS=WS_IS_BUILTIN -I../deps/picohttpparser
-	LIB_CPPFLAGS:=$(LIB_CPPFLAGS) -DWITH_WEBSOCKETS=WS_IS_BUILTIN -I../deps/picohttpparser
+	BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_WEBSOCKETS=WS_IS_BUILTIN -I${R}/deps/picohttpparser
+	LIB_CPPFLAGS:=$(LIB_CPPFLAGS) -DWITH_WEBSOCKETS=WS_IS_BUILTIN -I${R}/deps/picohttpparser
 	CLIENT_CPPFLAGS:=$(CLIENT_CPPFLAGS) -DWITH_WEBSOCKETS=WS_IS_BUILTIN
 endif
 
@@ -387,10 +387,10 @@ ifeq ($(WITH_EPOLL),yes)
 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
+	BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -I${R}/deps
+	LIB_CPPFLAGS:=$(LIB_CPPFLAGS) -I${R}/deps
+	CLIENT_CPPFLAGS:=$(CLIENT_CPPFLAGS) -I${R}/deps
+	PLUGIN_CPPFLAGS:=$(PLUGIN_CPPFLAGS) -I${R}/deps
 endif
 
 ifeq ($(WITH_COVERAGE),yes)