Remove the useless and deprecated usage of -I-
This fixes build on current

While here:

• Trim headers
• Convert options