diff --git a/arch b/arch
index d5fbee3036..3bdc50ab54 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit d5fbee30366a95c69d6c2fab19b2c52f48b73137
+Subproject commit 3bdc50ab54041c2b730d31c646df44261c7a7cae
diff --git a/configs b/configs
index 11a38b2912..bc630b39f5 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 11a38b291293ba4fc18e91343b4a0ca94edf670d
+Subproject commit bc630b39f5dc935b40397b72a14e4f729afa3e08
diff --git a/drivers/power/pm.h b/drivers/power/pm.h
index 3c036b6c84..ed3e5bacac 100644
--- a/drivers/power/pm.h
+++ b/drivers/power/pm.h
@@ -210,7 +210,7 @@ EXTERN struct pm_global_s g_pmglobals;
  *
  ****************************************************************************/
 
-EXTERN void pm_update(int domain, int16_t accum);
+void pm_update(int domain, int16_t accum);
 
 #undef EXTERN
 #if defined(__cplusplus)
diff --git a/drivers/power/pm_activity.c b/drivers/power/pm_activity.c
index 5a608d1289..bdc38afb59 100644
--- a/drivers/power/pm_activity.c
+++ b/drivers/power/pm_activity.c
@@ -39,6 +39,9 @@
 
 #include <nuttx/config.h>
 
+#include <stdint.h>
+#include <assert.h>
+
 #include <nuttx/power/pm.h>
 #include <nuttx/clock.h>
 #include <nuttx/irq.h>
diff --git a/drivers/power/pm_changestate.c b/drivers/power/pm_changestate.c
index 5884d58e9a..92c75a770f 100644
--- a/drivers/power/pm_changestate.c
+++ b/drivers/power/pm_changestate.c
@@ -39,6 +39,9 @@
 
 #include <nuttx/config.h>
 
+#include <queue.h>
+#include <assert.h>
+
 #include <nuttx/power/pm.h>
 #include <nuttx/irq.h>
 
diff --git a/drivers/power/pm_checkstate.c b/drivers/power/pm_checkstate.c
index 024fe136e1..fc7f0a8716 100644
--- a/drivers/power/pm_checkstate.c
+++ b/drivers/power/pm_checkstate.c
@@ -39,6 +39,8 @@
 
 #include <nuttx/config.h>
 
+#include <assert.h>
+
 #include <nuttx/power/pm.h>
 #include <nuttx/clock.h>
 #include <nuttx/irq.h>