diff --git a/reactos/dll/win32/samsrv/alias.c b/reactos/dll/win32/samsrv/alias.c
index 4c2e1123351..e731a932538 100644
--- a/reactos/dll/win32/samsrv/alias.c
+++ b/reactos/dll/win32/samsrv/alias.c
@@ -6,13 +6,8 @@
  * COPYRIGHT:   Copyright 2013 Eric Kohl
  */
 
-/* INCLUDES ****************************************************************/
-
 #include "samsrv.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(samsrv);
-
-
 /* FUNCTIONS ***************************************************************/
 
 NTSTATUS
diff --git a/reactos/dll/win32/samsrv/database.c b/reactos/dll/win32/samsrv/database.c
index 1a150052a48..512e7e1f8a2 100644
--- a/reactos/dll/win32/samsrv/database.c
+++ b/reactos/dll/win32/samsrv/database.c
@@ -6,13 +6,8 @@
  * COPYRIGHT:   Copyright 2012 Eric Kohl
  */
 
-/* INCLUDES ****************************************************************/
-
 #include "samsrv.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(samsrv);
-
-
 /* GLOBALS *****************************************************************/
 
 static HANDLE SamKeyHandle = NULL;
diff --git a/reactos/dll/win32/samsrv/domain.c b/reactos/dll/win32/samsrv/domain.c
index bb9c7fc544a..95080af777e 100644
--- a/reactos/dll/win32/samsrv/domain.c
+++ b/reactos/dll/win32/samsrv/domain.c
@@ -6,13 +6,8 @@
  * COPYRIGHT:   Copyright 2013 Eric Kohl
  */
 
-/* INCLUDES ****************************************************************/
-
 #include "samsrv.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(samsrv);
-
-
 /* FUNCTIONS ***************************************************************/
 
 NTSTATUS
diff --git a/reactos/dll/win32/samsrv/group.c b/reactos/dll/win32/samsrv/group.c
index 9bf0c86168e..1fdcd58026e 100644
--- a/reactos/dll/win32/samsrv/group.c
+++ b/reactos/dll/win32/samsrv/group.c
@@ -6,13 +6,8 @@
  * COPYRIGHT:   Copyright 2013 Eric Kohl
  */
 
-/* INCLUDES ****************************************************************/
-
 #include "samsrv.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(samsrv);
-
-
 /* FUNCTIONS ***************************************************************/
 
 NTSTATUS
diff --git a/reactos/dll/win32/samsrv/registry.c b/reactos/dll/win32/samsrv/registry.c
index 5b4092d515e..e84dadde88b 100644
--- a/reactos/dll/win32/samsrv/registry.c
+++ b/reactos/dll/win32/samsrv/registry.c
@@ -7,12 +7,8 @@
  * PROGRAMMERS:     Eric Kohl
  */
 
-/* INCLUDES ****************************************************************/
-
 #include "samsrv.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(samsrv);
-
 /* FUNCTIONS ***************************************************************/
 
 static
diff --git a/reactos/dll/win32/samsrv/samrpc.c b/reactos/dll/win32/samsrv/samrpc.c
index 24f684db213..ab67864e63c 100644
--- a/reactos/dll/win32/samsrv/samrpc.c
+++ b/reactos/dll/win32/samsrv/samrpc.c
@@ -7,12 +7,8 @@
  * PROGRAMMERS:     Eric Kohl
  */
 
-/* INCLUDES ******************************************************************/
-
 #include "samsrv.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(samsrv);
-
 /* GLOBALS *******************************************************************/
 
 static SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY};
diff --git a/reactos/dll/win32/samsrv/samsrv.c b/reactos/dll/win32/samsrv/samsrv.c
index b33da721940..19342d2091a 100644
--- a/reactos/dll/win32/samsrv/samsrv.c
+++ b/reactos/dll/win32/samsrv/samsrv.c
@@ -17,13 +17,8 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/* INCLUDES *****************************************************************/
-
 #include "samsrv.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(samsrv);
-
-
 /* GLOBALS *******************************************************************/
 
 ENCRYPTED_NT_OWF_PASSWORD EmptyNtHash;
diff --git a/reactos/dll/win32/samsrv/samsrv.h b/reactos/dll/win32/samsrv/samsrv.h
index ffd2617d855..9ce7ff32cc0 100644
--- a/reactos/dll/win32/samsrv/samsrv.h
+++ b/reactos/dll/win32/samsrv/samsrv.h
@@ -31,6 +31,7 @@
 #include <sam_s.h>
 
 #include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(samsrv);
 
 #include "resources.h"
 
diff --git a/reactos/dll/win32/samsrv/security.c b/reactos/dll/win32/samsrv/security.c
index e1410a8ba2c..8875b53bbb2 100644
--- a/reactos/dll/win32/samsrv/security.c
+++ b/reactos/dll/win32/samsrv/security.c
@@ -7,13 +7,8 @@
  * PROGRAMMERS:     Eric Kohl
  */
 
-/* INCLUDES ****************************************************************/
-
 #include "samsrv.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(samsrv);
-
-
 /* GLOBALS *****************************************************************/
 
 static SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY};
diff --git a/reactos/dll/win32/samsrv/setup.c b/reactos/dll/win32/samsrv/setup.c
index 10cef65b466..4ec43f7e4ba 100644
--- a/reactos/dll/win32/samsrv/setup.c
+++ b/reactos/dll/win32/samsrv/setup.c
@@ -7,20 +7,14 @@
  * PROGRAMMERS:     Eric Kohl
  */
 
-/* INCLUDES ****************************************************************/
-
 #include "samsrv.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(samsrv);
-
-
 /* GLOBALS *****************************************************************/
 
 #define TICKS_PER_SECOND 10000000LL
 
 SID_IDENTIFIER_AUTHORITY SecurityNtAuthority = {SECURITY_NT_AUTHORITY};
 
-
 /* FUNCTIONS ***************************************************************/
 
 static BOOL
diff --git a/reactos/dll/win32/samsrv/user.c b/reactos/dll/win32/samsrv/user.c
index cd38732e20e..04ca49f9912 100644
--- a/reactos/dll/win32/samsrv/user.c
+++ b/reactos/dll/win32/samsrv/user.c
@@ -6,13 +6,8 @@
  * COPYRIGHT:   Copyright 2013 Eric Kohl
  */
 
-/* INCLUDES ****************************************************************/
-
 #include "samsrv.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(samsrv);
-
-
 /* FUNCTIONS ***************************************************************/
 
 NTSTATUS
diff --git a/reactos/dll/win32/samsrv/utils.c b/reactos/dll/win32/samsrv/utils.c
index 518b8f4a2cc..f18efa0505b 100644
--- a/reactos/dll/win32/samsrv/utils.c
+++ b/reactos/dll/win32/samsrv/utils.c
@@ -7,16 +7,8 @@
  * PROGRAMMERS:     Eric Kohl
  */
 
-/* INCLUDES ****************************************************************/
-
 #include "samsrv.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(samsrv);
-
-
-/* GLOBALS *****************************************************************/
-
-
 /* FUNCTIONS ***************************************************************/
 
 INT