Index: mysql-gui-common/library_sql_parser/include/myx_sql_parser_public_interface.h
===================================================================
--- mysql-gui-common/library_sql_parser/include/myx_sql_parser_public_interface.h	(revision 1225)
+++ mysql-gui-common/library_sql_parser/include/myx_sql_parser_public_interface.h	(working copy)
@@ -83,7 +83,6 @@
                                                 void *user_data, 
                                                 int mode);
 
-MYX_PUBLIC_FUNC void myx_set_parser_input(std::istream *sqlstream);
 MYX_PUBLIC_FUNC void myx_set_parser_source(const char *sql);
 MYX_PUBLIC_FUNC void myx_free_parser_source();
 MYX_PUBLIC_FUNC void myx_parse();
@@ -92,6 +91,7 @@
 #ifdef __cplusplus
 }
 
+MYX_PUBLIC_FUNC void myx_set_parser_input(std::istream *sqlstream);
 MYX_PUBLIC_FUNC void myx_set_parser_source(std::istream *sql);
 
 #endif /* __cplusplus */
Index: mysql-gui-common/source/grtsh/grtsh.cc
===================================================================
--- mysql-gui-common/source/grtsh/grtsh.cc	(revision 1225)
+++ mysql-gui-common/source/grtsh/grtsh.cc	(working copy)
@@ -24,8 +24,12 @@
 #include <readline/history.h>
 #endif
 
-#include <myx_grt_public_interface.h>
+#include <myx_grt_public_interface.h>
+
+#ifdef ENABLE_JAVA_MODULES
 #include <myx_grt_java.h>
+#endif
+
 #include <myx_sql_resultset.h>
 
 #include <myx_grt_builtin_module_public_interface.h>