Fixed header files from using deprecated headers or 'using namespace'
Merge branch 'header_tweaks' of https://github.com/Enet4/OpenNotrium into header_tweaks