--- a/configure
+++ b/configure
@@ -417,6 +417,8 @@
 
 
 sub check_jni_header_generator(\$$$$) {
+	return
+
 	my $scalarref = $_[0];
 	my $item = $_[1];
 	my $program = $_[2];
@@ -2066,13 +2068,6 @@
 HERE
 
 
-if ($javah) {
-	print CONFIG "JAVAH=$javah\n";
-	print CONFIG "JAVAH_CMD=JAVAH    \n";
-} else {
-	bail "failed", "No JNI header generator detected.";
-}
-
 if ($jar) {
 	print CONFIG "JAR=$jar\n";
 	print CONFIG "JAR_CMD=JAR      \n";
--- a/build/faster
+++ b/build/faster
@@ -347,6 +347,7 @@
 
 def compileJavaCode(outputDir, classpath, sourcepath, sources):
 	cmd = config['JAVAC'] + " "
+	cmd += "-h tmp/include "
 	cmd += "-d " + outputDir
 	if classpath:
 		cmd += " -classpath " + classpath
@@ -612,7 +613,6 @@
 
 	makeJarFile()
 
-	generateHeaderFiles()
 	compileBindingsObjects()
 	linkSharedLibrary()
 
--- a/src/bindings/org/gnome/glib/GBoxed.c
+++ b/src/bindings/org/gnome/glib/GBoxed.c
@@ -34,7 +34,6 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <jni.h>
-#include "org_gnome_glib_GBoxed.h"
 
 /*
  * Implements
--- a/src/generator/com/operationaldynamics/codegen/TypeGenerator.java
+++ b/src/generator/com/operationaldynamics/codegen/TypeGenerator.java
@@ -161,6 +161,9 @@
         out.print(objectType.bindingsClass);
         out.print(" extends Plumbing\n{\n");
 
+        // Add at least one @Native field to ensure a native header is generated for this class
+        out.print("@java.lang.annotation.Native static final byte _JAVAH_HELPER_ = 0;\n");
+
         out.print("    ");
         out.print("private ");
         out.print(objectType.bindingsClass);