moving some headers around to make it easier for search paths