fixed units.h compilation differently #859
Merge branch 'bugfixes/tokumx-1.3' into releases/tokumx-1.3