2 files changed, 45 insertions, 28 deletions
diff --git a/src/driver.c b/src/driver.c
index d8e91b3..c180035 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -82,11 +82,6 @@ Bool NestedAddMode(ScrnInfoPtr pScrn, int width, int height);
 void NestedPrintPscreen(ScrnInfoPtr p);
 void NestedPrintMode(ScrnInfoPtr p, DisplayModePtr m);
 
-static InputInfoPtr NestedMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags);
-
-static void NestedMouseUnInit(InputDriverPtr drv, InputInfoPtr pInfo,
-int flags);
-
 typedef enum {
     OPTION_DISPLAY,
     OPTION_ORIGIN
@@ -123,15 +118,6 @@ _X_EXPORT DriverRec NESTED = {
     0     /* PciProbe */
 };
 
-_X_EXPORT InputDriverRec MOUSE = {
-    1,
-    "random",
-    NULL,
-    NestedMousePreInit,
-    NestedMouseUnInit,
-    NULL,
-    0,
-};
 
 static XF86ModuleVersionInfo NestedVersRec = {
     NESTED_DRIVER_NAME,
@@ -405,20 +391,6 @@ static Bool NestedPreInit(ScrnInfoPtr pScrn, int flags) {
     return TRUE;
 }
 
-static InputInfoPtr 
-NestedMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
-{
-    return NULL;
-}
-
-static void
-NestedMouseUnInit(InputDriverPtr       drv,
-             InputInfoPtr         pInfo,
-             int                  flags)
-{
-}
-
-
 int
 NestedValidateModes(ScrnInfoPtr pScrn) {
     DisplayModePtr mode;
diff --git a/src/xNestedMouse.c b/src/xNestedMouse.c
new file mode 100644
index 0000000..4e3e988
--- /dev/null
+++ b/src/xNestedMouse.c
@@ -0,0 +1,45 @@
+#include <stdlib.h>
+#include <string.h>
+
+#include <xorg/xorg-server.h>
+#include <xorg/fb.h>
+#include <xorg/micmap.h>
+#include <xorg/mipointer.h>
+#include <xorg/shadow.h>
+#include <xorg/xf86.h>
+#include <xorg/xf86Module.h>
+#include <xorg/xf86str.h>
+#include "xf86Xinput.h"
+
+#include "config.h"
+
+#include "client.h"
+
+
+static InputInfoPtr NestedMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags);
+
+static void NestedMouseUnInit(InputDriverPtr drv, InputInfoPtr pInfo,
+int flags);
+
+_X_EXPORT InputDriverRec MOUSE = {
+    1,
+    "random",
+    NULL,
+    NestedMousePreInit,
+    NestedMouseUnInit,
+    NULL,
+    0,
+};
+
+static InputInfoPtr 
+NestedMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+{
+    return NULL;
+}
+
+static void
+NestedMouseUnInit(InputDriverPtr       drv,
+             InputInfoPtr         pInfo,
+             int                  flags)
+{
+}