diff --git a/sun-java/stubs/src/stubsj.c b/sun-java/stubs/src/stubsj.c
index e9b37fa9dd2a..95c41d609a82 100644
--- a/sun-java/stubs/src/stubsj.c
+++ b/sun-java/stubs/src/stubsj.c
@@ -19,6 +19,10 @@
 #include "oobj.h"
 #include "javaThreads.h"
 
+#ifdef RHAPSODY
+#include "c.h"  /* Defines for TRUE, FALSE. */
+#endif
+
 /* ArrayAlloc                                                                       libjsj.so */
 /* ns/sun-java/include/interpreter.h */
 /* ns/sun-java/md/gc_md.c */
@@ -28,7 +32,7 @@ ArrayAlloc(int32_t t, int32_t l)
   return NULL;
 }
 
-#ifdef XP_UNIX
+#if defined(XP_UNIX) && !defined(NO_X11)
 #include <X11/Intrinsic.h>
 
 /* AwtRegisterXtAppVars                                                             mozilla.o */
@@ -255,7 +259,7 @@ VerifyFieldAccess(ClassClass *current_class, ClassClass *field_class,
 /* awt_MToolkit_dispatchToWidget                                                    mozilla.o */
 /* ??? */
 /* ns/sun-java/awt/x/awt_MTookit.c */
-#ifdef XP_UNIX
+#if defined(XP_UNIX) && !defined(NO_X11)
 int
 awt_MToolkit_dispatchToWidget(XEvent *xev)
 {