diff --git a/reactos/bootdata/packages/reactos.dff b/reactos/bootdata/packages/reactos.dff
index 1bd173a4564..059dba49b3c 100755
--- a/reactos/bootdata/packages/reactos.dff
+++ b/reactos/bootdata/packages/reactos.dff
@@ -88,6 +88,7 @@ lib\freetype\freetype.dll               1
 lib\gdi32\gdi32.dll                     1
 lib\gdiplus\gdiplus.dll                 1
 lib\glu32\glu32.dll                     1
+lib\hid\hid.dll                         1
 lib\imagehlp\imagehlp.dll               1
 lib\imm32\imm32.dll                     1
 lib\iphlpapi\iphlpapi.dll               1
diff --git a/reactos/lib/directory.xml b/reactos/lib/directory.xml
index df9f683fafd..1a3bf651a1f 100644
--- a/reactos/lib/directory.xml
+++ b/reactos/lib/directory.xml
@@ -92,6 +92,9 @@
 <directory name="glu32">
 	<xi:include href="glu32/glu32.xml" />
 </directory>
+<directory name="hid">
+	<xi:include href="hid/hid.xml" />
+</directory>
 <directory name="imagehlp">
 	<xi:include href="imagehlp/imagehlp.xml" />
 </directory>
diff --git a/reactos/lib/hid/hid.c b/reactos/lib/hid/hid.c
index 39216ceb726..ac5ffbb3220 100644
--- a/reactos/lib/hid/hid.c
+++ b/reactos/lib/hid/hid.c
@@ -1,6 +1,6 @@
 /*
  * ReactOS Hid User Library
- * Copyright (C) 2004 ReactOS Team
+ * Copyright (C) 2004-2005 ReactOS Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,15 +21,12 @@
  * PROJECT:         ReactOS Hid User Library
  * FILE:            lib/hid/hid.c
  * PURPOSE:         ReactOS Hid User Library
+ * PROGRAMMER:      Thomas Weidenmueller <w3seek@reactos.com>
  *
  * UPDATE HISTORY:
  *      07/12/2004  Created
  */
-#include <windows.h>
-#include <ddk/hidusage.h>
-#include <ddk/hidclass.h>
-#include <ddk/hidpi.h>
-#include "internal.h"
+#include <precomp.h>
 
 HINSTANCE hDllInstance;
 
diff --git a/reactos/lib/hid/hid.xml b/reactos/lib/hid/hid.xml
new file mode 100644
index 00000000000..f628647b1b2
--- /dev/null
+++ b/reactos/lib/hid/hid.xml
@@ -0,0 +1,16 @@
+<module name="hid" type="win32dll" baseaddress="${BASEADDRESS_HID}" installbase="system32" installname="hid.dll">
+	<importlibrary definition="hid.def" />
+	<include base="hid">.</include>
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x0500</define>
+	<define name="_WIN32_WINNT">0x0600</define>
+	<define name="WINVER">0x0600</define>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<file>hid.c</file>
+	<file>stubs.c</file>
+	<file>hid.rc</file>
+	<pch>precomp.h</pch>
+</module>
diff --git a/reactos/lib/hid/internal.h b/reactos/lib/hid/internal.h
deleted file mode 100644
index a80c88a1c89..00000000000
--- a/reactos/lib/hid/internal.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __HIDINTERNAL_H
-#define __HIDINTERNAL_H
-
-extern HINSTANCE hDllInstance;
-extern const GUID HidClassGuid;
-
-#endif /* __HIDINTERNAL_H */
-
-/* EOF */
diff --git a/reactos/lib/hid/precomp.h b/reactos/lib/hid/precomp.h
new file mode 100644
index 00000000000..dc8a747a7b2
--- /dev/null
+++ b/reactos/lib/hid/precomp.h
@@ -0,0 +1,18 @@
+#include <ddk/ntddk.h>
+#include <windows.h>
+
+#define _HIDPI_
+#define _HIDPI_NO_FUNCTION_MACROS_
+#include <ddk/hidusage.h>
+#include <ddk/hidclass.h>
+#include <ddk/hidpi.h>
+
+extern HINSTANCE hDllInstance;
+extern const GUID HidClassGuid;
+
+#ifndef UNIMPLEMENTED
+#define UNIMPLEMENTED \
+  DbgPrint("HID:  %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__)
+#endif
+
+/* EOF */
diff --git a/reactos/lib/hid/stubs.c b/reactos/lib/hid/stubs.c
index 191a1ba81ed..c085baaf112 100644
--- a/reactos/lib/hid/stubs.c
+++ b/reactos/lib/hid/stubs.c
@@ -9,13 +9,7 @@
  * UPDATE HISTORY:
  *      07/12/2004  Created
  */
-#include <windows.h>
-#include <ddk/hidpi.h>
-#include "internal.h"
-
-#define UNIMPLEMENTED \
-  DbgPrint("HID:  %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__)
-
+#include <precomp.h>
 
 /*
  * @unimplemented