[WINLOGON]

* Remove one time inclusions from the main header and put them back where they belong.
* Improve the main header.
CORE-7716

svn path=/trunk/; revision=61616

diff --git a/reactos/base/system/winlogon/environment.c b/reactos/base/system/winlogon/environment.c
index bdbdac0..1fb30af 100644 (file)
--- a/reactos/base/system/winlogon/environment.c
+++ b/reactos/base/system/winlogon/environment.c
@@ -12,9 +12,6 @@
 
 #include "winlogon.h"
 
-/* GLOBALS ******************************************************************/
-
-
 /* FUNCTIONS ****************************************************************/
 
 static

diff --git a/reactos/base/system/winlogon/sas.c b/reactos/base/system/winlogon/sas.c
index 4fc901b..e6612ce 100644 (file)
--- a/reactos/base/system/winlogon/sas.c
+++ b/reactos/base/system/winlogon/sas.c
@@ -13,6 +13,14 @@
 
 #include "winlogon.h"
 
+#define WIN32_LEAN_AND_MEAN
+#include <aclapi.h>
+#include <mmsystem.h>
+#include <userenv.h>
+#include <ndk/setypes.h>
+#include <ndk/sefuncs.h>
+#include <reactos/winlogon.h>
+
 /* GLOBALS ******************************************************************/
 
 #define WINLOGON_SAS_CLASS L"SAS Window class"

diff --git a/reactos/base/system/winlogon/winlogon.c b/reactos/base/system/winlogon/winlogon.c
index 5fcd614..4bfca31 100644 (file)
--- a/reactos/base/system/winlogon/winlogon.c
+++ b/reactos/base/system/winlogon/winlogon.c
@@ -12,6 +12,8 @@
 
 #include "winlogon.h"
 
+#include <ndk/cmfuncs.h>
+
 /* GLOBALS ******************************************************************/
 
 HINSTANCE hAppInstance;

diff --git a/reactos/base/system/winlogon/winlogon.h b/reactos/base/system/winlogon/winlogon.h
index f7cf7cd..d489baa 100644 (file)
--- a/reactos/base/system/winlogon/winlogon.h
+++ b/reactos/base/system/winlogon/winlogon.h
@@ -26,24 +26,22 @@
 #ifndef __WINLOGON_MAIN_H__
 #define __WINLOGON_MAIN_H__
 
+#include <stdarg.h>
+
 #define USE_GETLASTINPUTINFO
 
 #define WIN32_NO_STATUS
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <mmsystem.h>
-#include <userenv.h>
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <winreg.h>
 #include <winwlx.h>
-#include <cmfuncs.h>
-#include <rtlfuncs.h>
-#include <exfuncs.h>
-#include <setypes.h>
-#include <sefuncs.h>
-#include <aclapi.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/exfuncs.h>
 #include <strsafe.h>
 
 #include <reactos/undocuser.h>
-#include <reactos/winlogon.h>
 
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(winlogon);