diff --git a/drivers/staging/vc04_services/bcm2835-isp/Makefile b/drivers/staging/vc04_services/bcm2835-isp/Makefile
index 42d3081d342f..1994f12db3fc 100644
--- a/drivers/staging/vc04_services/bcm2835-isp/Makefile
+++ b/drivers/staging/vc04_services/bcm2835-isp/Makefile
@@ -4,5 +4,4 @@ bcm2835-isp-objs := bcm2835-v4l2-isp.o
 obj-$(CONFIG_VIDEO_ISP_BCM2835) += bcm2835-isp.o
 
 ccflags-y += \
-	-I$(srctree)/drivers/staging/vc04_services \
 	-D__VCCOREVER__=0x04000000
diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
index 5ab232ff9bd9..5c99d453f092 100644
--- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
@@ -12,7 +12,7 @@
 #define BCM2835_ISP_FMTS
 
 #include <linux/videodev2.h>
-#include "vchiq-mmal/mmal-encodings.h"
+#include "../vchiq-mmal/mmal-encodings.h"
 
 struct bcm2835_isp_fmt {
 	u32 fourcc;
diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
index 7ec9a6a45d76..f0180c0f4ec4 100644
--- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
@@ -17,11 +17,11 @@
 #include <media/v4l2-ioctl.h>
 #include <media/videobuf2-dma-contig.h>
 
-#include "vchiq-mmal/mmal-msg.h"
-#include "vchiq-mmal/mmal-parameters.h"
-#include "vchiq-mmal/mmal-vchiq.h"
+#include "../vchiq-mmal/mmal-msg.h"
+#include "../vchiq-mmal/mmal-parameters.h"
+#include "../vchiq-mmal/mmal-vchiq.h"
 
-#include "vc-sm-cma/vc_sm_knl.h"
+#include "../vc-sm-cma/vc_sm_knl.h"
 
 #include "bcm2835-isp-ctrls.h"
 #include "bcm2835-isp-fmts.h"