winnt.h should not be self-contained, it must depend on windef.h so that STRICT works correctly; moved some definitions back to windef.h where they belong, and removed a couple of definitions that don't exist on Windows.