diff --git a/drivers/power/activity_governor.c b/drivers/power/activity_governor.c
index dcd44c1bfc9..c124e52b9b1 100644
--- a/drivers/power/activity_governor.c
+++ b/drivers/power/activity_governor.c
@@ -188,7 +188,7 @@ struct pm_activity_governor_s g_pm_activity_governor =
 #endif
 };
 
-static struct pm_governor_s g_pmgovernor =
+static const struct pm_governor_s g_pmgovernor =
 {
   governor_initialize,   /* initialize */
   NULL,                  /* deinitialize */
@@ -594,7 +594,7 @@ static void governor_timer(int domain)
  * Public Functions
  ****************************************************************************/
 
-FAR struct pm_governor_s *pm_activity_governor_initialize(void)
+FAR const struct pm_governor_s *pm_activity_governor_initialize(void)
 {
   return &g_pmgovernor;
 }
diff --git a/drivers/power/activity_governor.h b/drivers/power/activity_governor.h
index b997834b92c..9478d99c578 100644
--- a/drivers/power/activity_governor.h
+++ b/drivers/power/activity_governor.h
@@ -176,12 +176,6 @@ extern "C"
 #define EXTERN extern
 #endif
 
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-FAR struct pm_governor_s *pm_activity_governor_initialize(void);
-
 #undef EXTERN
 #ifdef __cplusplus
 }
diff --git a/drivers/power/greedy_governor.c b/drivers/power/greedy_governor.c
index 43c839db055..1ba7000114f 100644
--- a/drivers/power/greedy_governor.c
+++ b/drivers/power/greedy_governor.c
@@ -62,7 +62,7 @@ static enum pm_state_e greedy_governor_checkstate(int domain);
  * Private Data
  ****************************************************************************/
 
-static struct pm_governor_s g_greedy_governor_ops =
+static const struct pm_governor_s g_greedy_governor_ops =
 {
   greedy_governor_initialize,   /* initialize */
   NULL,                         /* deinitialize */
diff --git a/drivers/power/greedy_governor.h b/drivers/power/greedy_governor.h
index 96bac1b2396..9694cc4b80f 100644
--- a/drivers/power/greedy_governor.h
+++ b/drivers/power/greedy_governor.h
@@ -41,23 +41,6 @@ extern "C"
 #define EXTERN extern
 #endif
 
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Name: pm_greedy_governor_register
- *
- * Description:
- *   Return the greedy governor instance.
- *
- * Returned Value:
- *   A pointer to the governor struct. Otherwise NULL is returned on error.
- *
- ****************************************************************************/
-
-FAR const struct pm_governor_s *pm_greedy_governor_initialize(void);
-
 #undef EXTERN
 #ifdef __cplusplus
 }
diff --git a/drivers/power/pm_initialize.c b/drivers/power/pm_initialize.c
index fc458eb1489..0207bb79ffc 100644
--- a/drivers/power/pm_initialize.c
+++ b/drivers/power/pm_initialize.c
@@ -28,12 +28,6 @@
 
 #include "pm.h"
 
-#if defined(CONFIG_PM_GOVERNOR_ACTIVITY)
-#  include "activity_governor.h"
-#elif defined(CONFIG_PM_GOVERNOR_GREEDY)
-#  include "greedy_governor.h"
-#endif
-
 #ifdef CONFIG_PM
 
 /****************************************************************************