fixed includes for Java source for GWT