correct C preprocessor to handle command line include directory option properly
use const modifier where appropriate