Index: mysql-gui-common/source/grtsh/grtsh.cc
===================================================================
--- mysql-gui-common/source/grtsh/grtsh.cc	(revision 1229)
+++ 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>
Index: mysql-gui-common/library_gc/include/myx_gc_primitives.h
===================================================================
--- mysql-gui-common/library_gc/include/myx_gc_primitives.h	(revision 1229)
+++ mysql-gui-common/library_gc/include/myx_gc_primitives.h	(working copy)
@@ -65,12 +65,12 @@
 
   virtual void __cdecl setEndPoint(const TVertex& end);
 };
-
+/*
 class GENERIC_CANVAS_API CPolyLine: public CPrimitive
 {
     
 };
-
+*/
 class GENERIC_CANVAS_API CRectangle: public CPrimitive
 {
 protected: