diff --git a/reactos/dll/win32/netapi32/access.c b/reactos/dll/win32/netapi32/access.c
index 968cd30469f..7ba2fa553cf 100644
--- a/reactos/dll/win32/netapi32/access.c
+++ b/reactos/dll/win32/netapi32/access.c
@@ -22,7 +22,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
 
-
 /************************************************************
  *                ACCESS_QueryAdminDisplayInformation
  *
diff --git a/reactos/dll/win32/netapi32/browsr.c b/reactos/dll/win32/netapi32/browsr.c
index 80c4b8d080d..9ccb3dc0eac 100644
--- a/reactos/dll/win32/netapi32/browsr.c
+++ b/reactos/dll/win32/netapi32/browsr.c
@@ -20,6 +20,8 @@
 
 #include "netapi32.h"
 
+#include <lmbrowsr.h>
+
 /************************************************************
  *                I_BrowserSetNetlogonState  (NETAPI32.@)
  */
diff --git a/reactos/dll/win32/netapi32/ds.c b/reactos/dll/win32/netapi32/ds.c
index 0707737895c..98caa95eeb0 100644
--- a/reactos/dll/win32/netapi32/ds.c
+++ b/reactos/dll/win32/netapi32/ds.c
@@ -20,6 +20,9 @@
 
 #include "netapi32.h"
 
+#include <dsrole.h>
+#include <dsgetdc.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(ds);
 
 DWORD WINAPI DsGetDcNameW(LPCWSTR ComputerName, LPCWSTR AvoidDCName,
diff --git a/reactos/dll/win32/netapi32/group.c b/reactos/dll/win32/netapi32/group.c
index e8d1a920861..92627ece51a 100644
--- a/reactos/dll/win32/netapi32/group.c
+++ b/reactos/dll/win32/netapi32/group.c
@@ -22,7 +22,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
 
-
 /************************************************************
  * NetGroupAdd  (NETAPI32.@)
  *
diff --git a/reactos/dll/win32/netapi32/local_group.c b/reactos/dll/win32/netapi32/local_group.c
index c3a623a34f2..6670b395513 100644
--- a/reactos/dll/win32/netapi32/local_group.c
+++ b/reactos/dll/win32/netapi32/local_group.c
@@ -22,7 +22,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
 
-
 typedef enum _ENUM_PHASE
 {
     BuiltinPhase,
diff --git a/reactos/dll/win32/netapi32/misc.c b/reactos/dll/win32/netapi32/misc.c
index 8f12992a206..c864e17e0ae 100644
--- a/reactos/dll/win32/netapi32/misc.c
+++ b/reactos/dll/win32/netapi32/misc.c
@@ -11,15 +11,12 @@
 
 #include "netapi32.h"
 
-
 WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
 
-
 /* GLOBALS *******************************************************************/
 
 static SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY};
 
-
 /* FUNCTIONS *****************************************************************/
 
 NTSTATUS
diff --git a/reactos/dll/win32/netapi32/nbcmdqueue.c b/reactos/dll/win32/netapi32/nbcmdqueue.c
index e201a39ca73..7e95010817c 100644
--- a/reactos/dll/win32/netapi32/nbcmdqueue.c
+++ b/reactos/dll/win32/netapi32/nbcmdqueue.c
@@ -14,9 +14,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#include <config.h>
-#include <wine/debug.h>
-#include "nbcmdqueue.h"
+
+#include "netapi32.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(netbios);
 
diff --git a/reactos/dll/win32/netapi32/nbcmdqueue.h b/reactos/dll/win32/netapi32/nbcmdqueue.h
index a595f83f3f6..8bd45b1e0be 100644
--- a/reactos/dll/win32/netapi32/nbcmdqueue.h
+++ b/reactos/dll/win32/netapi32/nbcmdqueue.h
@@ -17,15 +17,6 @@
 #ifndef __NBCMDQUEUE_H__
 #define __NBCMDQUEUE_H__
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <nb30.h>
-
 /* This file defines a queue of pending NetBIOS commands.  The queue operations
  * are thread safe, with the exception of NBCmdQueueDestroy:  ensure no other
  * threads are manipulating the queue when calling NBCmdQueueDestroy.
diff --git a/reactos/dll/win32/netapi32/nbnamecache.c b/reactos/dll/win32/netapi32/nbnamecache.c
index 0fcbfbe434f..ae726e9ab59 100644
--- a/reactos/dll/win32/netapi32/nbnamecache.c
+++ b/reactos/dll/win32/netapi32/nbnamecache.c
@@ -19,10 +19,7 @@
  * rather more efficient than not having a name cache at all.
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-#include "nbnamecache.h"
+#include "netapi32.h"
 
 typedef struct _NBNameCacheNode
 {
diff --git a/reactos/dll/win32/netapi32/nbnamecache.h b/reactos/dll/win32/netapi32/nbnamecache.h
index b8379c8fe21..bfdbb33abbe 100644
--- a/reactos/dll/win32/netapi32/nbnamecache.h
+++ b/reactos/dll/win32/netapi32/nbnamecache.h
@@ -17,16 +17,6 @@
 #ifndef __WINE_NBNAMECACHE_H
 #define __WINE_NBNAMECACHE_H
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <nb30.h>
-
 struct NBNameCache;
 
 /* Represents an entry in the name cache.  If the NetBIOS name is known, it's
diff --git a/reactos/dll/win32/netapi32/nbt.c b/reactos/dll/win32/netapi32/nbt.c
index 74cde806e5f..d0ae2853b49 100644
--- a/reactos/dll/win32/netapi32/nbt.c
+++ b/reactos/dll/win32/netapi32/nbt.c
@@ -65,22 +65,10 @@
  * See also other FIXMEs in the code.
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include "netapi32.h"
 
-#include <config.h>
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
 #include <winsock2.h>
-#include <wine/debug.h>
 #include <winreg.h>
-#include <iphlpapi.h>
-
-#include "netbios.h"
-#include "nbnamecache.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(netbios);
 
diff --git a/reactos/dll/win32/netapi32/netapi32.c b/reactos/dll/win32/netapi32/netapi32.c
index 343f3b7b7fc..d81953d4a97 100644
--- a/reactos/dll/win32/netapi32/netapi32.c
+++ b/reactos/dll/win32/netapi32/netapi32.c
@@ -16,17 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#include <config.h>
-
-#include <wine/debug.h>
-//#include "lm.h"
-#include "netbios.h"
-
-#define NTOS_MODE_USER
-#include <ndk/rtlfuncs.h>
 #include "netapi32.h"
 
+#include <lmserver.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(netbios);
 
 static HMODULE NETAPI32_hModule;
diff --git a/reactos/dll/win32/netapi32/netapi32.h b/reactos/dll/win32/netapi32/netapi32.h
index 65970fc1867..c33f9336eb0 100644
--- a/reactos/dll/win32/netapi32/netapi32.h
+++ b/reactos/dll/win32/netapi32/netapi32.h
@@ -1,34 +1,32 @@
-
 #ifndef __WINE_NETAPI32_H__
 #define __WINE_NETAPI32_H__
 
+#include <wine/config.h>
+
 #include <stdarg.h>
 
-//#include "ntstatus.h"
 #define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #include <windef.h>
 #include <winbase.h>
-//#include "winerror.h"
-//#include "lmcons.h"
 #include <lmaccess.h>
 #include <lmapibuf.h>
-#include <lmbrowsr.h>
 #include <lmerr.h>
-//#include "lmshare.h"
-//#include "lmuse.h"
 #include <ntsecapi.h>
-#include <dsrole.h>
-#include <dsgetdc.h>
+#include <nb30.h>
+#include <iphlpapi.h>
+
 #include <wine/debug.h>
-//#include "wine/unicode.h"
-#include <wine/list.h>
 
 #define NTOS_MODE_USER
-#include <ndk/kefuncs.h>
-#include <ndk/obfuncs.h>
 #include <ndk/rtlfuncs.h>
+
 #include <ntsam.h>
 
+#include "nbnamecache.h"
+#include "netbios.h"
 
 NET_API_STATUS
 WINAPI
@@ -64,4 +62,4 @@ BuildSidFromSidAndRid(IN PSID SrcSid,
 BOOL
 NETAPI_IsLocalComputer(LMCSTR ServerName);
 
-#endif
\ No newline at end of file
+#endif /* __WINE_NETAPI32_H__ */
diff --git a/reactos/dll/win32/netapi32/netbios.c b/reactos/dll/win32/netapi32/netbios.c
index e835baf9b0c..8cb1e63c1ea 100644
--- a/reactos/dll/win32/netapi32/netbios.c
+++ b/reactos/dll/win32/netapi32/netbios.c
@@ -14,10 +14,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#include <config.h>
-#include <wine/debug.h>
+
+#include "netapi32.h"
+
 #include "nbcmdqueue.h"
-#include "netbios.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(netbios);
 
diff --git a/reactos/dll/win32/netapi32/netbios.h b/reactos/dll/win32/netapi32/netbios.h
index 6adbd3d126f..b211af28b10 100644
--- a/reactos/dll/win32/netapi32/netbios.h
+++ b/reactos/dll/win32/netapi32/netbios.h
@@ -17,12 +17,6 @@
 #ifndef __WINE_NETBIOS_H__
 #define __WINE_NETBIOS_H__
 
-//#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <lm.h>
-#include <nb30.h>
-
 /* This file describes the interface WINE's NetBIOS implementation uses to
  * interact with a transport implementation (where a transport might be
  * NetBIOS-over-TCP/IP (aka NetBT, NBT), NetBIOS-over-IPX, etc.)
diff --git a/reactos/dll/win32/netapi32/share.c b/reactos/dll/win32/netapi32/share.c
index b687a34b429..a83718c77c9 100644
--- a/reactos/dll/win32/netapi32/share.c
+++ b/reactos/dll/win32/netapi32/share.c
@@ -15,9 +15,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <wine/debug.h>
-#include <lm.h>
-//#include "winerror.h"
+#include "netapi32.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(share);
 
diff --git a/reactos/dll/win32/netapi32/user.c b/reactos/dll/win32/netapi32/user.c
index 56252bae5f9..6452a4ad225 100644
--- a/reactos/dll/win32/netapi32/user.c
+++ b/reactos/dll/win32/netapi32/user.c
@@ -29,8 +29,10 @@
 
 #include "netapi32.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
+#include <ndk/kefuncs.h>
+#include <ndk/obfuncs.h>
 
+WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
 
 typedef struct _ENUM_CONTEXT
 {
diff --git a/reactos/dll/win32/netapi32/wksta.c b/reactos/dll/win32/netapi32/wksta.c
index 836d34a14e7..3512d31c06c 100644
--- a/reactos/dll/win32/netapi32/wksta.c
+++ b/reactos/dll/win32/netapi32/wksta.c
@@ -18,28 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
+#include "netapi32.h"
 
-#include <stdarg.h>
-//#include <stdlib.h>
-#include <ntstatus.h>
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-#include <windef.h>
-#include <winbase.h>
-//#include "winsock2.h"
-//#include "nb30.h"
-//#include "lmcons.h"
-//#include "lmapibuf.h"
-//#include "lmerr.h"
-//#include "lmwksta.h"
-#include <iphlpapi.h>
-//#include "winerror.h"
-#include <ntsecapi.h>
-#include "netbios.h"
-#include <wine/debug.h>
+#include <lmwksta.h>
+#include <lmjoin.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(netapi32);