diff --git a/drivers/gpu/nvgpu/clk/clk.c b/drivers/gpu/nvgpu/clk/clk.c
index 09b1aabce..d44981b62 100644
--- a/drivers/gpu/nvgpu/clk/clk.c
+++ b/drivers/gpu/nvgpu/clk/clk.c
@@ -23,10 +23,10 @@
 #include <nvgpu/pmu.h>
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include <nvgpu/gk20a.h>
+#include <nvgpu/pmuif/ctrlclk.h>
+#include <nvgpu/pmuif/ctrlvolt.h>
 
 #include "clk.h"
-#include "ctrl/ctrlclk.h"
-#include "ctrl/ctrlvolt.h"
 #include "volt/volt.h"
 
 #define BOOT_GPC2CLK_MHZ  2581U
diff --git a/drivers/gpu/nvgpu/clk/clk_domain.c b/drivers/gpu/nvgpu/clk/clk_domain.c
index bae66283d..a1d2d119c 100644
--- a/drivers/gpu/nvgpu/clk/clk_domain.c
+++ b/drivers/gpu/nvgpu/clk/clk_domain.c
@@ -25,12 +25,12 @@
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobjgrp_e32.h>
 #include <nvgpu/string.h>
+#include <nvgpu/pmuif/ctrlclk.h>
+#include <nvgpu/pmuif/ctrlvolt.h>
 
 #include "clk.h"
 #include "clk_fll.h"
 #include "clk_domain.h"
-#include "ctrl/ctrlclk.h"
-#include "ctrl/ctrlvolt.h"
 
 static struct clk_domain *construct_clk_domain(struct gk20a *g, void *pargs);
 
diff --git a/drivers/gpu/nvgpu/clk/clk_domain.h b/drivers/gpu/nvgpu/clk/clk_domain.h
index c86abf668..e4e79298a 100644
--- a/drivers/gpu/nvgpu/clk/clk_domain.h
+++ b/drivers/gpu/nvgpu/clk/clk_domain.h
@@ -23,8 +23,8 @@
 #ifndef NVGPU_CLK_DOMAIN_H
 #define NVGPU_CLK_DOMAIN_H
 
-#include "ctrl/ctrlclk.h"
-#include "ctrl/ctrlboardobj.h"
+#include <nvgpu/pmuif/ctrlclk.h>
+#include <nvgpu/pmuif/ctrlboardobj.h>
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include <nvgpu/boardobjgrp_e32.h>
 #include <nvgpu/boardobjgrpmask.h>
diff --git a/drivers/gpu/nvgpu/clk/clk_fll.c b/drivers/gpu/nvgpu/clk/clk_fll.c
index 1172ab69f..58bfa88f4 100644
--- a/drivers/gpu/nvgpu/clk/clk_fll.c
+++ b/drivers/gpu/nvgpu/clk/clk_fll.c
@@ -25,12 +25,12 @@
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobjgrp_e32.h>
 #include <nvgpu/string.h>
+#include <nvgpu/pmuif/ctrlclk.h>
+#include <nvgpu/pmuif/ctrlvolt.h>
 
 #include "clk.h"
 #include "clk_fll.h"
 #include "clk_domain.h"
-#include "ctrl/ctrlclk.h"
-#include "ctrl/ctrlvolt.h"
 
 static int devinit_get_fll_device_table(struct gk20a *g,
 				   struct avfsfllobjs *pfllobjs);
diff --git a/drivers/gpu/nvgpu/clk/clk_freq_controller.c b/drivers/gpu/nvgpu/clk/clk_freq_controller.c
index a2ec7c445..4dbcb8cbb 100644
--- a/drivers/gpu/nvgpu/clk/clk_freq_controller.c
+++ b/drivers/gpu/nvgpu/clk/clk_freq_controller.c
@@ -25,13 +25,13 @@
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobjgrp_e32.h>
 #include <nvgpu/string.h>
+#include <nvgpu/pmuif/ctrlclk.h>
+#include <nvgpu/pmuif/ctrlvolt.h>
 
 #include "clk.h"
 #include "clk_fll.h"
 #include "clk_domain.h"
 #include "clk_freq_controller.h"
-#include "ctrl/ctrlclk.h"
-#include "ctrl/ctrlvolt.h"
 
 static int clk_freq_controller_pmudatainit_super(struct gk20a *g,
 	struct boardobj *board_obj_ptr,
diff --git a/drivers/gpu/nvgpu/clk/clk_prog.c b/drivers/gpu/nvgpu/clk/clk_prog.c
index b94bc2eea..adcecc494 100644
--- a/drivers/gpu/nvgpu/clk/clk_prog.c
+++ b/drivers/gpu/nvgpu/clk/clk_prog.c
@@ -26,13 +26,13 @@
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobjgrp_e32.h>
 #include <nvgpu/string.h>
+#include <nvgpu/pmuif/ctrlclk.h>
+#include <nvgpu/pmuif/ctrlvolt.h>
 
 #include "clk.h"
 #include "clk_prog.h"
 #include "clk_vf_point.h"
 #include "gp106/bios_gp106.h"
-#include "ctrl/ctrlclk.h"
-#include "ctrl/ctrlvolt.h"
 
 static struct clk_prog *construct_clk_prog(struct gk20a *g, void *pargs);
 static int devinit_get_clk_prog_table(struct gk20a *g,
diff --git a/drivers/gpu/nvgpu/clk/clk_prog.h b/drivers/gpu/nvgpu/clk/clk_prog.h
index aaa9ed632..603d25486 100644
--- a/drivers/gpu/nvgpu/clk/clk_prog.h
+++ b/drivers/gpu/nvgpu/clk/clk_prog.h
@@ -22,8 +22,9 @@
 
 #ifndef NVGPU_CLK_PROG_H
 #define NVGPU_CLK_PROG_H
-#include "ctrl/ctrlclk.h"
-#include "ctrl/ctrlboardobj.h"
+
+#include <nvgpu/pmuif/ctrlclk.h>
+#include <nvgpu/pmuif/ctrlboardobj.h>
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include <nvgpu/boardobjgrp_e32.h>
 #include <nvgpu/boardobjgrp_e255.h>
diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.c b/drivers/gpu/nvgpu/clk/clk_vf_point.c
index d0fa71e69..bb99095e6 100644
--- a/drivers/gpu/nvgpu/clk/clk_vf_point.c
+++ b/drivers/gpu/nvgpu/clk/clk_vf_point.c
@@ -24,11 +24,11 @@
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobjgrp_e32.h>
 #include <nvgpu/string.h>
+#include <nvgpu/pmuif/ctrlclk.h>
+#include <nvgpu/pmuif/ctrlvolt.h>
 
 #include "clk.h"
 #include "clk_vf_point.h"
-#include "ctrl/ctrlclk.h"
-#include "ctrl/ctrlvolt.h"
 
 static int _clk_vf_point_pmudatainit_super(struct gk20a *g, struct boardobj
 	*board_obj_ptr,	struct nv_pmu_boardobj *ppmudata);
diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.h b/drivers/gpu/nvgpu/clk/clk_vf_point.h
index f788c2d5f..7afaecf51 100644
--- a/drivers/gpu/nvgpu/clk/clk_vf_point.h
+++ b/drivers/gpu/nvgpu/clk/clk_vf_point.h
@@ -22,8 +22,8 @@
 
 #ifndef NVGPU_CLK_VF_POINT_H
 #define NVGPU_CLK_VF_POINT_H
-#include "ctrl/ctrlclk.h"
-#include "ctrl/ctrlboardobj.h"
+#include <nvgpu/pmuif/ctrlclk.h>
+#include <nvgpu/pmuif/ctrlboardobj.h>
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include <nvgpu/boardobjgrp_e32.h>
 #include <nvgpu/boardobjgrpmask.h>
diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/clk/clk_vin.c
index e22dbd049..93b1de454 100644
--- a/drivers/gpu/nvgpu/clk/clk_vin.c
+++ b/drivers/gpu/nvgpu/clk/clk_vin.c
@@ -27,8 +27,7 @@
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobjgrp_e32.h>
 #include <nvgpu/string.h>
-
-#include "ctrl/ctrlvolt.h"
+#include <nvgpu/pmuif/ctrlvolt.h>
 
 #include "gp106/bios_gp106.h"
 
diff --git a/drivers/gpu/nvgpu/common/boardobj/boardobj.c b/drivers/gpu/nvgpu/common/boardobj/boardobj.c
index 765a57cc8..a0d58b3ad 100644
--- a/drivers/gpu/nvgpu/common/boardobj/boardobj.c
+++ b/drivers/gpu/nvgpu/common/boardobj/boardobj.c
@@ -23,8 +23,7 @@
 #include <nvgpu/kmem.h>
 #include <nvgpu/gk20a.h>
 #include <nvgpu/boardobj.h>
-
-#include "ctrl/ctrlboardobj.h"
+#include <nvgpu/pmuif/ctrlboardobj.h>
 
 int boardobj_construct_super(struct gk20a *g, struct boardobj **ppboardobj,
 				u16 size, void *args)
diff --git a/drivers/gpu/nvgpu/common/boardobj/boardobjgrp.c b/drivers/gpu/nvgpu/common/boardobj/boardobjgrp.c
index 3bcda968a..6e48cf977 100644
--- a/drivers/gpu/nvgpu/common/boardobj/boardobjgrp.c
+++ b/drivers/gpu/nvgpu/common/boardobj/boardobjgrp.c
@@ -23,8 +23,7 @@
 #include <nvgpu/gk20a.h>
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobj.h>
-
-#include "ctrl/ctrlboardobj.h"
+#include <nvgpu/pmuif/ctrlboardobj.h>
 
 static boardobjgrp_objinsert   boardobjgrp_objinsert_final;
 static boardobjgrp_objgetbyidx   boardobjgrp_objgetbyidx_final;
diff --git a/drivers/gpu/nvgpu/common/boardobj/boardobjgrp_e255.c b/drivers/gpu/nvgpu/common/boardobj/boardobjgrp_e255.c
index 8a6f46406..f6aad72e9 100644
--- a/drivers/gpu/nvgpu/common/boardobj/boardobjgrp_e255.c
+++ b/drivers/gpu/nvgpu/common/boardobj/boardobjgrp_e255.c
@@ -25,8 +25,7 @@
 #include <nvgpu/boardobjgrp_e255.h>
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobjgrpmask.h>
-
-#include "ctrl/ctrlboardobj.h"
+#include <nvgpu/pmuif/ctrlboardobj.h>
 
 int boardobjgrpconstruct_e255(struct gk20a *g,
 			      struct boardobjgrp_e255 *pboardobjgrp_e255)
diff --git a/drivers/gpu/nvgpu/common/boardobj/boardobjgrp_e32.c b/drivers/gpu/nvgpu/common/boardobj/boardobjgrp_e32.c
index 6dfbf333f..b65d1c5fe 100644
--- a/drivers/gpu/nvgpu/common/boardobj/boardobjgrp_e32.c
+++ b/drivers/gpu/nvgpu/common/boardobj/boardobjgrp_e32.c
@@ -24,9 +24,7 @@
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobjgrp_e32.h>
 #include <nvgpu/boardobjgrpmask.h>
-
-#include "ctrl/ctrlboardobj.h"
-
+#include <nvgpu/pmuif/ctrlboardobj.h>
 
 int boardobjgrpconstruct_e32(struct gk20a *g,
 			      struct boardobjgrp_e32 *pboardobjgrp_e32)
diff --git a/drivers/gpu/nvgpu/common/boardobj/boardobjgrpmask.c b/drivers/gpu/nvgpu/common/boardobj/boardobjgrpmask.c
index d1af194b5..451d8b5dd 100644
--- a/drivers/gpu/nvgpu/common/boardobj/boardobjgrpmask.c
+++ b/drivers/gpu/nvgpu/common/boardobj/boardobjgrpmask.c
@@ -21,8 +21,7 @@
  */
 #include <nvgpu/gk20a.h>
 #include <nvgpu/boardobjgrp.h>
-
-#include "ctrl/ctrlboardobj.h"
+#include <nvgpu/pmuif/ctrlboardobj.h>
 
 /*
 * Assures that unused bits (size .. (maskDataCount * 32 - 1)) are always zero.
diff --git a/drivers/gpu/nvgpu/ctrl/ctrlboardobj.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/ctrlboardobj.h
similarity index 99%
rename from drivers/gpu/nvgpu/ctrl/ctrlboardobj.h
rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/ctrlboardobj.h
index 8f57e8806..eaa9857ed 100644
--- a/drivers/gpu/nvgpu/ctrl/ctrlboardobj.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/ctrlboardobj.h
@@ -23,6 +23,8 @@
 #ifndef NVGPU_CTRLBOARDOBJ_H
 #define NVGPU_CTRLBOARDOBJ_H
 
+#include <nvgpu/types.h>
+
 struct ctrl_boardobj {
 	u8    type;
 };
diff --git a/drivers/gpu/nvgpu/ctrl/ctrlclk.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/ctrlclk.h
similarity index 100%
rename from drivers/gpu/nvgpu/ctrl/ctrlclk.h
rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/ctrlclk.h
diff --git a/drivers/gpu/nvgpu/ctrl/ctrlclkavfs.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/ctrlclkavfs.h
similarity index 61%
rename from drivers/gpu/nvgpu/ctrl/ctrlclkavfs.h
rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/ctrlclkavfs.h
index 4a616b00f..fe67e7c40 100644
--- a/drivers/gpu/nvgpu/ctrl/ctrlclkavfs.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/ctrlclkavfs.h
@@ -23,7 +23,6 @@
 #ifndef NVGPU_CTRLCLKAVFS_H
 #define NVGPU_CTRLCLKAVFS_H
 
-#include "ctrlboardobj.h"
 /*!
  * Valid global VIN ID values
  */
@@ -53,12 +52,6 @@
 /*!
  * Mask of all GPC VIN IDs supported by RM
  */
-#define	CTRL_CLK_VIN_MASK_UNICAST_GPC (BIT(CTRL_CLK_VIN_ID_GPC0) | \
-			BIT(CTRL_CLK_VIN_ID_GPC1) | \
-			BIT(CTRL_CLK_VIN_ID_GPC2) | \
-			BIT(CTRL_CLK_VIN_ID_GPC3) | \
-			BIT(CTRL_CLK_VIN_ID_GPC4) | \
-			BIT(CTRL_CLK_VIN_ID_GPC5))
 #define CTRL_CLK_LUT_NUM_ENTRIES_MAX   (128U)
 #define CTRL_CLK_LUT_NUM_ENTRIES_GV10x (128U)
 #define CTRL_CLK_LUT_NUM_ENTRIES_GP10x (100U)
@@ -66,42 +59,6 @@
 #define CTRL_CLK_LUT_MIN_VOLTAGE_UV (450000U)
 #define CTRL_CLK_FLL_TYPE_DISABLED 0U
 
-#define    CTRL_CLK_FLL_ID_SYS            (0x00000000U)
-#define    CTRL_CLK_FLL_ID_LTC            (0x00000001U)
-#define    CTRL_CLK_FLL_ID_XBAR           (0x00000002U)
-#define    CTRL_CLK_FLL_ID_GPC0           (0x00000003U)
-#define    CTRL_CLK_FLL_ID_GPC1           (0x00000004U)
-#define    CTRL_CLK_FLL_ID_GPC2           (0x00000005U)
-#define    CTRL_CLK_FLL_ID_GPC3           (0x00000006U)
-#define    CTRL_CLK_FLL_ID_GPC4           (0x00000007U)
-#define    CTRL_CLK_FLL_ID_GPC5           (0x00000008U)
-#define    CTRL_CLK_FLL_ID_GPCS           (0x00000009U)
-#define    CTRL_CLK_FLL_ID_UNDEFINED      (0x000000FFU)
-#define    CTRL_CLK_FLL_MASK_UNDEFINED    (0x00000000U)
-
-/*!
- * Mask of all GPC FLL IDs supported by RM
- */
-#define    CTRL_CLK_FLL_MASK_UNICAST_GPC    (BIT(CTRL_CLK_FLL_ID_GPC0) | \
-					       BIT(CTRL_CLK_FLL_ID_GPC1) | \
-					       BIT(CTRL_CLK_FLL_ID_GPC2) | \
-					       BIT(CTRL_CLK_FLL_ID_GPC3) | \
-					       BIT(CTRL_CLK_FLL_ID_GPC4) | \
-					       BIT(CTRL_CLK_FLL_ID_GPC5))
-/*!
- * Mask of all FLL IDs supported by Nvgpu driver
- */
-#define    CTRL_CLK_FLL_ID_ALL_MASK         (BIT(CTRL_CLK_FLL_ID_SYS)  | \
-					       BIT(CTRL_CLK_FLL_ID_LTC)  | \
-					       BIT(CTRL_CLK_FLL_ID_XBAR) | \
-					       BIT(CTRL_CLK_FLL_ID_GPC0) | \
-					       BIT(CTRL_CLK_FLL_ID_GPC1) | \
-					       BIT(CTRL_CLK_FLL_ID_GPC2) | \
-					       BIT(CTRL_CLK_FLL_ID_GPC3) | \
-					       BIT(CTRL_CLK_FLL_ID_GPC4) | \
-					       BIT(CTRL_CLK_FLL_ID_GPC5) | \
-					       BIT(CTRL_CLK_FLL_ID_GPCS))
-
 #define CTRL_CLK_FLL_REGIME_ID_INVALID                     (0x00000000U)
 #define CTRL_CLK_FLL_REGIME_ID_FFR                         (0x00000001U)
 #define CTRL_CLK_FLL_REGIME_ID_FR                          (0x00000002U)
diff --git a/drivers/gpu/nvgpu/ctrl/ctrlperf.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/ctrlperf.h
similarity index 100%
rename from drivers/gpu/nvgpu/ctrl/ctrlperf.h
rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/ctrlperf.h
diff --git a/drivers/gpu/nvgpu/ctrl/ctrlpmgr.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/ctrlpmgr.h
similarity index 100%
rename from drivers/gpu/nvgpu/ctrl/ctrlpmgr.h
rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/ctrlpmgr.h
diff --git a/drivers/gpu/nvgpu/ctrl/ctrltherm.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/ctrltherm.h
similarity index 100%
rename from drivers/gpu/nvgpu/ctrl/ctrltherm.h
rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/ctrltherm.h
diff --git a/drivers/gpu/nvgpu/ctrl/ctrlvolt.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/ctrlvolt.h
similarity index 100%
rename from drivers/gpu/nvgpu/ctrl/ctrlvolt.h
rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/ctrlvolt.h
diff --git a/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifboardobj.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifboardobj.h
index 47226aa1a..64be8a85d 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifboardobj.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifboardobj.h
@@ -23,7 +23,7 @@
 #define NVGPU_PMUIF_GPMUIFBOARDOBJ_H
 
 #include <nvgpu/flcnif_cmn.h>
-#include "ctrl/ctrlboardobj.h"
+#include <nvgpu/pmuif/ctrlboardobj.h>
 
 /* board object group command id's. */
 #define NV_PMU_BOARDOBJGRP_CMD_SET			0x00U
diff --git a/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifclk.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifclk.h
index a247e53d1..bb7ee6feb 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifclk.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifclk.h
@@ -23,12 +23,12 @@
 #ifndef NVGPU_PMUIF_GPMUIFCLK_H
 #define NVGPU_PMUIF_GPMUIFCLK_H
 
-#include "ctrl/ctrlboardobj.h"
-#include "ctrl/ctrlvolt.h"
-#include "ctrl/ctrlperf.h"
-#include "ctrl/ctrlclk.h"
-#include "gpmuifboardobj.h"
-#include "gpmuifvolt.h"
+#include <nvgpu/pmuif/ctrlboardobj.h>
+#include <nvgpu/pmuif/ctrlvolt.h>
+#include <nvgpu/pmuif/ctrlperf.h>
+#include <nvgpu/pmuif/ctrlclk.h>
+#include <nvgpu/pmuif/gpmuifboardobj.h>
+#include <nvgpu/pmuif/gpmuifvolt.h>
 #include <nvgpu/flcnif_cmn.h>
 
 
diff --git a/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifperfvfe.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifperfvfe.h
index c932ec453..63243c24d 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifperfvfe.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifperfvfe.h
@@ -22,9 +22,9 @@
 #ifndef NVGPU_PMUIF_GPMUIFPERFVFE_H
 #define NVGPU_PMUIF_GPMUIFPERFVFE_H
 
-#include "gpmuifbios.h"
-#include "gpmuifboardobj.h"
-#include "ctrl/ctrlperf.h"
+#include <nvgpu/pmuif/gpmuifbios.h>
+#include <nvgpu/pmuif/gpmuifboardobj.h>
+#include <nvgpu/pmuif/ctrlperf.h>
 
 #define CTRL_PERF_VFE_EQU_QUADRATIC_COEFF_COUNT                      0x03U
 #define NV_PMU_PERF_RPC_VFE_EQU_EVAL_VAR_COUNT_MAX                            2U
diff --git a/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifpmgr.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifpmgr.h
index a0e6c82c7..e5b429f78 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifpmgr.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifpmgr.h
@@ -23,8 +23,8 @@
 #ifndef NVGPU_PMUIF_GPMUIFPMGR_H
 #define NVGPU_PMUIF_GPMUIFPMGR_H
 
-#include "ctrl/ctrlpmgr.h"
-#include "gpmuifboardobj.h"
+#include <nvgpu/pmuif/ctrlpmgr.h>
+#include <nvgpu/pmuif/gpmuifboardobj.h>
 #include <nvgpu/flcnif_cmn.h>
 
 struct nv_pmu_pmgr_i2c_device_desc {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifthermsensor.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifthermsensor.h
index 47d35da78..7b4be6051 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifthermsensor.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifthermsensor.h
@@ -23,8 +23,8 @@
 #ifndef NVGPU_PMUIF_GPMUIFTHERMSENSOR_H
 #define NVGPU_PMUIF_GPMUIFTHERMSENSOR_H
 
-#include "ctrl/ctrltherm.h"
-#include "gpmuifboardobj.h"
+#include <nvgpu/pmuif/ctrltherm.h>
+#include <nvgpu/pmuif/gpmuifboardobj.h>
 #include <nvgpu/flcnif_cmn.h>
 
 #define NV_PMU_THERM_BOARDOBJGRP_CLASS_ID_THERM_DEVICE      0x00
diff --git a/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifvolt.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifvolt.h
index 0161719ad..ba5ca6dbf 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifvolt.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifvolt.h
@@ -22,9 +22,9 @@
 #ifndef NVGPU_PMUIF_GPMUIFVOLT_H
 #define NVGPU_PMUIF_GPMUIFVOLT_H
 
-#include "gpmuifboardobj.h"
+#include <nvgpu/pmuif/gpmuifboardobj.h>
 #include <nvgpu/flcnif_cmn.h>
-#include "ctrl/ctrlvolt.h"
+#include <nvgpu/pmuif/ctrlvolt.h>
 
 #define NV_PMU_VOLT_VALUE_0V_IN_UV	(0U)
 
diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.h b/drivers/gpu/nvgpu/pmgr/pwrdev.h
index a13288b27..8065adc39 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrdev.h
+++ b/drivers/gpu/nvgpu/pmgr/pwrdev.h
@@ -26,7 +26,7 @@
 
 #include <nvgpu/boardobj.h>
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
-#include "ctrl/ctrlpmgr.h"
+#include <nvgpu/pmuif/ctrlpmgr.h>
 
 #define  PWRDEV_I2CDEV_DEVICE_INDEX_NONE  (0xFF)
 
diff --git a/drivers/gpu/nvgpu/pmgr/pwrmonitor.h b/drivers/gpu/nvgpu/pmgr/pwrmonitor.h
index 7fff71109..866aef9f9 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrmonitor.h
+++ b/drivers/gpu/nvgpu/pmgr/pwrmonitor.h
@@ -27,7 +27,7 @@
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobj.h>
-#include "ctrl/ctrlpmgr.h"
+#include <nvgpu/pmuif/ctrlpmgr.h>
 
 struct pwr_channel {
 	struct boardobj super;
diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.h b/drivers/gpu/nvgpu/pmgr/pwrpolicy.h
index 41496a4f7..31748978e 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.h
+++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.h
@@ -27,7 +27,7 @@
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobj.h>
-#include "ctrl/ctrlpmgr.h"
+#include <nvgpu/pmuif/ctrlpmgr.h>
 
 #define PWR_POLICY_EXT_POWER_STATE_ID_COUNT 0x4U
 
diff --git a/drivers/gpu/nvgpu/pmu_perf/vfe_equ.c b/drivers/gpu/nvgpu/pmu_perf/vfe_equ.c
index 9a4531795..219b22103 100644
--- a/drivers/gpu/nvgpu/pmu_perf/vfe_equ.c
+++ b/drivers/gpu/nvgpu/pmu_perf/vfe_equ.c
@@ -25,11 +25,11 @@
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobjgrp_e255.h>
 #include <nvgpu/string.h>
+#include <nvgpu/pmuif/ctrlclk.h>
+#include <nvgpu/pmuif/ctrlvolt.h>
 
 #include "pmu_perf.h"
 #include "vfe_equ.h"
-#include "ctrl/ctrlclk.h"
-#include "ctrl/ctrlvolt.h"
 
 static struct vfe_equ *construct_vfe_equ(struct gk20a *g, void *pargs);
 static int devinit_get_vfe_equ_table(struct gk20a *g,
diff --git a/drivers/gpu/nvgpu/pmu_perf/vfe_var.c b/drivers/gpu/nvgpu/pmu_perf/vfe_var.c
index 0c56b6737..b5fcba4a3 100644
--- a/drivers/gpu/nvgpu/pmu_perf/vfe_var.c
+++ b/drivers/gpu/nvgpu/pmu_perf/vfe_var.c
@@ -25,12 +25,12 @@
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobjgrp_e32.h>
 #include <nvgpu/string.h>
+#include <nvgpu/pmuif/ctrlclk.h>
+#include <nvgpu/pmuif/ctrlvolt.h>
+#include <nvgpu/pmuif/ctrlperf.h>
 
 #include "pmu_perf.h"
 #include "vfe_var.h"
-#include "ctrl/ctrlclk.h"
-#include "ctrl/ctrlvolt.h"
-#include "ctrl/ctrlperf.h"
 
 static int devinit_get_vfe_var_table(struct gk20a *g,
 				     struct vfe_vars *pvarobjs);
diff --git a/drivers/gpu/nvgpu/therm/thrmchannel.h b/drivers/gpu/nvgpu/therm/thrmchannel.h
index 57280ac72..7087dabe0 100644
--- a/drivers/gpu/nvgpu/therm/thrmchannel.h
+++ b/drivers/gpu/nvgpu/therm/thrmchannel.h
@@ -26,7 +26,6 @@
 
 #include <nvgpu/boardobj.h>
 #include <nvgpu/boardobjgrp.h>
-#include "ctrl/ctrltherm.h"
 
 struct therm_channel {
 	struct boardobj super;
diff --git a/drivers/gpu/nvgpu/therm/thrmdev.c b/drivers/gpu/nvgpu/therm/thrmdev.c
index a3bad8a26..119681ef8 100644
--- a/drivers/gpu/nvgpu/therm/thrmdev.c
+++ b/drivers/gpu/nvgpu/therm/thrmdev.c
@@ -26,10 +26,10 @@
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobjgrp_e32.h>
 #include <nvgpu/string.h>
+#include <nvgpu/pmuif/ctrltherm.h>
 
 #include "thrmdev.h"
 #include "gp106/bios_gp106.h"
-#include "ctrl/ctrltherm.h"
 
 static int _therm_device_pmudata_instget(struct gk20a *g,
 			struct nv_pmu_boardobjgrp *pmuboardobjgrp,
diff --git a/drivers/gpu/nvgpu/vgpu/clk_vgpu.c b/drivers/gpu/nvgpu/vgpu/clk_vgpu.c
index 2e0eec6a5..74003316d 100644
--- a/drivers/gpu/nvgpu/vgpu/clk_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/clk_vgpu.c
@@ -26,7 +26,6 @@
 #include <nvgpu/clk_arb.h>
 
 #include "clk_vgpu.h"
-#include "ctrl/ctrlclk.h"
 
 static unsigned long vgpu_clk_get_rate(struct gk20a *g, u32 api_domain)
 {
diff --git a/drivers/gpu/nvgpu/volt/volt_dev.c b/drivers/gpu/nvgpu/volt/volt_dev.c
index c740f7372..aaa4d609e 100644
--- a/drivers/gpu/nvgpu/volt/volt_dev.c
+++ b/drivers/gpu/nvgpu/volt/volt_dev.c
@@ -29,11 +29,10 @@
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobjgrp_e32.h>
 #include <nvgpu/string.h>
+#include <nvgpu/pmuif/ctrlvolt.h>
 
 #include "gp106/bios_gp106.h"
 
-#include "ctrl/ctrlvolt.h"
-
 #include "volt.h"
 
 #define VOLT_DEV_PWM_VOLTAGE_STEPS_INVALID	0U
diff --git a/drivers/gpu/nvgpu/volt/volt_dev.h b/drivers/gpu/nvgpu/volt/volt_dev.h
index 6a5576b09..1ad890143 100644
--- a/drivers/gpu/nvgpu/volt/volt_dev.h
+++ b/drivers/gpu/nvgpu/volt/volt_dev.h
@@ -25,7 +25,7 @@
 
 #include <nvgpu/boardobj.h>
 #include <nvgpu/boardobjgrp.h>
-#include "ctrl/ctrlvolt.h"
+#include <nvgpu/pmuif/ctrlvolt.h>
 
 #define VOLTAGE_TABLE_MAX_ENTRIES_ONE	1U
 #define VOLTAGE_TABLE_MAX_ENTRIES	256U
diff --git a/drivers/gpu/nvgpu/volt/volt_pmu.c b/drivers/gpu/nvgpu/volt/volt_pmu.c
index a8b489ed7..20380f00e 100644
--- a/drivers/gpu/nvgpu/volt/volt_pmu.c
+++ b/drivers/gpu/nvgpu/volt/volt_pmu.c
@@ -25,10 +25,10 @@
 #include <nvgpu/gk20a.h>
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobjgrp_e32.h>
+#include <nvgpu/pmuif/ctrlvolt.h>
+#include <nvgpu/pmuif/ctrlperf.h>
 
 #include "gp106/bios_gp106.h"
-#include "ctrl/ctrlvolt.h"
-#include "ctrl/ctrlperf.h"
 
 #include "volt.h"
 
diff --git a/drivers/gpu/nvgpu/volt/volt_policy.c b/drivers/gpu/nvgpu/volt/volt_policy.c
index f06eebba0..035614c65 100644
--- a/drivers/gpu/nvgpu/volt/volt_policy.c
+++ b/drivers/gpu/nvgpu/volt/volt_policy.c
@@ -25,9 +25,9 @@
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobjgrp_e32.h>
 #include <nvgpu/string.h>
+#include <nvgpu/pmuif/ctrlvolt.h>
 
 #include "gp106/bios_gp106.h"
-#include "ctrl/ctrlvolt.h"
 
 #include "volt.h"
 
diff --git a/drivers/gpu/nvgpu/volt/volt_rail.c b/drivers/gpu/nvgpu/volt/volt_rail.c
index 58ac24890..fa4ac6b20 100644
--- a/drivers/gpu/nvgpu/volt/volt_rail.c
+++ b/drivers/gpu/nvgpu/volt/volt_rail.c
@@ -25,9 +25,9 @@
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobjgrp_e32.h>
 #include <nvgpu/string.h>
+#include <nvgpu/pmuif/ctrlvolt.h>
 
 #include "gp106/bios_gp106.h"
-#include "ctrl/ctrlvolt.h"
 
 #include "volt.h"