remove unnecessary OctalCode include in main
use system flag for external library includes
Merge pull request #510 from birarda/conditional-ds

couple of patches