Clean up include dir code