Less #defines, no missing windows.h dependency