Fixes issues with conditional inclusions.