some code clean ups for includes