#178 clean up hatoku_defines.h a bit.  it is a mess.