diff --git a/msm/dp/dp_display.c b/msm/dp/dp_display.c
index e5c42a96..e24ecb62 100644
--- a/msm/dp/dp_display.c
+++ b/msm/dp/dp_display.c
@@ -9,6 +9,7 @@
 #include <linux/debugfs.h>
 #include <linux/component.h>
 #include <linux/of_irq.h>
+#include <linux/delay.h>
 #include <linux/soc/qcom/fsa4480-i2c.h>
 #include <linux/usb/phy.h>
 #include <linux/jiffies.h>
diff --git a/msm/dp/dp_display.h b/msm/dp/dp_display.h
index eda860c7..0417fa7c 100644
--- a/msm/dp/dp_display.h
+++ b/msm/dp/dp_display.h
@@ -7,7 +7,6 @@
 #define _DP_DISPLAY_H_
 
 #include <linux/list.h>
-#include <drm/drmP.h>
 #include <drm/sde_drm.h>
 
 #include "dp_panel.h"
diff --git a/msm/dp/dp_drm.h b/msm/dp/dp_drm.h
index 7218fe65..18d09d42 100644
--- a/msm/dp/dp_drm.h
+++ b/msm/dp/dp_drm.h
@@ -7,7 +7,6 @@
 #define _DP_DRM_H_
 
 #include <linux/types.h>
-#include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_bridge.h>
 
diff --git a/msm/dp/dp_mst_drm.h b/msm/dp/dp_mst_drm.h
index a2de0e49..9a52ccdb 100644
--- a/msm/dp/dp_mst_drm.h
+++ b/msm/dp/dp_mst_drm.h
@@ -7,7 +7,6 @@
 #define _DP_MST_DRM_H_
 
 #include <linux/types.h>
-#include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_bridge.h>
 
diff --git a/msm/dp/dp_power.c b/msm/dp/dp_power.c
index be8b54fc..1ece48e2 100644
--- a/msm/dp/dp_power.c
+++ b/msm/dp/dp_power.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk.h>
 #include <linux/pm_runtime.h>
-#include <drm/drmP.h>
 #include "dp_power.h"
 #include "dp_catalog.h"
 #include "dp_debug.h"
diff --git a/msm/dsi/dsi_clk.h b/msm/dsi/dsi_clk.h
index 2a88801f..e990ee04 100644
--- a/msm/dsi/dsi_clk.h
+++ b/msm/dsi/dsi_clk.h
@@ -10,7 +10,6 @@
 #include <linux/platform_device.h>
 #include <linux/types.h>
 #include <linux/clk.h>
-#include <drm/drmP.h>
 
 #define MAX_STRING_LEN 32
 #define MAX_DSI_CTRL 2
diff --git a/msm/dsi/dsi_display.h b/msm/dsi/dsi_display.h
index 78aadc06..f829ac8d 100644
--- a/msm/dsi/dsi_display.h
+++ b/msm/dsi/dsi_display.h
@@ -11,7 +11,6 @@
 #include <linux/debugfs.h>
 #include <linux/of_device.h>
 #include <linux/firmware.h>
-#include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_bridge.h>
 
diff --git a/msm/dsi/dsi_drm.h b/msm/dsi/dsi_drm.h
index cd198d83..188281f8 100644
--- a/msm/dsi/dsi_drm.h
+++ b/msm/dsi/dsi_drm.h
@@ -7,7 +7,6 @@
 #define _DSI_DRM_H_
 
 #include <linux/types.h>
-#include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 
 #include "msm_drv.h"
diff --git a/msm/msm_atomic.c b/msm/msm_atomic.c
index 1a080b45..aefe75c9 100644
--- a/msm/msm_atomic.c
+++ b/msm/msm_atomic.c
@@ -16,6 +16,7 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <drm/drm_panel.h>
+#include <drm/drm_vblank.h>
 
 #include "msm_drv.h"
 #include "msm_gem.h"
diff --git a/msm/msm_drv.c b/msm/msm_drv.c
index f511cb86..cf8a3d25 100644
--- a/msm/msm_drv.c
+++ b/msm/msm_drv.c
@@ -41,6 +41,10 @@
 #include <linux/kthread.h>
 #include <uapi/linux/sched/types.h>
 #include <drm/drm_of.h>
+#include <drm/drm_irq.h>
+#include <drm/drm_ioctl.h>
+#include <drm/drm_vblank.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_probe_helper.h>
 
 #include "msm_drv.h"
diff --git a/msm/msm_drv.h b/msm/msm_drv.h
index 52a6282c..3211c46c 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -38,13 +38,13 @@
 #include <linux/sizes.h>
 #include <linux/kthread.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_plane_helper.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/msm_drm.h>
 #include <drm/sde_drm.h>
+#include <drm/drm_file.h>
 #include <drm/drm_gem.h>
 #include <drm/drm_dsc.h>
 #include <drm/drm_bridge.h>
diff --git a/msm/msm_fb.c b/msm/msm_fb.c
index 779a6936..11b44313 100644
--- a/msm/msm_fb.c
+++ b/msm/msm_fb.c
@@ -17,6 +17,7 @@
  */
 
 #include <drm/drm_crtc.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_damage_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_probe_helper.h>
diff --git a/msm/msm_gem_prime.c b/msm/msm_gem_prime.c
index b41db637..8ad394e4 100644
--- a/msm/msm_gem_prime.c
+++ b/msm/msm_gem_prime.c
@@ -21,6 +21,8 @@
 #include "msm_mmu.h"
 #include "msm_kms.h"
 
+#include <drm/drm_drv.h>
+
 #include <linux/dma-buf.h>
 #include <linux/ion.h>
 #include <linux/msm_ion.h>
diff --git a/msm/msm_mmu.h b/msm/msm_mmu.h
index ee6cbcd5..448de50a 100644
--- a/msm/msm_mmu.h
+++ b/msm/msm_mmu.h
@@ -19,6 +19,7 @@
 #define __MSM_MMU_H__
 
 #include <linux/iommu.h>
+#include <linux/dma-mapping.h>
 
 struct msm_mmu;
 
diff --git a/msm/sde/sde_connector.h b/msm/sde/sde_connector.h
index 2e02ef64..7d7813be 100644
--- a/msm/sde/sde_connector.h
+++ b/msm/sde/sde_connector.h
@@ -7,7 +7,6 @@
 #define _SDE_CONNECTOR_H_
 
 #include <drm/msm_drm_pp.h>
-#include <drm/drmP.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_panel.h>
 
diff --git a/msm/sde/sde_crtc.h b/msm/sde/sde_crtc.h
index f4efaac5..bec4d8cd 100644
--- a/msm/sde/sde_crtc.h
+++ b/msm/sde/sde_crtc.h
@@ -22,6 +22,7 @@
 #include <linux/kthread.h>
 #include <linux/of_fdt.h>
 #include <drm/drm_crtc.h>
+#include <drm/drm_vblank.h>
 #include "msm_prop.h"
 #include "sde_fence.h"
 #include "sde_kms.h"
diff --git a/msm/sde/sde_hw_catalog.h b/msm/sde/sde_hw_catalog.h
index 9eca90a5..d9fa0d1d 100644
--- a/msm/sde/sde_hw_catalog.h
+++ b/msm/sde/sde_hw_catalog.h
@@ -11,7 +11,6 @@
 #include <linux/bitmap.h>
 #include <linux/err.h>
 #include <linux/of_fdt.h>
-#include <drm/drmP.h>
 #include "sde_hw_mdss.h"
 
 /**
diff --git a/msm/sde_edid_parser.h b/msm/sde_edid_parser.h
index 9c3974c4..819188e1 100644
--- a/msm/sde_edid_parser.h
+++ b/msm/sde_edid_parser.h
@@ -11,7 +11,6 @@
 #include <linux/debugfs.h>
 #include <linux/of_device.h>
 #include <linux/i2c.h>
-#include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>
 
diff --git a/msm/sde_hdcp.h b/msm/sde_hdcp.h
index d386eb76..8064b64e 100644
--- a/msm/sde_hdcp.h
+++ b/msm/sde_hdcp.h
@@ -12,7 +12,6 @@
 #include <linux/of_device.h>
 #include <linux/i2c.h>
 #include <linux/list.h>
-#include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>
 #include <linux/hdcp_qseecom.h>
diff --git a/msm/sde_rsc.c b/msm/sde_rsc.c
index 240078ce..55c97a4d 100644
--- a/msm/sde_rsc.c
+++ b/msm/sde_rsc.c
@@ -14,10 +14,11 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <linux/of_platform.h>
+#include <linux/delay.h>
+#include <linux/uaccess.h>
 #include <linux/module.h>
 
 #include <soc/qcom/rpmh.h>
-#include <drm/drmP.h>
 #include <drm/drm_irq.h>
 #include "sde_rsc_priv.h"
 #include "sde_dbg.h"
diff --git a/rotator/sde_rotator_dev.c b/rotator/sde_rotator_dev.c
index d54f47f2..fdcebdf5 100644
--- a/rotator/sde_rotator_dev.c
+++ b/rotator/sde_rotator_dev.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/wait.h>
 #include <linux/of.h>
+#include <linux/dma-mapping.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-event.h>
 #include <media/videobuf2-v4l2.h>