Some include cleanups