diff --git a/rosapps/net/directory.rbuild b/rosapps/net/directory.rbuild
index 8007f5e7df1..d1a578a9129 100644
--- a/rosapps/net/directory.rbuild
+++ b/rosapps/net/directory.rbuild
@@ -11,5 +11,9 @@
 	<directory name="niclist">
 		<xi:include href="niclist/niclist.rbuild" />
 	</directory>
+
+	<directory name="tditest">
+		<xi:include href="tditest/tditest.rbuild" />
+	</directory>
 </group>
 
diff --git a/rosapps/net/tditest/include/tditest.h b/rosapps/net/tditest/include/tditest.h
index d2ddac8c62a..62afc6288a5 100644
--- a/rosapps/net/tditest/include/tditest.h
+++ b/rosapps/net/tditest/include/tditest.h
@@ -7,15 +7,9 @@
 #ifndef __TDITEST_H
 #define __TDITEST_H
 
-#ifdef _MSC_VER
 #include <ntddk.h>
 #include <tdikrnl.h>
 #include <tdiinfo.h>
-#else
-#include <ntddk.h>
-#include <net/tdikrnl.h>
-#include <net/tdiinfo.h>
-#endif
 #include "debug.h"
 
 
diff --git a/rosapps/net/tditest/tditest.rbuild b/rosapps/net/tditest/tditest.rbuild
new file mode 100644
index 00000000000..3b800c86afa
--- /dev/null
+++ b/rosapps/net/tditest/tditest.rbuild
@@ -0,0 +1,8 @@
+<module name="tditest" type="kernelmodedriver" installbase="system32/drivers" installname="tditest.sys">
+	<include base="tditest">include</include>
+	<library>ntoskrnl</library>
+
+	<directory name="tditest">
+		<file>tditest.c</file>
+	</directory>
+</module>
diff --git a/rosapps/net/tditest/tditest/tditest.c b/rosapps/net/tditest/tditest/tditest.c
index 59f0831b647..a848c26866e 100644
--- a/rosapps/net/tditest/tditest/tditest.c
+++ b/rosapps/net/tditest/tditest/tditest.c
@@ -915,7 +915,7 @@ DriverEntry(
 
 	/* Call TdiOpenThread() */
 	KeInitializeEvent(&Event, SynchronizationEvent, FALSE);
-	ExInitializeWorkItem(&WorkItem, TdiOpenThread, &Event);
+	ExInitializeWorkItem(&WorkItem, (PWORKER_THREAD_ROUTINE)TdiOpenThread, &Event);
  	ExQueueWorkItem(&WorkItem, DelayedWorkQueue);
 	KeWaitForSingleObject(&Event, Executive, KernelMode, TRUE, NULL);