diff --git a/reactos/dll/win32/samsrv/registry.c b/reactos/dll/win32/samsrv/registry.c
index e84dadde88b..d27cb8eb036 100644
--- a/reactos/dll/win32/samsrv/registry.c
+++ b/reactos/dll/win32/samsrv/registry.c
@@ -9,6 +9,9 @@
 
 #include "samsrv.h"
 
+#include <ndk/cmfuncs.h>
+#include <ndk/obfuncs.h>
+
 /* FUNCTIONS ***************************************************************/
 
 static
diff --git a/reactos/dll/win32/samsrv/samsrv.c b/reactos/dll/win32/samsrv/samsrv.c
index 19342d2091a..201d116a57f 100644
--- a/reactos/dll/win32/samsrv/samsrv.c
+++ b/reactos/dll/win32/samsrv/samsrv.c
@@ -19,6 +19,8 @@
 
 #include "samsrv.h"
 
+#include <samsrv/samsrv.h>
+
 /* GLOBALS *******************************************************************/
 
 ENCRYPTED_NT_OWF_PASSWORD EmptyNtHash;
diff --git a/reactos/dll/win32/samsrv/samsrv.h b/reactos/dll/win32/samsrv/samsrv.h
index 9ce7ff32cc0..36dd16587d2 100644
--- a/reactos/dll/win32/samsrv/samsrv.h
+++ b/reactos/dll/win32/samsrv/samsrv.h
@@ -9,32 +9,24 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <limits.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
+
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
-#include <winuser.h>
 #define NTOS_MODE_USER
-#include <ndk/cmfuncs.h>
 #include <ndk/kefuncs.h>
-#include <ndk/obfuncs.h>
 #include <ndk/rtlfuncs.h>
 #include <ddk/ntsam.h>
-#include <ntsecapi.h>
 #include <sddl.h>
-
-#include <samsrv/samsrv.h>
-
 #include <sam_s.h>
 
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(samsrv);
 
-#include "resources.h"
-
 typedef enum _SAM_DB_OBJECT_TYPE
 {
     SamDbIgnoreObject,
@@ -438,5 +430,3 @@ NTSTATUS
 WINAPI
 SystemFunction007(PUNICODE_STRING string,
                   LPBYTE hash);
-
-/* EOF */
diff --git a/reactos/dll/win32/samsrv/setup.c b/reactos/dll/win32/samsrv/setup.c
index 4ec43f7e4ba..2e5c970fec0 100644
--- a/reactos/dll/win32/samsrv/setup.c
+++ b/reactos/dll/win32/samsrv/setup.c
@@ -9,6 +9,10 @@
 
 #include "samsrv.h"
 
+#include <ntsecapi.h>
+
+#include "resources.h"
+
 /* GLOBALS *****************************************************************/
 
 #define TICKS_PER_SECOND 10000000LL
diff --git a/reactos/dll/win32/samsrv/utils.c b/reactos/dll/win32/samsrv/utils.c
index f18efa0505b..4d0f039fd41 100644
--- a/reactos/dll/win32/samsrv/utils.c
+++ b/reactos/dll/win32/samsrv/utils.c
@@ -9,6 +9,8 @@
 
 #include "samsrv.h"
 
+#include <winuser.h>
+
 /* FUNCTIONS ***************************************************************/
 
 INT