Remove HIMainHack.h from HITorManager.m
Fix compilation issue with or/buffers.h
add private header methods