Fixing includes for non-specified options