Small changes
Include will conditionally include object files to increase speed