No more jlapi.h and htableh.inc