Simplify headers further to improve compilation