more header cleanup, compiles faster now