--- ./plugins/linux/build.xml.orig	2006-07-11 15:07:38.000000000 -0600
+++ ./plugins/linux/build.xml	2012-02-02 08:57:51.545209862 -0700
@@ -56,6 +56,7 @@
 		<javah destdir="src/native">
             <classpath>
                 <pathelement location="classes"/>
+                <pathelement location="../../coreAPI/classes"/>
             </classpath>
 			<class name="net.java.games.input.LinuxEventDevice"/>
 			<class name="net.java.games.input.LinuxJoystickDevice"/>
--- ./plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java.orig	2007-06-10 09:03:27.000000000 -0600
+++ ./plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java	2012-02-02 09:08:54.380920130 -0700
@@ -94,28 +94,6 @@ final class LinuxEventDevice implements
 	}
 
 	private final Controller.Type guessType() throws IOException {
-		Controller.Type type_from_usages = guessTypeFromUsages();
-		if (type_from_usages == Controller.Type.UNKNOWN)
-			return guessTypeFromComponents();
-		else
-			return type_from_usages;
-	}
-	
-	private final Controller.Type guessTypeFromUsages() throws IOException {
-		byte[] usage_bits = getDeviceUsageBits();
-		if (isBitSet(usage_bits, NativeDefinitions.USAGE_MOUSE))
-			return Controller.Type.MOUSE;
-		else if (isBitSet(usage_bits, NativeDefinitions.USAGE_KEYBOARD))
-			return Controller.Type.KEYBOARD;
-		else if (isBitSet(usage_bits, NativeDefinitions.USAGE_GAMEPAD))
-			return Controller.Type.GAMEPAD;
-		else if (isBitSet(usage_bits, NativeDefinitions.USAGE_JOYSTICK))
-			return Controller.Type.STICK;
-		else
-			return Controller.Type.UNKNOWN;
-	}
-
-	private final Controller.Type guessTypeFromComponents() throws IOException {
 		List components = getComponents();
 		if (components.size() == 0)
 			return Controller.Type.UNKNOWN;
@@ -342,15 +320,6 @@ final class LinuxEventDevice implements
 	}
 	private final static native void nGetBits(long fd, int ev_type, byte[] evtype_bits) throws IOException;
 
-	private final byte[] getDeviceUsageBits() throws IOException {
-		byte[] bits = new byte[NativeDefinitions.USAGE_MAX/8 + 1];
-		if (getVersion() >= 0x010001) {
-			nGetDeviceUsageBits(fd, bits);
-		}
-		return bits;
-	}
-	private final static native void nGetDeviceUsageBits(long fd, byte[] type_bits) throws IOException;
-
 	public final synchronized void pollKeyStates() throws IOException {
 		nGetKeyStates(fd, key_states);
 	}
--- ./plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c.orig	2006-04-29 16:29:27.000000000 -0600
+++ ./plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c	2012-02-02 09:06:58.256751788 -0700
@@ -112,20 +112,6 @@ JNIEXPORT jint JNICALL Java_net_java_gam
 	return num_effects;
 }
 
-JNIEXPORT void JNICALL Java_net_java_games_input_LinuxEventDevice_nGetDeviceUsageBits(JNIEnv *env, jclass unused, jlong fd_address, jbyteArray usages_array) {
-#if EV_VERSION >= 0x010001
-	int fd = (int)fd_address;
-	jsize len = (*env)->GetArrayLength(env, usages_array);
-	jbyte *usages = (*env)->GetByteArrayElements(env, usages_array, NULL);
-	if (usages == NULL)
-		return;
-	int res = ioctl(fd, EVIOCGUSAGE(len), usages);
-	(*env)->ReleaseByteArrayElements(env, usages_array, usages, 0);
-	if (res == -1)
-		throwIOException(env, "Failed to get device usages (%d)\n", errno);
-#endif
-}
-
 JNIEXPORT void JNICALL Java_net_java_games_input_LinuxEventDevice_nGetBits(JNIEnv *env, jclass unused, jlong fd_address, jint evtype, jbyteArray bits_array) {
 	int fd = (int)fd_address;
 	jsize len = (*env)->GetArrayLength(env, bits_array);