diff --git a/drivers/platform/tegra/rtcpu/Makefile b/drivers/platform/tegra/rtcpu/Makefile
index ccc0ecdb..089127d3 100644
--- a/drivers/platform/tegra/rtcpu/Makefile
+++ b/drivers/platform/tegra/rtcpu/Makefile
@@ -12,10 +12,13 @@ obj-m += ivc-bus.o
 obj-m += camchar.o
 obj-m += camera-diagnostics.o
 obj-m += rtcpu-debug.o
-obj-m += clk-group.o
 obj-m += hsp-mailbox-client.o
-obj-m += reset-group.o
-obj-m += device-group.o
 
-tegra-camera-rtcpu-objs :=  tegra-camera-rtcpu-base.o tegra-rtcpu-trace.o rtcpu-monitor.o
+tegra-camera-rtcpu-objs := clk-group.o \
+			   device-group.o \
+			   reset-group.o \
+			   rtcpu-monitor.o \
+	                   tegra-camera-rtcpu-base.o \
+			   tegra-rtcpu-trace.o
+
 obj-m += tegra-camera-rtcpu.o
diff --git a/drivers/platform/tegra/rtcpu/ivc-bus.c b/drivers/platform/tegra/rtcpu/ivc-bus.c
index 344d46ec..4698cea5 100644
--- a/drivers/platform/tegra/rtcpu/ivc-bus.c
+++ b/drivers/platform/tegra/rtcpu/ivc-bus.c
@@ -9,11 +9,9 @@
 #include <linux/slab.h>
 #include <soc/tegra/ivc_ext.h>
 #include <linux/tegra-ivc-bus.h>
-#include <linux/tegra-camera-rtcpu.h>
 #include <linux/bitops.h>
 #include <linux/version.h>
 #include "soc/tegra/camrtc-channels.h"
-#include "soc/tegra/camrtc-commands.h"
 
 #define NV(p) "nvidia," #p