Made all Java includes conditional
Merge pull request #118 from ti-mo/master

Made all Java includes conditional