Included java swig preprocessor directives with some fixes