clean up include structure