import fixes
weirdly 4sq specific hfile rewrite