Clean up commented out #include to use defines.