Clean up the include statements