diff --git a/drivers/power/pm.h b/drivers/power/pm.h
index ca301e65a3e..131ec8c5dbb 100644
--- a/drivers/power/pm.h
+++ b/drivers/power/pm.h
@@ -32,7 +32,6 @@
 #include <nuttx/mutex.h>
 #include <nuttx/clock.h>
 #include <nuttx/power/pm.h>
-#include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
 
 #ifdef CONFIG_PM
@@ -58,7 +57,6 @@ struct pm_domain_s
   /* The power state lock count */
 
   struct dq_queue_s wakelock[PM_COUNT];
-  struct wdog_s wdog[PM_COUNT];
 
   /* Auto update or not */
 
diff --git a/drivers/power/pm_activity.c b/drivers/power/pm_activity.c
index 3f6dbfcf630..0ca44abb7ea 100644
--- a/drivers/power/pm_activity.c
+++ b/drivers/power/pm_activity.c
@@ -268,7 +268,7 @@ void pm_wakelock_uninit(FAR struct pm_wakelock_s *wakelock)
   domain = wakelock->domain;
   pdom   = &g_pmglobals.domain[domain];
   dq     = &pdom->wakelock[wakelock->state];
-  wdog   = &pdom->wdog[wakelock->state];
+  wdog   = &wakelock->wdog;
 
   flags = pm_lock(domain);
 
@@ -412,7 +412,7 @@ void pm_wakelock_staytimeout(FAR struct pm_wakelock_s *wakelock, int ms)
   domain = wakelock->domain;
   pdom   = &g_pmglobals.domain[domain];
   dq     = &pdom->wakelock[wakelock->state];
-  wdog   = &pdom->wdog[wakelock->state];
+  wdog   = &wakelock->wdog;
 
   flags = pm_lock(domain);
 
diff --git a/include/nuttx/power/pm.h b/include/nuttx/power/pm.h
index 79fec779114..4eb29422c63 100644
--- a/include/nuttx/power/pm.h
+++ b/include/nuttx/power/pm.h
@@ -54,6 +54,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <nuttx/wdog.h>
 
 #include <stdbool.h>
 #include <queue.h>
@@ -85,8 +86,7 @@
  * own, custom idle loop to support board-specific IDLE time power management
  */
 
-#define PM_WAKELOCK_INITIALIZER(name, domain, state) \
-                 {{NULL, NULL}, name, domain, state, 0}
+#define PM_WAKELOCK_INITIALIZER(name, domain, state) {name, domain, state}
 
 #define PM_WAKELOCK_DECLARE(var, name, domain, state) \
       struct pm_wakelock_s var = PM_WAKELOCK_INITIALIZER(name, domain, state)
@@ -297,11 +297,12 @@ struct pm_user_governor_state_s
 
 struct pm_wakelock_s
 {
-  struct dq_entry_s node;
   char name[32];
   int domain;
   enum pm_state_e state;
   uint32_t count;
+  struct dq_entry_s node;
+  struct wdog_s wdog;
 };
 
 /****************************************************************************