diff --git a/reactos/dll/win32/msafd/misc/dllmain.c b/reactos/dll/win32/msafd/misc/dllmain.c
index 61a4244c85a..db0de7c47b1 100644
--- a/reactos/dll/win32/msafd/misc/dllmain.c
+++ b/reactos/dll/win32/msafd/misc/dllmain.c
@@ -12,6 +12,8 @@
 
 #include <msafd.h>
 
+#include <winuser.h>
+
 #if DBG
 //DWORD DebugTraceLevel = DEBUG_ULTRA;
 DWORD DebugTraceLevel = 0;
diff --git a/reactos/dll/win32/msafd/misc/helpers.c b/reactos/dll/win32/msafd/misc/helpers.c
index 7eac4c46ad0..8c0e588e5f7 100644
--- a/reactos/dll/win32/msafd/misc/helpers.c
+++ b/reactos/dll/win32/msafd/misc/helpers.c
@@ -9,8 +9,11 @@
  *   CSH 01/09-2000 Created
  *	 Alex 16/07/2004 - Complete Rewrite
  */
+
 #include <msafd.h>
 
+#include <winreg.h>
+
 CRITICAL_SECTION HelperDLLDatabaseLock;
 LIST_ENTRY HelperDLLDatabaseListHead;
 
diff --git a/reactos/dll/win32/msafd/misc/stubs.c b/reactos/dll/win32/msafd/misc/stubs.c
index e3840599665..eaa2d704628 100644
--- a/reactos/dll/win32/msafd/misc/stubs.c
+++ b/reactos/dll/win32/msafd/misc/stubs.c
@@ -7,6 +7,7 @@
  * REVISIONS:
  *   CSH 01/09-2000 Created
  */
+
 #include <msafd.h>
 
 INT
diff --git a/reactos/dll/win32/msafd/msafd.h b/reactos/dll/win32/msafd/msafd.h
index ec8e9e5a828..97f3816563d 100644
--- a/reactos/dll/win32/msafd/msafd.h
+++ b/reactos/dll/win32/msafd/msafd.h
@@ -4,17 +4,18 @@
  * FILE:        include/msafd.h
  * PURPOSE:     Ancillary Function Driver DLL header
  */
+
 #ifndef __MSAFD_H
 #define __MSAFD_H
 
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
-#include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
-#include <winuser.h>
-#include <winreg.h>
 #include <ws2spi.h>
 #define NTOS_MODE_USER
 #include <ndk/exfuncs.h>
@@ -507,5 +508,3 @@ MsafdReturnWithErrno(NTSTATUS Status,
 }
 
 #endif /* __MSAFD_H */
-
-/* EOF */