[akhaldi] 61761: [DHCPCSVC] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716

Author: akhaldi
Date: Thu Jan 23 11:15:11 2014
New Revision: 61761

URL: http://svn.reactos.org/svn/reactos?rev=61761&view=rev
Log:
[DHCPCSVC]
* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup the main header.
CORE-7716

Modified:
    trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c
    trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h

Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/dh…
==============================================================================
--- trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c	[iso-8859-1] Thu Jan 23 11:15:11
2014
@@ -54,6 +54,8 @@
  */
 
 #include <rosdhcp.h>
+
+#include <winsvc.h>
 
 #define	PERIOD 0x2e
 #define	hyphenchar(c) ((c) == 0x2d)

Modified: trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/include…
==============================================================================
--- trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h	[iso-8859-1] Thu Jan 23 11:15:11
2014
@@ -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 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 */