Index: configure
--- configure.orig	2006-06-27 06:48:54 +0200
+++ configure	2006-08-27 12:23:15 +0200
@@ -28420,6 +28420,7 @@
 
             SOURCES="$SOURCES $srcdir/src/video/vgl/*.c"
             EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvgl"
+            SDL_LIBS="$SDL_LIBS -lvgl"
             have_video=yes
         fi
     fi
@@ -31600,6 +31601,7 @@
 
 
             USB_LIBS="$USB_LIBS -lusbhid"
+            SDL_LIBS="$SDL_LIBS -lusbhid"
         else
             if test "${ac_cv_header_usb_h+set}" = set; then
   echo "$as_me:$LINENO: checking for usb.h" >&5
Index: src/joystick/bsd/SDL_sysjoystick.c
--- src/joystick/bsd/SDL_sysjoystick.c.orig	2006-05-01 10:02:40 +0200
+++ src/joystick/bsd/SDL_sysjoystick.c	2006-08-27 12:22:24 +0200
@@ -49,10 +49,10 @@
 
 #if defined(HAVE_USBHID_H)
 #include <usbhid.h>
-#elif defined(HAVE_LIBUSB_H)
-#include <libusb.h>
 #elif defined(HAVE_LIBUSBHID_H)
 #include <libusbhid.h>
+#elif defined(HAVE_LIBUSB_H)
+#include <libusb.h>
 #endif
 
 #ifdef __FREEBSD__