generated file hierarchy package headers may conflict with C++ files

Our app is ObjC & C++ and we also use CocoaPods. When trying to bring some j2objc code into the app, the C++ code will find the file "java/lang/Float.h" and complain (since it isn't C++ stdlib float.h). This is because all the header paths are searched (at least the way our code uses CocoaPods).

If these j2objc headers were generated in a flat manner (such as "java_lang_float.h") they would not conflict with C++.

Is there another workaround I haven't been able to find? Thanks.