diff --git a/driver/xf86-input-usbtablet/src/usbtablet.c b/driver/xf86-input-usbtablet/src/usbtablet.c
index e5d3a9f0a..150c8eeae 100644
--- a/driver/xf86-input-usbtablet/src/usbtablet.c
+++ b/driver/xf86-input-usbtablet/src/usbtablet.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* $OpenBSD: usbtablet.c,v 1.3 2009/11/22 22:30:18 matthieu Exp $ */
+/* $OpenBSD: usbtablet.c,v 1.4 2009/11/22 23:06:24 matthieu Exp $ */
 
 /*
  * Driver for USB HID tablet devices.
@@ -53,9 +53,6 @@
 #include <extnsionst.h>
 #include <extinit.h>
 
-#include "xf86Module.h"
-
-
 #ifdef USB_GET_REPORT_ID
 #define USB_NEW_HID
 #endif
@@ -119,7 +116,6 @@ struct USBTDevice {
 /* Function prototypes */
 static MODULESETUPPROTO(SetupProc);
 static void TearDownProc(pointer);
-static const OptionInfoRec *UsbTabletAvailableOptions(void *);
 
 static LocalDevicePtr UsbTabletAllocateStylus(InputDriverPtr);
 static LocalDevicePtr UsbTabletAllocateEraser(InputDriverPtr);
@@ -162,15 +158,6 @@ typedef enum {
 	USBTOPT_SUPPRESS,
 } USBTOpts;
 
-static const OptionInfoRec USBTOptions[] = {
-	{ USBTOPT_DEVICE, "device", OPTV_STRING, {0}, FALSE },
-	{ USBTOPT_DEBUG_LEVEL, "debuglevel", OPTV_INTEGER, {0}, FALSE},
-	{ USBTOPT_HISTORY_SIZE, "historysize", OPTV_INTEGER, {0}, FALSE},
-	{ USBTOPT_THRESHOLD, "threshold", OPTV_INTEGER, {0}, FALSE}, 
-	{ USBTOPT_SUPPRESS, "suppress", OPTV_INTEGER, {0}, FALSE},
-	{ -1, NULL, OPTV_NONE, {0}, FALSE}
-};
-
 
 XF86ModuleData usbtabletModuleData = {&VersionRec,
 				      SetupProc, TearDownProc };
@@ -805,12 +792,6 @@ UsbTabletOpenDevice(DeviceIntPtr pUSBT)
 	return 1;
 }
 
-static const OptionInfoRec *
-UsbTabletAvailableOptions(void *unused)
-{
-	return USBTOptions;
-}
-
 static InputInfoPtr
 UsbTabletAllocate(InputDriverPtr drv, char *name, int flag)
 {