diff --git a/reactos/base/applications/network/network.rbuild b/reactos/base/applications/network/network.rbuild
index 427b0155342..72e08ec59e3 100644
--- a/reactos/base/applications/network/network.rbuild
+++ b/reactos/base/applications/network/network.rbuild
@@ -25,6 +25,9 @@
 <directory name="route">
     <xi:include href="route/route.rbuild" />
 </directory>
+<directory name="roshttpd">
+    <xi:include href="roshttpd/roshttpd.rbuild" />
+</directory>
 <directory name="telnet">
     <xi:include href="telnet/telnet.rbuild" />
 </directory>
diff --git a/reactos/base/applications/network/roshttpd/common/socket.cpp b/reactos/base/applications/network/roshttpd/common/socket.cpp
index 4f798cd2da1..def90bbd3dd 100644
--- a/reactos/base/applications/network/roshttpd/common/socket.cpp
+++ b/reactos/base/applications/network/roshttpd/common/socket.cpp
@@ -7,9 +7,9 @@
  * REVISIONS:
  *   CSH  01/09/2000 Created
  */
+#include <socket.h>
 #include <string.h>
 #include <error.h>
-#include <socket.h>
 #include <iterator.h>
 
 // ***************************** CSocket *****************************
diff --git a/reactos/base/applications/network/roshttpd/http.cpp b/reactos/base/applications/network/roshttpd/http.cpp
index 07250ea55d9..9664a090721 100644
--- a/reactos/base/applications/network/roshttpd/http.cpp
+++ b/reactos/base/applications/network/roshttpd/http.cpp
@@ -12,7 +12,7 @@
  *              - Implement more entity-header entries
  */
 #include <debug.h>
-#include <iostream.h>
+#include <iostream>
 #include <string.h>
 #include <http.h>
 
@@ -192,9 +192,6 @@ BOOL CHttpParser::Parse()
 {
     BOOL bStatus;
 
-
-    CHAR ch;
-
     if (RequestLine()) {
         do {
             if (!ReadString(sHeader, sizeof(sHeader)))
diff --git a/reactos/base/applications/network/roshttpd/include/config.h b/reactos/base/applications/network/roshttpd/include/config.h
index 24793088877..e3a702df31b 100644
--- a/reactos/base/applications/network/roshttpd/include/config.h
+++ b/reactos/base/applications/network/roshttpd/include/config.h
@@ -6,8 +6,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <list.h>
 #include <httpd.h>
+#include <list.h>
 
 // General constants
 #define APP_DESCRIPTION _T("ReactOS HTTP Daemon")
@@ -15,8 +15,8 @@
 // Default configuration
 #define dcfgDescription     _T("Default configuration")
 #define dcfgMainBase        _T("C:\\roshttpd\\")
-#define dcfgHttpBase        "C:\\roshttpd\\HttpBase\\"
-#define dcfgDefaultResource "index.html"
+#define dcfgHttpBase        _T("C:\\roshttpd\\HttpBase\\")
+#define dcfgDefaultResource _T("index.html")
 #define dcfgDefaultPort     80
 
 class CConfig {
diff --git a/reactos/base/applications/network/roshttpd/include/debug.h b/reactos/base/applications/network/roshttpd/include/debug.h
index 2c0927586f3..5abdc96b18a 100644
--- a/reactos/base/applications/network/roshttpd/include/debug.h
+++ b/reactos/base/applications/network/roshttpd/include/debug.h
@@ -9,7 +9,7 @@
 #include <stdio.h>
 
 #ifdef DBG
-#define DPRINT(x...)    printf(x)
+#define DPRINT(x, ...)    printf(x)
 #else
 #define DPRINT(x...)
 #endif
diff --git a/reactos/base/applications/network/roshttpd/include/httpd.h b/reactos/base/applications/network/roshttpd/include/httpd.h
index d281c0c8a59..19965173dd6 100644
--- a/reactos/base/applications/network/roshttpd/include/httpd.h
+++ b/reactos/base/applications/network/roshttpd/include/httpd.h
@@ -6,8 +6,8 @@
 #ifndef __HTTPD_H
 #define __HTTPD_H
 
-#include <thread.h>
 #include <socket.h>
+#include <thread.h>
 #include <http.h>
 
 #define HTTPD_START     WM_USER + 1
diff --git a/reactos/base/applications/network/roshttpd/include/socket.h b/reactos/base/applications/network/roshttpd/include/socket.h
index 06ed0207be0..da6a40e8141 100644
--- a/reactos/base/applications/network/roshttpd/include/socket.h
+++ b/reactos/base/applications/network/roshttpd/include/socket.h
@@ -5,8 +5,7 @@
  */
 #ifndef __SOCKET_H
 #define __SOCKET_H
-#include <msvcrt/stdio.h>
-#include <windows.h>
+#include <stdio.h>
 #include <winsock2.h>
 #include <thread.h>
 #include <list.h>
diff --git a/reactos/base/applications/network/roshttpd/roshttpd.rbuild b/reactos/base/applications/network/roshttpd/roshttpd.rbuild
new file mode 100644
index 00000000000..d293f7cd992
--- /dev/null
+++ b/reactos/base/applications/network/roshttpd/roshttpd.rbuild
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<module name="roshttpd" type="win32cui" installbase="system32" installname="roshttpd.exe" stdlib="host">
+	<include base="roshttpd">include</include>
+	<define name="__USE_W32API" />
+	<define name="__USE_W32_SOCKETS" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<library>kernel32</library>
+	<library>ws2_32</library>
+	<library>kernel32</library>
+	<file>config.cpp</file>
+	<file>error.cpp</file>
+	<file>http.cpp</file>
+	<file>httpd.cpp</file>
+	<file>roshttpd.cpp</file>
+	<directory name="common" >
+		<file>list.cpp</file>
+		<file>roshttpd.rc</file>
+		<file>socket.cpp</file>
+		<file>thread.cpp</file>
+	</directory>
+</module>