Removed Java include files
EOM: handling typeid and objectids now. Bug with whitespace