diff --git a/freeglut/freeglut/configure.ac b/freeglut/freeglut/configure.ac
index 9d5bc07..a1f37be 100644
--- a/freeglut/freeglut/configure.ac
+++ b/freeglut/freeglut/configure.ac
@@ -23,7 +23,7 @@ AC_SUBST([LIBXXF86VM])
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([sys/time.h GL/gl.h GL/glu.h GL/glx.h])
+AC_CHECK_HEADERS([GL/gl.h GL/glu.h GL/glx.h fcntl.h sys/ioctl.h sys/time.h])
 AC_HEADER_TIME
 
 save_CFLAGS="$CFLAGS"
@@ -32,6 +32,7 @@ AC_CHECK_HEADERS([X11/extensions/xf86vmode.h], [], [], [#include <X11/Xlib.h>])
 CFLAGS="$save_CFLAGS"
 
 # Checks for library functions.
+AC_PROG_GCC_TRADITIONAL
 AC_CHECK_LIBM
 AC_SUBST([LIBM])
 
diff --git a/freeglut/freeglut/src/freeglut_joystick.c b/freeglut/freeglut/src/freeglut_joystick.c
index fb77bb4..061a038 100644
--- a/freeglut/freeglut/src/freeglut_joystick.c
+++ b/freeglut/freeglut/src/freeglut_joystick.c
@@ -68,11 +68,16 @@
 
 #if TARGET_HOST_UNIX_X11
 #    define _JS_MAX_AXES 16
+#    if HAVE_SYS_IOCTL_H
+#        include <sys/ioctl.h>
+#    endif
+#    if HAVE_FCNTL_H
+#        include <fcntl.h>
+#    endif
 #    if defined(__FreeBSD__) || defined(__NetBSD__)
 /* XXX The below hack is done until freeglut's autoconf is updated. */
 #        define HAVE_USB_JS    1
 
-#        include <sys/ioctl.h>
 #        if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 #            include <sys/joystick.h>
 #        else
@@ -89,11 +94,9 @@
 #        define JS_RETURN (sizeof(struct JS_DATA_TYPE))
 #    endif
 
-#    include <fcntl.h>
 #    include <errno.h>
 
 #    if defined(__linux__)
-#        include <sys/ioctl.h>
 #        include <linux/joystick.h>
 
 /* check the joystick driver version */