Improve compile time slightly by simplifying headers