phase 1 of header include cleanup (bug #4067)