compilation fixes
changed #include directives and -isystem arg