From bdc225df748ef73528f339df68e41f14d7edae16 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 25 Jan 2014 18:07:29 +0000
Subject: [PATCH] [SMDLL] * Remove one time inclusions from the main header and
 put them back where they belong. * Improve header inclusions. CORE-7716

svn path=/trunk/; revision=61813
---
 reactos/dll/win32/smdll/dllmain.c | 2 +-
 reactos/dll/win32/smdll/precomp.h | 9 +++++----
 reactos/dll/win32/smdll/query.c   | 5 +++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/reactos/dll/win32/smdll/dllmain.c b/reactos/dll/win32/smdll/dllmain.c
index 604f8944d40..69f25548907 100644
--- a/reactos/dll/win32/smdll/dllmain.c
+++ b/reactos/dll/win32/smdll/dllmain.c
@@ -5,7 +5,7 @@
  * PURPOSE:         SM Helper Library
  */
 
-#include "precomp.h"
+#include <windef.h>
 
 BOOL WINAPI DllMainCRTStartup(HANDLE hinstDll, DWORD fdwReason, LPVOID fImpLoad)
 {
diff --git a/reactos/dll/win32/smdll/precomp.h b/reactos/dll/win32/smdll/precomp.h
index 75509b224f0..ef73922dae9 100644
--- a/reactos/dll/win32/smdll/precomp.h
+++ b/reactos/dll/win32/smdll/precomp.h
@@ -1,4 +1,5 @@
-#define NTOS_MODE_USER
-#include <ndk/lpctypes.h>
-#include <ndk/lpcfuncs.h>
-#include <sm/helper.h>
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <windef.h>
diff --git a/reactos/dll/win32/smdll/query.c b/reactos/dll/win32/smdll/query.c
index a26e8b7b1c9..f7858ece5fe 100644
--- a/reactos/dll/win32/smdll/query.c
+++ b/reactos/dll/win32/smdll/query.c
@@ -7,6 +7,11 @@
 
 #include "precomp.h"
 
+#define NTOS_MODE_USER
+#include <ndk/lpctypes.h>
+#include <ndk/lpcfuncs.h>
+#include <sm/helper.h>
+
 #define NDEBUG
 #include <debug.h>