diff --git a/msm/msm_drv.c b/msm/msm_drv.c
index 845982ff98197..4e315bdcf38ae 100644
--- a/msm/msm_drv.c
+++ b/msm/msm_drv.c
@@ -1980,7 +1980,7 @@ static void __exit msm_drm_unregister(void)
 	msm_smmu_driver_cleanup();
 }
 
-module_init(msm_drm_register);
+late_initcall(msm_drm_register);
 module_exit(msm_drm_unregister);
 
 MODULE_AUTHOR("Rob Clark <robdclark@gmail.com");
diff --git a/msm/sde/sde_kms.c b/msm/sde/sde_kms.c
index 9e25baf2e029a..29efd583dec96 100644
--- a/msm/sde/sde_kms.c
+++ b/msm/sde/sde_kms.c
@@ -51,7 +51,7 @@
 
 #include <soc/qcom/scm.h>
 #include "soc/qcom/secure_buffer.h"
-#include "soc/qcom/qtee_shmbridge.h"
+#include <linux/qtee_shmbridge.h>
 
 #define CREATE_TRACE_POINTS
 #include "sde_trace.h"