diff --git a/gcc/java/jcf-write.c b/gcc/java/jcf-write.c
index 64c9e06475f..c4d5ca16add 100644
--- a/gcc/java/jcf-write.c
+++ b/gcc/java/jcf-write.c
@@ -2258,9 +2258,9 @@ perform_relocations (state)
 	      *--new_ptr = 0;
 	      *--new_ptr = - reloc->kind;
 	    }
-	  if (new_ptr != chunk->data)
-	    fatal ("internal error - perform_relocations");
 	}
+      if (new_ptr != chunk->data)
+	fatal ("internal error - perform_relocations");
     }
   state->code_length = pc;
 }
diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c
index 43b8d7b8d6b..abf1777828a 100644
--- a/gcc/java/jvgenmain.c
+++ b/gcc/java/jvgenmain.c
@@ -27,6 +27,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "config.h"
 #include "system.h"
 #include "obstack.h"
+#include "gansidecl.h"
 
 const char main_method_prefix[] = "main__";
 const char main_method_suffix[] = "Pt6JArray1ZPQ34java4lang6String";