Regression: header file cleanup