Fixed header files from using deprecated headers or 'using namespace'
Merge branch 'Enet4-header_tweaks'