Cleanup, added different includes for WIN32