[DHCPCSVC]

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

svn path=/trunk/; revision=61761

diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c b/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c
index 05d1104..21db0af 100644 (file)
--- a/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c
+++ b/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c
@@ -55,6 +55,8 @@
 
 #include <rosdhcp.h>
 
+#include <winsvc.h>
+
 #define        PERIOD 0x2e
 #define        hyphenchar(c) ((c) == 0x2d)
 #define        bslashchar(c) ((c) == 0x5c)

diff --git a/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h b/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h
index 3875dc2..8a11d52 100644 (file)
--- a/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h
+++ b/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h
@@ -1,24 +1,22 @@
 #ifndef ROSDHCP_H
 #define ROSDHCP_H
 
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
-#include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
-#include <winsvc.h>
-#include <winsock2.h>
 #define NTOS_MODE_USER
 #include <ndk/rtlfuncs.h>
-//#include <iprtrmib.h>
-//#include <iphlpapi.h>
 #include <dhcpcsdk.h>
 #include <dhcp/rosdhcp_public.h>
-//#include <stdio.h>
-//#include <time.h>
+
 #include "debug.h"
+
 #define IFNAMSIZ MAX_INTERFACE_NAME_LEN
 #undef interface /* wine/objbase.h -- Grrr */
 
@@ -104,4 +102,5 @@ extern DWORD DSStaticRefreshParams( PipeSendFunc Send, COMM_DHCP_REQ *Req );
 extern DWORD DSGetAdapterInfo( PipeSendFunc Send, COMM_DHCP_REQ *Req );
 extern int inet_aton(const char *s, struct in_addr *addr);
 int warn( char *format, ... );
-#endif/*ROSDHCP_H*/
+
+#endif /* ROSDHCP_H */