diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 814e0c874..aa9098499 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-07  Chris Sutcliffe  <ir0nh34d@users.sf.net>
+
+	* include/winbase.h (PSAPI_WORKING_SET_BLOCK,
+	PSAPI_WORKING_SET_INFORMATION): Move from here...
+	* include/psapi.h (PSAPI_WORKING_SET_BLOCK,
+	PSAPI_WORKING_SET_INFORMATION): ... to here.
+
 2011-03-05  Chris Sutcliffe  <ir0nh34d@users.sf.net>
 
 	* include/w32api.h: Increment version to 3.16.
diff --git a/winsup/w32api/include/psapi.h b/winsup/w32api/include/psapi.h
index ba08fa02a..cfde1d287 100644
--- a/winsup/w32api/include/psapi.h
+++ b/winsup/w32api/include/psapi.h
@@ -81,6 +81,22 @@ typedef struct _PERFORMANCE_INFORMATION {
   DWORD ThreadCount;
 } PERFORMANCE_INFORMATION, *PPERFORMANCE_INFORMATION;
 
+typedef union _PSAPI_WORKING_SET_BLOCK {
+  ULONG_PTR Flags;
+  struct {
+    ULONG_PTR Protection  :5;
+    ULONG_PTR ShareCount  :3;
+    ULONG_PTR Shared  :1;
+    ULONG_PTR Reserved  :3;
+    ULONG_PTR VirtualPage  :20;
+  } ;
+} PSAPI_WORKING_SET_BLOCK, *PPSAPI_WORKING_SET_BLOCK;
+
+typedef struct _PSAPI_WORKING_SET_INFORMATION {
+  ULONG_PTR               NumberOfEntries;
+  PSAPI_WORKING_SET_BLOCK WorkingSetInfo[1];
+} PSAPI_WORKING_SET_INFORMATION, *PPSAPI_WORKING_SET_INFORMATION;
+
 /* Grouped by application,not in alphabetical order. */
 BOOL WINAPI EnumProcesses(DWORD *,DWORD,DWORD *);
 BOOL WINAPI EnumProcessModules(HANDLE,HMODULE *,DWORD,LPDWORD);
diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index c09f2065b..acb90fa7c 100644
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -2647,22 +2647,6 @@ typedef PCACTCTXA PCACTCTX;
 #endif
 #endif
 
-typedef union _PSAPI_WORKING_SET_BLOCK {
-  ULONG_PTR Flags;
-  struct {
-    ULONG_PTR Protection  :5;
-    ULONG_PTR ShareCount  :3;
-    ULONG_PTR Shared  :1;
-    ULONG_PTR Reserved  :3;
-    ULONG_PTR VirtualPage  :20;
-  } ;
-} PSAPI_WORKING_SET_BLOCK, *PPSAPI_WORKING_SET_BLOCK;
-
-typedef struct _PSAPI_WORKING_SET_INFORMATION {
-  ULONG_PTR               NumberOfEntries;
-  PSAPI_WORKING_SET_BLOCK WorkingSetInfo[1];
-} PSAPI_WORKING_SET_INFORMATION, *PPSAPI_WORKING_SET_INFORMATION;
-
 #ifdef __cplusplus
 }
 #endif