diff --git a/dlls/user/controls.h b/dlls/user/controls.h
index eef17767002..98dfa4d2e46 100644
--- a/dlls/user/controls.h
+++ b/dlls/user/controls.h
@@ -22,7 +22,7 @@
 #define __WINE_CONTROLS_H
 
 #include "winuser.h"
-#include "winproc.h"
+#include "wine/winbase16.h"
 
 /* Built-in class names (see _Undocumented_Windows_ p.418) */
 #define POPUPMENU_CLASS_ATOMA MAKEINTATOMA(32768)  /* PopupMenu */
@@ -45,6 +45,12 @@ struct builtin_class_descr
     HBRUSH    brush;   /* brush or system color */
 };
 
+/* Class functions */
+struct tagCLASS;  /* opaque structure */
+struct tagWND;
+extern void CLASS_RegisterBuiltinClasses(void);
+extern void CLASS_AddWindow( struct tagCLASS *class, struct tagWND *win, BOOL unicode );
+extern void CLASS_FreeModuleClasses( HMODULE16 hModule );
 
 /* defwnd proc */
 extern HBRUSH DEFWND_ControlColor( HDC hDC, UINT ctlType );
diff --git a/dlls/user/user16.c b/dlls/user/user16.c
index 3ffde37eb2f..37535ee6624 100644
--- a/dlls/user/user16.c
+++ b/dlls/user/user16.c
@@ -30,7 +30,7 @@
 #include "wownt32.h"
 #include "user_private.h"
 #include "win.h"
-#include "winproc.h"
+#include "controls.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(user);
diff --git a/dlls/user/win.c b/dlls/user/win.c
index 4c1845d95cb..080835cbef1 100644
--- a/dlls/user/win.c
+++ b/dlls/user/win.c
@@ -33,6 +33,7 @@
 #include "wine/server.h"
 #include "wine/unicode.h"
 #include "win.h"
+#include "winproc.h"
 #include "user_private.h"
 #include "controls.h"
 #include "winpos.h"
diff --git a/dlls/user/winproc.h b/dlls/user/winproc.h
index 48211401e48..69b6d76814d 100644
--- a/dlls/user/winproc.h
+++ b/dlls/user/winproc.h
@@ -49,11 +49,4 @@ extern INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, W
 extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );
 extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );
 
-/* Class functions */
-struct tagCLASS;  /* opaque structure */
-struct tagWND;
-extern void CLASS_RegisterBuiltinClasses(void);
-extern void CLASS_AddWindow( struct tagCLASS *class, struct tagWND *win, BOOL unicode );
-extern void CLASS_FreeModuleClasses( HMODULE16 hModule );
-
 #endif  /* __WINE_WINPROC_H */