Some cleanup, bugfix for #include parser