fix inclusion order
clean up pointless preproc stuff