diff --git a/reactos/include/rosdhcp_public.h b/reactos/include/libs/dhcp/rosdhcp_public.h
similarity index 100%
rename from reactos/include/rosdhcp_public.h
rename to reactos/include/libs/dhcp/rosdhcp_public.h
diff --git a/reactos/lib/dhcpcapi/dhcpcapi.c b/reactos/lib/dhcpcapi/dhcpcapi.c
index 366ba546c71..1115d650fd9 100644
--- a/reactos/lib/dhcpcapi/dhcpcapi.c
+++ b/reactos/lib/dhcpcapi/dhcpcapi.c
@@ -12,7 +12,7 @@
 #include <roscfg.h>
 #include <winsock2.h>
 #include <dhcpcsdk.h>
-#include <rosdhcp_public.h>
+#include <dhcp/rosdhcp_public.h>
 
 #define DHCP_TIMEOUT 1000
 
diff --git a/reactos/subsys/system/dhcp/include/rosdhcp.h b/reactos/subsys/system/dhcp/include/rosdhcp.h
index 566240f171f..f27d0462e72 100644
--- a/reactos/subsys/system/dhcp/include/rosdhcp.h
+++ b/reactos/subsys/system/dhcp/include/rosdhcp.h
@@ -12,6 +12,7 @@
 #include <setjmp.h>
 #include "stdint.h"
 #include "predec.h"
+#include <dhcp/rosdhcp_public.h>
 #include "debug.h"
 #define IFNAMSIZ MAX_INTERFACE_NAME_LEN
 #undef interface /* wine/objbase.h -- Grrr */
@@ -50,8 +51,6 @@ typedef struct _DHCP_ADAPTER {
     unsigned char recv_buf[1];
 } DHCP_ADAPTER, *PDHCP_ADAPTER;
 
-#include <rosdhcp_public.h>
-
 typedef DWORD (*PipeSendFunc)( COMM_DHCP_REPLY *Reply );
 
 #define random rand