src/solaris/native/sun/awt/awt_InputMethod.c file is full of "ifdef XAWT" preprocessor instructions. As we don't support MAWT anymore since jdk7 so can we safely get rid of them. I hope we don't have dependencies on Motif somewhere. It would be a pure cleanup but it also would simplify the code clarity. In particular following usages may be revised: 1) #ifdef XAWT_HACK 2) JNIEXPORT jboolean JNICALL #ifdef XAWT Java_sun_awt_X11_XInputMethod_openXIMNative(JNIEnv *env, jobject this, jlong display) #else Java_sun_awt_motif_MInputMethod_openXIMNative(JNIEnv *env, jobject this) #endif