diff --git a/dlls/gdi/Makefile.in b/dlls/gdi/Makefile.in
index 3cd1f859bff..42da1f5f795 100644
--- a/dlls/gdi/Makefile.in
+++ b/dlls/gdi/Makefile.in
@@ -7,6 +7,7 @@ SOVERSION = 1.0
 ALTNAMES  = gdi dispdib
 
 C_SRCS = \
+	bidi16.c \
 	gdi_main.c \
 	thunk.c
 
diff --git a/dlls/gdi/bidi16.c b/dlls/gdi/bidi16.c
new file mode 100644
index 00000000000..465bd376a32
--- /dev/null
+++ b/dlls/gdi/bidi16.c
@@ -0,0 +1,119 @@
+/*
+ * Win16 BiDi functions
+ * Right now, most of these functions do nothing.
+ */
+
+#include "windef.h"
+#include "wingdi.h"
+#include "debugtools.h"
+
+DEFAULT_DEBUG_CHANNEL(gdi);
+
+/***********************************************************************
+ *		RawTextOut16   (GDI.530)
+ */
+LONG WINAPI RawTextOut16(void) { FIXME("stub (no prototype)\n"); return 0; }
+
+/***********************************************************************
+ *		RawExtTextOut16   (GDI.531)
+ */
+LONG WINAPI RawExtTextOut16(void) { FIXME("stub (no prototype)\n"); return 0; }
+
+/***********************************************************************
+ *		RawGetTextExtent16   (GDI.532)
+ */
+LONG WINAPI RawGetTextExtent16(HDC16 hdc, LPCSTR lpszString, INT16 cbString ) { 
+      FIXME("(%04hx, %p, %hd): stub\n", hdc, lpszString, cbString); 
+      return 0; 
+}
+
+/***********************************************************************
+ *		BiDiLayout16   (GDI.536)
+ */
+LONG WINAPI BiDiLayout16(void) { FIXME("stub (no prototype)\n"); return 0; }
+
+/***********************************************************************
+ *		BiDiCreateTabString16   (GDI.538)
+ */
+LONG WINAPI BiDiCreateTabString16(void) { FIXME("stub (no prototype)\n"); return 0; }
+
+/***********************************************************************
+ *		BiDiGlyphOut16   (GDI.540)
+ */
+LONG WINAPI BiDiGlyphOut16(void) { FIXME("stub (no prototype)\n"); return 0; }
+
+/***********************************************************************
+ *		BiDiGetStringExtent16   (GDI.543)
+ */
+LONG WINAPI BiDiGetStringExtent16(void) { FIXME("stub (no prototype)\n"); return 0; }
+
+/***********************************************************************
+ *		BiDiDeleteString16   (GDI.555)
+ */
+LONG WINAPI BiDiDeleteString16(void) { FIXME("stub (no prototype)\n"); return 0; }
+
+/***********************************************************************
+ *		BiDiSetDefaults16   (GDI.556)
+ */
+LONG WINAPI BiDiSetDefaults16(void) { FIXME("stub (no prototype)\n"); return 0; }
+
+/***********************************************************************
+ *		BiDiGetDefaults16   (GDI.558)
+ */
+LONG WINAPI BiDiGetDefaults16(void) { FIXME("stub (no prototype)\n"); return 0; }
+
+/***********************************************************************
+ *		BiDiShape16   (GDI.560)
+ */
+LONG WINAPI BiDiShape16(void) { FIXME("stub (no prototype)\n"); return 0; }
+
+/***********************************************************************
+ *		BiDiFontComplement16   (GDI.561)
+ */
+LONG WINAPI BiDiFontComplement16(void) { FIXME("stub (no prototype)\n"); return 0; }
+
+/***********************************************************************
+ *		BiDiSetKashida16   (GDI.564)
+ */
+LONG WINAPI BiDiSetKashida16(void) { FIXME("stub (no prototype)\n"); return 0; }
+
+/***********************************************************************
+ *		BiDiKExtTextOut16   (GDI.565)
+ */
+LONG WINAPI BiDiKExtTextOut16(void) { FIXME("stub (no prototype)\n"); return 0; }
+
+/***********************************************************************
+ *		BiDiShapeEx16   (GDI.566)
+ */
+LONG WINAPI BiDiShapeEx16(void) { FIXME("stub (no prototype)\n"); return 0; }
+
+/***********************************************************************
+ *		BiDiCreateStringEx16   (GDI.569)
+ */
+LONG WINAPI BiDiCreateStringEx16(void) { FIXME("stub (no prototype)\n"); return 0; }
+
+/***********************************************************************
+ *		GetTextExtentRtoL16   (GDI.571)
+ */
+LONG WINAPI GetTextExtentRtoL16(void) { FIXME("stub (no prototype)\n"); return 0; }
+
+/***********************************************************************
+ *		GetHDCCharSet16   (GDI.572)
+ */
+LONG WINAPI GetHDCCharSet16(void) { FIXME("stub (no prototype)\n"); return 0; }
+
+/***********************************************************************
+ *		BiDiLayoutEx16   (GDI.573)
+ */
+LONG WINAPI BiDiLayoutEx16(void) { FIXME("stub (no prototype)\n"); return 0; }
+
+/***********************************************************************
+ *           SetLayout16   (GDI.1000)
+ *
+ * Sets left->right or right->left text layout flags of a dc.
+ */
+BOOL16 WINAPI SetLayout16( HDC16 hdc, DWORD layout )
+{
+    FIXME( "( %04hx, %08lx ): No BiDi16\n", hdc, layout );
+    return SetLayout( hdc, layout );
+}
diff --git a/dlls/user/Makefile.in b/dlls/user/Makefile.in
index 778651ef2b6..f6989f61bed 100644
--- a/dlls/user/Makefile.in
+++ b/dlls/user/Makefile.in
@@ -8,10 +8,12 @@ WRCEXTRA  = -w16 -m
 ALTNAMES  = user keyboard ddeml display mouse
 
 C_SRCS = \
+	bidi16.c \
 	ddeml.c \
 	display.c \
 	exticon.c \
 	mouse.c \
+	network.c \
 	user_main.c \
 	thunk.c
 
diff --git a/misc/bidi16.c b/dlls/user/bidi16.c
similarity index 71%
rename from misc/bidi16.c
rename to dlls/user/bidi16.c
index 2fd1c713863..253bdadc21d 100644
--- a/misc/bidi16.c
+++ b/dlls/user/bidi16.c
@@ -3,118 +3,22 @@
  * Right now, most of these functions do nothing.
  */
 
-#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winerror.h"
 #include "debugtools.h"
-#include "windows.h"
 
-DEFAULT_DEBUG_CHANNEL(relay)
+DEFAULT_DEBUG_CHANNEL(relay);
 
 /***********************************************************************
- *		RawTextOut16
- */
-LONG WINAPI RawTextOut16(void) { FIXME("stub (no prototype)\n"); return 0; }
-
-/***********************************************************************
- *		RawExtTextOut16
- */
-LONG WINAPI RawExtTextOut16(void) { FIXME("stub (no prototype)\n"); return 0; }
-
-/***********************************************************************
- *		RawGetTextExtent16
- */
-LONG WINAPI RawGetTextExtent16(HDC16 hdc, LPCSTR lpszString, INT16 cbString ) { 
-      FIXME("(%04hx, %p, %hd): stub\n", hdc, lpszString, cbString); 
-      return 0; 
-}
-
-/***********************************************************************
- *		BiDiLayout16
- */
-LONG WINAPI BiDiLayout16(void) { FIXME("stub (no prototype)\n"); return 0; }
-
-/***********************************************************************
- *		BiDiCreateTabString16
- */
-LONG WINAPI BiDiCreateTabString16(void) { FIXME("stub (no prototype)\n"); return 0; }
-
-/***********************************************************************
- *		BiDiGlyphOut16
- */
-LONG WINAPI BiDiGlyphOut16(void) { FIXME("stub (no prototype)\n"); return 0; }
-
-/***********************************************************************
- *		BiDiGetStringExtent16
- */
-LONG WINAPI BiDiGetStringExtent16(void) { FIXME("stub (no prototype)\n"); return 0; }
-
-/***********************************************************************
- *		BiDiDeleteString16
- */
-LONG WINAPI BiDiDeleteString16(void) { FIXME("stub (no prototype)\n"); return 0; }
-
-/***********************************************************************
- *		BiDiSetDefaults16
- */
-LONG WINAPI BiDiSetDefaults16(void) { FIXME("stub (no prototype)\n"); return 0; }
-
-/***********************************************************************
- *		BiDiGetDefaults16
- */
-LONG WINAPI BiDiGetDefaults16(void) { FIXME("stub (no prototype)\n"); return 0; }
-
-/***********************************************************************
- *		BiDiShape16
- */
-LONG WINAPI BiDiShape16(void) { FIXME("stub (no prototype)\n"); return 0; }
-
-/***********************************************************************
- *		BiDiFontComplement16
- */
-LONG WINAPI BiDiFontComplement16(void) { FIXME("stub (no prototype)\n"); return 0; }
-
-/***********************************************************************
- *		BiDiSetKashida16
- */
-LONG WINAPI BiDiSetKashida16(void) { FIXME("stub (no prototype)\n"); return 0; }
-
-/***********************************************************************
- *		BiDiKExtTextOut16
- */
-LONG WINAPI BiDiKExtTextOut16(void) { FIXME("stub (no prototype)\n"); return 0; }
-
-/***********************************************************************
- *		BiDiShapeEx16
- */
-LONG WINAPI BiDiShapeEx16(void) { FIXME("stub (no prototype)\n"); return 0; }
-
-/***********************************************************************
- *		BiDiCreateStringEx16
- */
-LONG WINAPI BiDiCreateStringEx16(void) { FIXME("stub (no prototype)\n"); return 0; }
-
-/***********************************************************************
- *		GetTextExtentRtoL16
- */
-LONG WINAPI GetTextExtentRtoL16(void) { FIXME("stub (no prototype)\n"); return 0; }
-
-/***********************************************************************
- *		GetHDCCharSet16
- */
-LONG WINAPI GetHDCCharSet16(void) { FIXME("stub (no prototype)\n"); return 0; }
-
-/***********************************************************************
- *		BiDiLayoutEx16
- */
-LONG WINAPI BiDiLayoutEx16(void) { FIXME("stub (no prototype)\n"); return 0; }
-
-/***********************************************************************
- *		ChangeDialogTemplate16
+ *		ChangeDialogTemplate16   (USER.905)
  * FIXME: The prototypes of this function have not been found yet.
  */
 LONG WINAPI ChangeDialogTemplate16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		BiDiMessageBoxEx16
+ *		BiDiMessageBoxEx16   (USER.910)
  * FIXME: The prototypes of this function have not been found yet.
  */
 LONG WINAPI BiDiMessageBoxEx16(void) { FIXME("stub (no prototype)\n"); return 0; }
@@ -348,7 +252,6 @@ LRESULT WINAPI QueryCodePage16( UINT16 idxLang, UINT16 msg,
     return 0;
 }
 
-
 /***********************************************************************
  *           SetAppCodePage16   [USER.920]
  * Set the code page and language of the window to new values.
@@ -364,8 +267,6 @@ DWORD WINAPI SetAppCodePage16( HWND16 hwnd, UINT16 iCodePage, UINT16 iLang,
     return 0;
 }
 
-
-
 /***********************************************************************
  *           SetDlgItemTextEx16   [USER.911]
  * Sets the title or text of a control in a dialog box.
@@ -377,21 +278,6 @@ void WINAPI SetDlgItemTextEx16( HWND16 hwnd, INT16 id,
     FIXME( "( %04hx, %hd, %p, %hu ): stub\n", hwnd, id, lpszText, iLang );
 }
 
-
-
-/***********************************************************************
- *           SetLayout16   [GDI.1000]
- *
- * Sets left->right or right->left text layout flags of a dc.
- */
-BOOL16 WINAPI SetLayout16( HDC16 hdc, DWORD layout )
-{
-    FIXME( "( %04hx, %08lx ): No BiDi16\n", hdc, layout );
-    return SetLayout( hdc, layout );
-}
-
-
-
 /******************************************************************************
  *                    SetProcessDefaultLayout16 [USER.1000]
  *
@@ -408,7 +294,6 @@ BOOL16 WINAPI SetProcessDefaultLayout16( DWORD dwDefaultLayout )
     return SetProcessDefaultLayout( dwDefaultLayout );
 }
 
-
 /******************************************************************************
  *                    SetWindowTextEx16 [USER.909]
  * Sets the given window's title to the specified text in the specified language.
@@ -417,4 +302,3 @@ void WINAPI SetWindowTextEx16( HWND16 hwnd, LPCSTR lpsz, UINT16 iLang )
 {
     FIXME( "( %04hx, %p, %hu ): stub\n", hwnd, lpsz, iLang );
 }
-
diff --git a/misc/network.c b/dlls/user/network.c
similarity index 100%
rename from misc/network.c
rename to dlls/user/network.c
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 3cd32690c6c..7ea0ebe6418 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -7,7 +7,6 @@ VPATH     = @srcdir@
 MODULE    = misc
 
 C_SRCS = \
-	bidi16.c \
 	cdrom.c \
 	comm.c \
 	cpu.c \
@@ -16,7 +15,6 @@ C_SRCS = \
 	ext_debugger.c \
 	lstr.c \
 	main.c \
-	network.c \
 	options.c \
 	port.c \
 	printdrv.c \