From 427ef54d299baff5ed5f6c86fa53b8f7fb172f6e Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 13 Jan 2014 12:46:06 +0000
Subject: [PATCH] [EVENTLOG] * Remove one time inclusions from the main header
 and put them back where they belong. CORE-7716

svn path=/trunk/; revision=61604
---
 reactos/base/services/eventlog/eventlog.c |  3 +++
 reactos/base/services/eventlog/eventlog.h | 12 ++++--------
 reactos/base/services/eventlog/file.c     |  2 ++
 reactos/base/services/eventlog/logport.c  |  2 ++
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/reactos/base/services/eventlog/eventlog.c b/reactos/base/services/eventlog/eventlog.c
index 84a34168448..7ac99c28a47 100644
--- a/reactos/base/services/eventlog/eventlog.c
+++ b/reactos/base/services/eventlog/eventlog.c
@@ -11,6 +11,9 @@
 
 #include "eventlog.h"
 
+#include <stdio.h>
+#include <netevent.h>
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/base/services/eventlog/eventlog.h b/reactos/base/services/eventlog/eventlog.h
index 768d26ad3d7..3f4afa249f4 100644
--- a/reactos/base/services/eventlog/eventlog.h
+++ b/reactos/base/services/eventlog/eventlog.h
@@ -9,18 +9,14 @@
 #ifndef __EVENTLOG_H__
 #define __EVENTLOG_H__
 
-#define WIN32_NO_STATUS
+#include <stdarg.h>
 
-#include <stdio.h>
+#define WIN32_NO_STATUS
 
 #include <windef.h>
 #include <winbase.h>
-#include <netevent.h>
-#include <lpctypes.h>
-#include <lpcfuncs.h>
-#include <rtlfuncs.h>
-#include <obfuncs.h>
-#include <iofuncs.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/obfuncs.h>
 #include <eventlogrpc_s.h>
 
 typedef struct _IO_ERROR_LPC
diff --git a/reactos/base/services/eventlog/file.c b/reactos/base/services/eventlog/file.c
index fb5a698492a..b0e80a2fa24 100644
--- a/reactos/base/services/eventlog/file.c
+++ b/reactos/base/services/eventlog/file.c
@@ -11,6 +11,8 @@
 
 #include "eventlog.h"
 
+#include <ndk/iofuncs.h>
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/base/services/eventlog/logport.c b/reactos/base/services/eventlog/logport.c
index b8d1ad9d0b1..c54fb908d2a 100644
--- a/reactos/base/services/eventlog/logport.c
+++ b/reactos/base/services/eventlog/logport.c
@@ -11,6 +11,8 @@
 
 #include "eventlog.h"
 
+#include <ndk/lpcfuncs.h>
+
 #define NDEBUG
 #include <debug.h>