diff --git a/reactos/include/psdk/winuser.h b/reactos/include/psdk/winuser.h
index e4412993f1c..30258941216 100644
--- a/reactos/include/psdk/winuser.h
+++ b/reactos/include/psdk/winuser.h
@@ -1725,8 +1725,6 @@ extern "C" {
 #define WM_TCARD 82
 #define WM_TIMECHANGE 30
 #define WM_TIMER 275
-#define WM_SYSTIMER 280
-#define WM_POPUPSYSTEMMENU 787
 #define WM_UNDO 772
 #define WM_USER 1024
 #define WM_USERCHANGED 84
diff --git a/reactos/include/reactos/win32k/ntuser.h b/reactos/include/reactos/win32k/ntuser.h
index 0cc48479d64..023cd3b8e3c 100644
--- a/reactos/include/reactos/win32k/ntuser.h
+++ b/reactos/include/reactos/win32k/ntuser.h
@@ -404,6 +404,12 @@ typedef struct _BROADCASTPARM
 PW32THREADINFO GetW32ThreadInfo(VOID);
 PW32PROCESSINFO GetW32ProcessInfo(VOID);
 
+//
+// Non SDK Window Message types.
+//
+#define WM_SYSTIMER 280
+#define WM_POPUPSYSTEMMENU 787
+
 
 DWORD
 NTAPI