Fix prev commit (tidy internal headers)