header cleanup (hopefully the ubuntu test-build will like this)