Fixed issue with -D and -I switches.