Add includes for CPP pass.

Include directories for CPP pass can now be specified in the command line.  They are also gleaned from the Cabal build data.