header cleanups; fix IDE warnings