added c++ options
added subdir to include
c, c++ cleanup