diff --git a/build.xml b/build.xml
index b80640df..7fc82f3f 100644
--- a/build.xml
+++ b/build.xml
@@ -279,6 +279,11 @@
 			<class name="org.lwjgl.opengl.Window"/>
 			<class name="org.lwjgl.opengl.Pbuffer"/>
 		</javah>    
+		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}/fmod" force="yes">
+			<class name="org.lwjgl.fmod.FMOD"/>
+			<class name="org.lwjgl.fmod.FMusic"/>
+			<class name="org.lwjgl.fmod.FSound"/>
+                </javah>
 	</target>
   
 	<!-- Creates a versioned distribution for all supported platforms -->
diff --git a/src/native/common/fmod/extfmod.cpp b/src/native/common/fmod/extfmod.cpp
index 78babe91..cf473ff8 100644
--- a/src/native/common/fmod/extfmod.cpp
+++ b/src/native/common/fmod/extfmod.cpp
@@ -29,24 +29,26 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#endif
+
 #include <stdio.h>
 #include "extfmod.h"
 
 /** Instance of fmod  */
 FMOD_INSTANCE * fmod = NULL;
 
-/** Handle to dll */
-HINSTANCE dll_handle;
-
+#ifdef _WIN32
 /**
  * DLL entry point for Windows. Called when Java loads the .dll
  */
 BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
-  dll_handle = hinstDLL;
 	return true;
 }
+#endif
 
 /**
  * Creates and loads the FMOD instance
@@ -64,4 +66,4 @@ void fmod_destroy() {
   if (fmod != NULL) {
     FMOD_FreeInstance(fmod);
   }
-}
\ No newline at end of file
+}
diff --git a/src/native/common/fmod/org_lwjgl_fmod_FSound.cpp b/src/native/common/fmod/org_lwjgl_fmod_FSound.cpp
index cbd717d0..3801a99f 100644
--- a/src/native/common/fmod/org_lwjgl_fmod_FSound.cpp
+++ b/src/native/common/fmod/org_lwjgl_fmod_FSound.cpp
@@ -1201,7 +1201,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FSound_nFSOUND_1Stream_1Net_1SetM
 */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FSound_FSOUND_1Stream_1Net_1SetProxy(JNIEnv * env, jclass clazz, jstring proxy) {
   const char * proxyString = env->GetStringUTFChars(proxy, 0);
-  boolean result = fmod->FSOUND_Stream_Net_SetProxy(proxyString);
+  jboolean result = fmod->FSOUND_Stream_Net_SetProxy(proxyString);
   env->ReleaseStringUTFChars(proxy, proxyString);
   return result;
 }
@@ -1754,4 +1754,4 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FSound_nFSOUND_1Reverb_1SetChanne
 */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FSound_nFSOUND_1Reverb_1GetChannelProperties(JNIEnv * env, jclass clazz, jint channel, jlong prop) {
   return fmod->FSOUND_Reverb_GetChannelProperties(channel, (FSOUND_REVERB_CHANNELPROPERTIES*) prop);
-}
\ No newline at end of file
+}
diff --git a/src/native/common/org_lwjgl_Display.h b/src/native/common/org_lwjgl_Display.h
index 97988499..512dcd5f 100644
--- a/src/native/common/org_lwjgl_Display.h
+++ b/src/native/common/org_lwjgl_Display.h
@@ -7,17 +7,11 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* Inaccessible static: _00024assertionsDisabled */
 /* Inaccessible static: created */
 /* Inaccessible static: mode */
 /* Inaccessible static: closeRequested */
-#undef org_lwjgl_Display_PLATFORM_WGL
-#define org_lwjgl_Display_PLATFORM_WGL 0L
-#undef org_lwjgl_Display_PLATFORM_GLX
-#define org_lwjgl_Display_PLATFORM_GLX 1L
-#undef org_lwjgl_Display_PLATFORM_AGL
-#define org_lwjgl_Display_PLATFORM_AGL 2L
-/* Inaccessible static: class_000240 */
+/* Inaccessible static: timeNow */
+/* Inaccessible static: timeThen */
 /*
  * Class:     org_lwjgl_Display
  * Method:    init
@@ -50,14 +44,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Display_setDisplayMode
 JNIEXPORT void JNICALL Java_org_lwjgl_Display_resetDisplayMode
   (JNIEnv *, jclass);
 
-/*
- * Class:     org_lwjgl_Display
- * Method:    getPlatform
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_lwjgl_Display_getPlatform
-  (JNIEnv *, jclass);
-
 /*
  * Class:     org_lwjgl_Display
  * Method:    getGammaRampLength
diff --git a/src/native/common/org_lwjgl_input_Controller.h b/src/native/common/org_lwjgl_input_Controller.h
index 460800de..7711ed68 100644
--- a/src/native/common/org_lwjgl_input_Controller.h
+++ b/src/native/common/org_lwjgl_input_Controller.h
@@ -7,7 +7,6 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* Inaccessible static: _00024assertionsDisabled */
 /* Inaccessible static: created */
 /* Inaccessible static: buttons */
 /* Inaccessible static: x */
@@ -40,7 +39,6 @@ extern "C" {
 /* Inaccessible static: buttonName */
 /* Inaccessible static: buttonMap */
 /* Inaccessible static: initialized */
-/* Inaccessible static: class_000240 */
 /*
  * Class:     org_lwjgl_input_Controller
  * Method:    nPoll
diff --git a/src/native/common/org_lwjgl_input_Cursor.h b/src/native/common/org_lwjgl_input_Cursor.h
index 5c7a6b6c..92a4195c 100644
--- a/src/native/common/org_lwjgl_input_Cursor.h
+++ b/src/native/common/org_lwjgl_input_Cursor.h
@@ -7,13 +7,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* Inaccessible static: _00024assertionsDisabled */
-/* Inaccessible static: initialized */
-/* Inaccessible static: class_000240 */
 /*
  * Class:     org_lwjgl_input_Cursor
  * Method:    nCreateCursor
- * Signature: (IIIIILjava/nio/IntBuffer;I)J
+ * Signature: (IIIIILjava/nio/IntBuffer;ILjava/nio/IntBuffer;I)J
  */
 JNIEXPORT jlong JNICALL Java_org_lwjgl_input_Cursor_nCreateCursor
   (JNIEnv *, jclass, jint, jint, jint, jint, jint, jobject, jint, jobject, jint);
diff --git a/src/native/common/org_lwjgl_input_Mouse.h b/src/native/common/org_lwjgl_input_Mouse.h
index 65ef670d..b87888dc 100644
--- a/src/native/common/org_lwjgl_input_Mouse.h
+++ b/src/native/common/org_lwjgl_input_Mouse.h
@@ -32,6 +32,7 @@ extern "C" {
 /* Inaccessible static: eventState */
 #undef org_lwjgl_input_Mouse_BUFFER_SIZE
 #define org_lwjgl_input_Mouse_BUFFER_SIZE 50L
+/* Inaccessible static: isGrabbed */
 /*
  * Class:     org_lwjgl_input_Mouse
  * Method:    nGetNativeCursorCaps
@@ -103,14 +104,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nDestroy
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nPoll
   (JNIEnv *, jclass, jobject, jobject);
-  
-/*
- * Class:     org_lwjgl_input_Mouse
- * Method:    nGrabMouse
- * Signature: (Z)Z
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nGrabMouse
-  (JNIEnv * env, jclass clazz, jboolean grab);
 
 /*
  * Class:     org_lwjgl_input_Mouse
@@ -128,6 +121,14 @@ JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nEnableBuffer
 JNIEXPORT jint JNICALL Java_org_lwjgl_input_Mouse_nRead
   (JNIEnv *, jclass, jobject, jint);
 
+/*
+ * Class:     org_lwjgl_input_Mouse
+ * Method:    nGrabMouse
+ * Signature: (Z)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nGrabMouse
+  (JNIEnv *, jclass, jboolean);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/native/common/org_lwjgl_opengl_GLContext.h b/src/native/common/org_lwjgl_opengl_GLContext.h
index 10ea5a80..9e9804e3 100644
--- a/src/native/common/org_lwjgl_opengl_GLContext.h
+++ b/src/native/common/org_lwjgl_opengl_GLContext.h
@@ -11,6 +11,7 @@ extern "C" {
 /* Inaccessible static: GL_ARB_imaging */
 /* Inaccessible static: GL_ARB_depth_texture */
 /* Inaccessible static: GL_ARB_fragment_program */
+/* Inaccessible static: GL_ARB_fragment_program_shadow */
 /* Inaccessible static: GL_ARB_fragment_shader */
 /* Inaccessible static: GL_ARB_matrix_palette */
 /* Inaccessible static: GL_ARB_multisample */
@@ -18,34 +19,38 @@ extern "C" {
 /* Inaccessible static: GL_ARB_occlusion_query */
 /* Inaccessible static: GL_ARB_point_parameters */
 /* Inaccessible static: GL_ARB_point_sprite */
-/* Inaccessible static: GL_ARB_shading_language */
+/* Inaccessible static: GL_ARB_shading_language_100 */
 /* Inaccessible static: GL_ARB_shader_objects */
 /* Inaccessible static: GL_ARB_shadow */
 /* Inaccessible static: GL_ARB_shadow_ambient */
+/* Inaccessible static: GL_ARB_texture_border_clamp */
 /* Inaccessible static: GL_ARB_texture_compression */
+/* Inaccessible static: GL_ARB_texture_cube_map */
 /* Inaccessible static: GL_ARB_texture_env_add */
-/* Inaccessible static: GL_ARB_texture_env_dot3 */
 /* Inaccessible static: GL_ARB_texture_env_combine */
 /* Inaccessible static: GL_ARB_texture_env_crossbar */
-/* Inaccessible static: GL_ARB_texture_border_clamp */
-/* Inaccessible static: GL_ARB_texture_cube_map */
+/* Inaccessible static: GL_ARB_texture_env_dot3 */
 /* Inaccessible static: GL_ARB_texture_mirrored_repeat */
 /* Inaccessible static: GL_ARB_texture_non_power_of_two */
 /* Inaccessible static: GL_ARB_transpose_matrix */
 /* Inaccessible static: GL_ARB_vertex_blend */
-/* Inaccessible static: GL_ARB_vertex_program */
 /* Inaccessible static: GL_ARB_vertex_buffer_object */
+/* Inaccessible static: GL_ARB_vertex_program */
 /* Inaccessible static: GL_ARB_vertex_shader */
 /* Inaccessible static: GL_ARB_window_pos */
 /* Inaccessible static: GL_EXT_abgr */
 /* Inaccessible static: GL_EXT_bgra */
-/* Inaccessible static: GL_EXT_blend_function_separate */
+/* Inaccessible static: GL_EXT_blend_equation_separate */
+/* Inaccessible static: GL_EXT_blend_func_separate */
 /* Inaccessible static: GL_EXT_blend_subtract */
+/* Inaccessible static: GL_EXT_Cg_shader */
 /* Inaccessible static: GL_EXT_compiled_vertex_array */
+/* Inaccessible static: GL_EXT_depth_bounds_test */
 /* Inaccessible static: GL_EXT_draw_range_elements */
-/* Inaccessible static: GL_EXT_multi_draw_arrays */
 /* Inaccessible static: GL_EXT_fog_coord */
+/* Inaccessible static: GL_EXT_multi_draw_arrays */
 /* Inaccessible static: GL_EXT_packed_pixels */
+/* Inaccessible static: GL_EXT_pixel_buffer_object */
 /* Inaccessible static: GL_EXT_point_parameters */
 /* Inaccessible static: GL_EXT_rescale_normal */
 /* Inaccessible static: GL_EXT_secondary_color */
@@ -59,6 +64,7 @@ extern "C" {
 /* Inaccessible static: GL_EXT_texture_env_dot3 */
 /* Inaccessible static: GL_EXT_texture_filter_anisotropic */
 /* Inaccessible static: GL_EXT_texture_lod_bias */
+/* Inaccessible static: GL_EXT_texture_mirror_clamp */
 /* Inaccessible static: GL_EXT_texture_rectangle */
 /* Inaccessible static: GL_EXT_vertex_shader */
 /* Inaccessible static: GL_EXT_vertex_weighting */
@@ -68,20 +74,22 @@ extern "C" {
 /* Inaccessible static: GL_ATI_fragment_shader */
 /* Inaccessible static: GL_ATI_map_object_buffer */
 /* Inaccessible static: GL_ATI_pn_triangles */
+/* Inaccessible static: GL_ATI_separate_stencil */
 /* Inaccessible static: GL_ATI_texture_float */
 /* Inaccessible static: GL_ATI_texture_mirror_once */
 /* Inaccessible static: GL_ATI_vertex_array_object */
-/* Inaccessible static: GL_ATI_vertex_attrib_array_object */
 /* Inaccessible static: GL_ATI_vertex_streams */
-/* Inaccessible static: GL_ATI_separate_stencil */
+/* Inaccessible static: GL_ATI_vertex_attrib_array_object */
 /* Inaccessible static: GL_NV_blend_square */
 /* Inaccessible static: GL_NV_copy_depth_to_color */
 /* Inaccessible static: GL_NV_depth_clamp */
 /* Inaccessible static: GL_NV_evaluators */
 /* Inaccessible static: GL_NV_fence */
-/* Inaccessible static: GL_NV_fragment_program */
 /* Inaccessible static: GL_NV_float_buffer */
 /* Inaccessible static: GL_NV_fog_distance */
+/* Inaccessible static: GL_NV_fragment_program */
+/* Inaccessible static: GL_NV_fragment_program2 */
+/* Inaccessible static: GL_NV_fragment_program_option */
 /* Inaccessible static: GL_NV_half_float */
 /* Inaccessible static: GL_NV_light_max_exponent */
 /* Inaccessible static: GL_NV_multisample_filter_hint */
@@ -105,13 +113,14 @@ extern "C" {
 /* Inaccessible static: GL_NV_vertex_program */
 /* Inaccessible static: GL_NV_vertex_program1_1 */
 /* Inaccessible static: GL_NV_vertex_program2 */
+/* Inaccessible static: GL_NV_vertex_program2_option */
+/* Inaccessible static: GL_NV_vertex_program3 */
 /* Inaccessible static: OpenGL11 */
 /* Inaccessible static: OpenGL12 */
 /* Inaccessible static: OpenGL13 */
 /* Inaccessible static: OpenGL14 */
 /* Inaccessible static: OpenGL15 */
-/* Inaccessible static: class_000240 */
-/* Inaccessible static: class_000241 */
+/* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024GLContext */
 /*
  * Class:     org_lwjgl_opengl_GLContext
  * Method:    init
diff --git a/src/native/common/org_lwjgl_opengl_Pbuffer.h b/src/native/common/org_lwjgl_opengl_Pbuffer.h
index 4495f942..c369f9be 100644
--- a/src/native/common/org_lwjgl_opengl_Pbuffer.h
+++ b/src/native/common/org_lwjgl_opengl_Pbuffer.h
@@ -8,17 +8,39 @@
 extern "C" {
 #endif
 #undef org_lwjgl_opengl_Pbuffer_PBUFFER_SUPPORTED
-#define org_lwjgl_opengl_Pbuffer_PBUFFER_SUPPORTED 1 << 0
-
+#define org_lwjgl_opengl_Pbuffer_PBUFFER_SUPPORTED 1L
 #undef org_lwjgl_opengl_Pbuffer_RENDER_TEXTURE_SUPPORTED
-#define org_lwjgl_opengl_Pbuffer_RENDER_TEXTURE_SUPPORTED 1 << 1
-
+#define org_lwjgl_opengl_Pbuffer_RENDER_TEXTURE_SUPPORTED 2L
 #undef org_lwjgl_opengl_Pbuffer_RENDER_TEXTURE_RECTANGLE_SUPPORTED
-#define org_lwjgl_opengl_Pbuffer_RENDER_TEXTURE_RECTANGLE_SUPPORTED 1 << 2
-
+#define org_lwjgl_opengl_Pbuffer_RENDER_TEXTURE_RECTANGLE_SUPPORTED 4L
 #undef org_lwjgl_opengl_Pbuffer_RENDER_DEPTH_TEXTURE_SUPPORTED
-#define org_lwjgl_opengl_Pbuffer_RENDER_DEPTH_TEXTURE_SUPPORTED 1 << 3
-
+#define org_lwjgl_opengl_Pbuffer_RENDER_DEPTH_TEXTURE_SUPPORTED 8L
+#undef org_lwjgl_opengl_Pbuffer_MIPMAP_LEVEL
+#define org_lwjgl_opengl_Pbuffer_MIPMAP_LEVEL 8315L
+#undef org_lwjgl_opengl_Pbuffer_CUBE_MAP_FACE
+#define org_lwjgl_opengl_Pbuffer_CUBE_MAP_FACE 8316L
+#undef org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_POSITIVE_X
+#define org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_POSITIVE_X 8317L
+#undef org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_NEGATIVE_X
+#define org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_NEGATIVE_X 8318L
+#undef org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_POSITIVE_Y
+#define org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_POSITIVE_Y 8319L
+#undef org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_NEGATIVE_Y
+#define org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_NEGATIVE_Y 8320L
+#undef org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_POSITIVE_Z
+#define org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_POSITIVE_Z 8321L
+#undef org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_NEGATIVE_Z
+#define org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_NEGATIVE_Z 8322L
+#undef org_lwjgl_opengl_Pbuffer_FRONT_LEFT_BUFFER
+#define org_lwjgl_opengl_Pbuffer_FRONT_LEFT_BUFFER 8323L
+#undef org_lwjgl_opengl_Pbuffer_FRONT_RIGHT_BUFFER
+#define org_lwjgl_opengl_Pbuffer_FRONT_RIGHT_BUFFER 8324L
+#undef org_lwjgl_opengl_Pbuffer_BACK_LEFT_BUFFER
+#define org_lwjgl_opengl_Pbuffer_BACK_LEFT_BUFFER 8325L
+#undef org_lwjgl_opengl_Pbuffer_BACK_RIGHT_BUFFER
+#define org_lwjgl_opengl_Pbuffer_BACK_RIGHT_BUFFER 8326L
+#undef org_lwjgl_opengl_Pbuffer_DEPTH_BUFFER
+#define org_lwjgl_opengl_Pbuffer_DEPTH_BUFFER 8359L
 /* Inaccessible static: currentBuffer */
 /*
  * Class:     org_lwjgl_opengl_Pbuffer
@@ -47,6 +69,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_Pbuffer_getPbufferCaps
 /*
  * Class:     org_lwjgl_opengl_Pbuffer
  * Method:    nCreate
+ * Signature: (IIIIIIILjava/nio/IntBuffer;ILjava/nio/IntBuffer;I)I
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_Pbuffer_nCreate
   (JNIEnv *, jclass, jint, jint, jint, jint, jint, jint, jint, jobject, jint, jobject, jint);
@@ -70,7 +93,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Pbuffer_nSetAttrib
 /*
  * Class:     org_lwjgl_opengl_Pbuffer
  * Method:    nBindTexImage
- * Signature: (III)V
+ * Signature: (II)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Pbuffer_nBindTexImage
   (JNIEnv *, jclass, jint, jint);
@@ -78,7 +101,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Pbuffer_nBindTexImage
 /*
  * Class:     org_lwjgl_opengl_Pbuffer
  * Method:    nReleaseTexImage
- * Signature: (III)V
+ * Signature: (II)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Pbuffer_nReleaseTexImage
   (JNIEnv *, jclass, jint, jint);
diff --git a/src/native/common/org_lwjgl_opengl_Window.h b/src/native/common/org_lwjgl_opengl_Window.h
index ecbf7fcf..a07dc7c1 100644
--- a/src/native/common/org_lwjgl_opengl_Window.h
+++ b/src/native/common/org_lwjgl_opengl_Window.h
@@ -7,17 +7,17 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* Inaccessible static: _00024assertionsDisabled */
 /* Inaccessible static: x */
 /* Inaccessible static: y */
 /* Inaccessible static: width */
 /* Inaccessible static: height */
 /* Inaccessible static: title */
 /* Inaccessible static: fullscreen */
-/* Inaccessible static: vsync */
 /* Inaccessible static: vbo_tracker */
 /* Inaccessible static: context */
-/* Inaccessible static: class_000240 */
+/* Inaccessible static: createdMouse */
+/* Inaccessible static: createdKeyboard */
+/* Inaccessible static: createdController */
 /*
  * Class:     org_lwjgl_opengl_Window
  * Method:    nSetTitle
@@ -98,14 +98,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nDestroy
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nUpdate
   (JNIEnv *, jclass);
 
-/*
- * Class:     org_lwjgl_opengl_Window
- * Method:    nIsVSyncEnabled
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_Window_nIsVSyncEnabled
-  (JNIEnv *, jclass);
-
 /*
  * Class:     org_lwjgl_opengl_Window
  * Method:    nSetVSyncEnabled
@@ -114,14 +106,6 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_Window_nIsVSyncEnabled
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nSetVSyncEnabled
   (JNIEnv *, jclass, jboolean);
 
-/*
- * Class:     org_lwjgl_opengl_Window
- * Method:    nReshape
- * Signature: (IIII)V
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nReshape
-  (JNIEnv *, jclass, jint, jint, jint, jint);
- */
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/native/configure.in b/src/native/configure.in
index 19ca41f6..ca7c1f2a 100644
--- a/src/native/configure.in
+++ b/src/native/configure.in
@@ -76,6 +76,7 @@ AC_CONFIG_FILES([Makefile
                  common/ati/Makefile
                  common/ext/Makefile
                  common/nv/Makefile
+                 common/fmod/Makefile
                  linux/Makefile
 		 macosx/Makefile])
 AC_OUTPUT