Clean up old include code