some cleanup with dependencies and includes