Add headers to includes.
Fix JNI importing.