Clean up include/requires