Missing includes
Improve C98/MSVC compatibility