diff --git a/reactos/drivers/net/afd/afd/main.c b/reactos/drivers/net/afd/afd/main.c
index a7235e46a23..14f88d0d49d 100644
--- a/reactos/drivers/net/afd/afd/main.c
+++ b/reactos/drivers/net/afd/afd/main.c
@@ -488,7 +488,7 @@ NTSTATUS STDCALL
 DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
 {
     PDEVICE_OBJECT DeviceObject;
-    UNICODE_STRING wstrDeviceName;
+    UNICODE_STRING wstrDeviceName = RTL_CONSTANT_STRING(L"\\Device\\Afd");
     PAFD_DEVICE_EXTENSION DeviceExt;
     NTSTATUS Status;
 
@@ -500,9 +500,6 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
     DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = AfdDispatch;
     DriverObject->DriverUnload = AfdUnload;
 
-    /* create afd device */
-    RtlRosInitUnicodeStringFromLiteral(&wstrDeviceName, L"\\Device\\Afd");
-
     Status = IoCreateDevice
 	( DriverObject,
 	  sizeof(AFD_DEVICE_EXTENSION),
diff --git a/reactos/drivers/net/afd/include/afd.h b/reactos/drivers/net/afd/include/afd.h
index 1f6facbdb38..8eccd4facf3 100644
--- a/reactos/drivers/net/afd/include/afd.h
+++ b/reactos/drivers/net/afd/include/afd.h
@@ -17,21 +17,8 @@
 #include <tdikrnl.h>
 #include <tdiinfo.h>
 #include <string.h>
-#include <ndis.h>
-#include <shared.h>
-
-#ifndef _MSC_VER
-#include <roscfg.h>
-#include <rosrtl/string.h>
 #include <winsock2.h>
-#include <ddk/tdi.h>
-#include <ddk/ndis.h>
-#include <tcpmisc.h>
-#include <tcpioctl.h>
-#else
-#include <ntdef.h>
-#define STDCALL
-#endif
+#include <shared.h>
 
 #ifndef MIN
 #define MIN(x,y) (((x)<(y))?(x):(y))