Moved graphics initialisation to the x11drv/ttydrv dll init code.
Merged event, keyboard and mouse drivers into USER driver.

dlls/dinput/dinput_main.c

diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index 32503f5..5247328 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -43,7 +43,7 @@
 #include "dinput.h"
 #include "display.h"
 #include "input.h"
-#include "keyboard.h"
+#include "user.h"
 #include "message.h"
 #include "mouse.h"
 #include "sysmetrics.h"
@@ -782,7 +782,7 @@
 	LPDIRECTINPUTDEVICE2A iface,DWORD len,LPVOID ptr
 )
 {
-	return KEYBOARD_Driver->pGetDIState(len, ptr)?DI_OK:E_FAIL;
+	return USER_Driver->pGetDIState(len, ptr)?DI_OK:E_FAIL;
 }
 
 static HRESULT WINAPI SysKeyboardAImpl_GetDeviceData(
@@ -797,7 +797,7 @@
 	TRACE("(this=%p,%ld,%p,%p(%ld)),0x%08lx)\n",
 	      This,dodsize,dod,entries,entries?*entries:0,flags);
 
-	ret=KEYBOARD_Driver->pGetDIData(
+	ret=USER_Driver->pGetDIData(
 		This->keystate, dodsize, dod, entries, flags)?DI_OK:E_FAIL;
 	for (i=0;i<*entries;i++) {
 		dod[i].dwTimeStamp = GetTickCount();
@@ -816,11 +816,11 @@
 	  KEYBOARD_CONFIG no_auto;
 	  
 	  /* Save the original config */
-	  KEYBOARD_Driver->pGetKeyboardConfig(&(This->initial_config));
+	  USER_Driver->pGetKeyboardConfig(&(This->initial_config));
 	  
 	  /* Now, remove auto-repeat */
 	  no_auto.auto_repeat = FALSE;
-	  KEYBOARD_Driver->pSetKeyboardConfig(&no_auto, WINE_KEYBOARD_CONFIG_AUTO_REPEAT);
+	  USER_Driver->pSetKeyboardConfig(&no_auto, WINE_KEYBOARD_CONFIG_AUTO_REPEAT);
 
 	  This->acquired = 1;
 	}
@@ -835,7 +835,7 @@
 
 	if (This->acquired == 1) {
 	  /* Restore the original configuration */
-	  KEYBOARD_Driver->pSetKeyboardConfig(&(This->initial_config), 0xFFFFFFFF);
+	  USER_Driver->pSetKeyboardConfig(&(This->initial_config), 0xFFFFFFFF);
 	  This->acquired = 0;
 	} else {
 	  ERR("Unacquiring a not-acquired device !!!\n");