No more htableh.inc and jlapi.h