diff --git a/drivers/gpu/msm/kgsl.h b/drivers/gpu/msm/kgsl.h
index dd4310cd06f3..7477d83cbe76 100644
--- a/drivers/gpu/msm/kgsl.h
+++ b/drivers/gpu/msm/kgsl.h
@@ -10,12 +10,12 @@
 #include <linux/interrupt.h>
 #include <linux/kthread.h>
 #include <linux/mm.h>
+#include <linux/msm_kgsl.h>
 #include <linux/uaccess.h>
 
 #include "kgsl_gmu_core.h"
 #include "kgsl_pwrscale.h"
 
-#include "uapi/msm_kgsl.h"
 
 /*
  * --- kgsl drawobj flags ---
diff --git a/drivers/gpu/msm/kgsl_compat.h b/drivers/gpu/msm/kgsl_compat.h
index 6fbf3de784b6..a62c3b40d798 100644
--- a/drivers/gpu/msm/kgsl_compat.h
+++ b/drivers/gpu/msm/kgsl_compat.h
@@ -6,8 +6,7 @@
 #define __KGSL_COMPAT_H
 
 #include <linux/compat.h>
-
-#include "uapi/msm_kgsl.h"
+#include <linux/msm_kgsl.h>
 
 #ifdef CONFIG_COMPAT
 
diff --git a/drivers/gpu/msm/uapi/msm_kgsl.h b/include/uapi/linux/msm_kgsl.h
similarity index 100%
rename from drivers/gpu/msm/uapi/msm_kgsl.h
rename to include/uapi/linux/msm_kgsl.h