diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 2c6834612..63f668e01 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-05  Earnie Boyd  <earnie@users.sf.net>
+
+	* include/w32api.h (_NT5, etc): Reverse the changes of 2003-07-01.
+	* include/winbase.h (_NT5, etc): Ditto.
+	
 2003-09-02  Bart Oldeman  <bartoldeman@users.sourceforge.net>
 
 	* lib/snmpapi.def (LIBRARY) Add library name.
diff --git a/winsup/w32api/include/w32api.h b/winsup/w32api/include/w32api.h
index 90edfd98d..d509c1890 100644
--- a/winsup/w32api/include/w32api.h
+++ b/winsup/w32api/include/w32api.h
@@ -8,17 +8,4 @@
 #define __W32API_MAJOR_VERSION 2
 #define __W32API_MINOR_VERSION 4
 
-#define _NT4 0x0400
-#define _W98 0x0410
-#define _WME 0x0490
-#define _NT5 0x0500
-#define _W2000 0x0500
-#define _WXP 0x0501
-#define _W2003 0x502
-
-#define _IE3 0x0300
-#define _IE4 0x0401
-#define _IE5 0x0501
-#define _IE6 0x0600
-
 #endif /* ndef _W32API_H_ */
diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index c2dee068a..db0c7641e 100644
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -190,7 +190,7 @@ extern "C" {
 #define FILE_FLAG_POSIX_SEMANTICS	16777216
 #define FILE_FLAG_OPEN_REPARSE_POINT	2097152
 #define FILE_FLAG_OPEN_NO_RECALL	1048576
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 #define FILE_FLAG_FIRST_PIPE_INSTANCE	524288
 #endif
 #define CLRDTR 6
@@ -867,7 +867,7 @@ typedef struct _MEMORYSTATUS {
 	DWORD dwTotalVirtual;
 	DWORD dwAvailVirtual;
 } MEMORYSTATUS,*LPMEMORYSTATUS;
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 typedef struct _MEMORYSTATUSEX {
 	DWORD dwLength;
 	DWORD dwMemoryLoad;
@@ -970,7 +970,7 @@ BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR,LPVOID,LPSTR,LPSTR,PSECURITY_DESCRI
 BOOL WINAPI AccessCheckAndAuditAlarmW(LPCWSTR,LPVOID,LPWSTR,LPWSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,PDWORD,PBOOL,PBOOL);
 BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID);
 BOOL WINAPI AddAccessDeniedAce(PACL,DWORD,DWORD,PSID);
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID);
 BOOL WINAPI AddAccessDeniedAceEx(PACL,DWORD,DWORD,DWORD,PSID);
 #endif
@@ -1038,12 +1038,12 @@ HANDLE WINAPI CreateFileA(LPCSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,DWORD,DWORD,H
 HANDLE WINAPI CreateFileW(LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,DWORD,DWORD,HANDLE);
 HANDLE WINAPI CreateFileMappingA(HANDLE,LPSECURITY_ATTRIBUTES,DWORD,DWORD,DWORD,LPCSTR);
 HANDLE WINAPI CreateFileMappingW(HANDLE,LPSECURITY_ATTRIBUTES,DWORD,DWORD,DWORD,LPCWSTR);
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 BOOL WINAPI CreateHardLinkA(LPCSTR,LPCSTR,LPSECURITY_ATTRIBUTES);
 BOOL WINAPI CreateHardLinkW(LPCWSTR,LPCWSTR,LPSECURITY_ATTRIBUTES);
 #endif
 HANDLE WINAPI CreateIoCompletionPort(HANDLE,HANDLE,DWORD,DWORD);
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 HANDLE WINAPI CreateJobObjectA(LPSECURITY_ATTRIBUTES,LPCSTR);
 HANDLE WINAPI CreateJobObjectW(LPSECURITY_ATTRIBUTES,LPCWSTR);
 BOOL WINAPI TerminateJobObject(HANDLE,UINT);
@@ -1079,7 +1079,7 @@ void WINAPI DeleteCriticalSection(PCRITICAL_SECTION);
 void WINAPI DeleteFiber(PVOID);
 BOOL WINAPI DeleteFileA(LPCSTR);
 BOOL WINAPI DeleteFileW(LPCWSTR);
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 BOOL WINAPI DeleteVolumeMountPointA(LPCSTR);
 BOOL WINAPI DeleteVolumeMountPointW(LPCWSTR);
 #endif
@@ -1130,7 +1130,7 @@ HANDLE WINAPI FindFirstFileW(LPCWSTR,LPWIN32_FIND_DATAW);
 HANDLE WINAPI FindFirstFileExA(LPCSTR,FINDEX_INFO_LEVELS,PVOID,FINDEX_SEARCH_OPS,PVOID,DWORD);
 HANDLE WINAPI FindFirstFileExW(LPCWSTR,FINDEX_INFO_LEVELS,PVOID,FINDEX_SEARCH_OPS,PVOID,DWORD);
 BOOL WINAPI FindFirstFreeAce(PACL,PVOID*);
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 HANDLE WINAPI FindFirstVolumeA(LPCSTR,DWORD);
 HANDLE WINAPI FindFirstVolumeW(LPCWSTR,DWORD);
 HANDLE WINAPI FindFirstVolumeMountPointA(LPSTR,LPSTR,DWORD);
@@ -1139,7 +1139,7 @@ HANDLE WINAPI FindFirstVolumeMountPointW(LPWSTR,LPWSTR,DWORD);
 BOOL WINAPI FindNextChangeNotification(HANDLE);
 BOOL WINAPI FindNextFileA(HANDLE,LPWIN32_FIND_DATAA);
 BOOL WINAPI FindNextFileW(HANDLE,LPWIN32_FIND_DATAW);
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 BOOL WINAPI FindNextVolumeA(HANDLE,LPCSTR,DWORD);
 BOOL WINAPI FindNextVolumeW(HANDLE,LPWSTR,DWORD);
 BOOL WINAPI FindNextVolumeMountPointA(HANDLE,LPSTR,DWORD);
@@ -1229,7 +1229,7 @@ void WINAPI GetLocalTime(LPSYSTEMTIME);
 DWORD WINAPI GetLogicalDrives(void);
 DWORD WINAPI GetLogicalDriveStringsA(DWORD,LPSTR);
 DWORD WINAPI GetLogicalDriveStringsW(DWORD,LPWSTR);
-#if (_WIN32_WINNT >= _NT5 || _WIN32_WINDOWS >= _W98)
+#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
 DWORD WINAPI GetLongPathNameA(LPCSTR,LPSTR,DWORD);
 DWORD WINAPI GetLongPathNameW(LPCWSTR,LPWSTR,DWORD);
 #endif
@@ -1238,7 +1238,7 @@ DWORD WINAPI GetModuleFileNameA(HINSTANCE,LPSTR,DWORD);
 DWORD WINAPI GetModuleFileNameW(HINSTANCE,LPWSTR,DWORD);
 HMODULE WINAPI GetModuleHandleA(LPCSTR);
 HMODULE WINAPI GetModuleHandleW(LPCWSTR);
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 BOOL WINAPI GetModuleHandleExA(DWORD, LPCSTR, HMODULE*);
 BOOL WINAPI GetModuleHandleExW(DWORD, LPCWSTR, HMODULE*);
 #endif
@@ -1297,7 +1297,7 @@ UINT WINAPI GetSystemDirectoryW(LPWSTR,UINT);
 VOID WINAPI GetSystemInfo(LPSYSTEM_INFO);
 BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS);
 VOID WINAPI GetSystemTime(LPSYSTEMTIME);
-#if (_WIN32_WINNT >= _WXP)
+#if (_WIN32_WINNT >= 0x0501)
 BOOL WINAPI GetSystemTimes(LPFILETIME,LPFILETIME,LPFILETIME);
 #endif
 BOOL WINAPI GetSystemTimeAdjustment(PDWORD,PDWORD,PBOOL);
@@ -1324,7 +1324,7 @@ BOOL WINAPI GetVersionExA(LPOSVERSIONINFOA);
 BOOL WINAPI GetVersionExW(LPOSVERSIONINFOW);
 BOOL WINAPI GetVolumeInformationA(LPCSTR,LPSTR,DWORD,PDWORD,PDWORD,PDWORD,LPSTR,DWORD);
 BOOL WINAPI GetVolumeInformationW(LPCWSTR,LPWSTR,DWORD,PDWORD,PDWORD,PDWORD,LPWSTR,DWORD);
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 BOOL WINAPI GetVolumeNameForVolumeMountPointA(LPCSTR,LPSTR,DWORD);
 BOOL WINAPI GetVolumeNameForVolumeMountPointW(LPCWSTR,LPWSTR,DWORD);
 BOOL WINAPI GetVolumePathNameA(LPCSTR,LPSTR,DWORD);
@@ -1351,7 +1351,7 @@ UINT WINAPI GlobalGetAtomNameW(ATOM,LPWSTR,int);
 HGLOBAL WINAPI GlobalHandle(PCVOID);
 LPVOID WINAPI GlobalLock(HGLOBAL);
 VOID WINAPI GlobalMemoryStatus(LPMEMORYSTATUS);
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 BOOL WINAPI GlobalMemoryStatusEx(LPMEMORYSTATUSEX);
 #endif
 HGLOBAL WINAPI GlobalReAlloc(HGLOBAL,DWORD,UINT);
@@ -1492,7 +1492,7 @@ HANDLE WINAPI OpenProcess(DWORD,BOOL,DWORD);
 BOOL WINAPI OpenProcessToken(HANDLE,DWORD,PHANDLE);
 HANDLE WINAPI OpenSemaphoreA(DWORD,BOOL,LPCSTR);
 HANDLE WINAPI OpenSemaphoreW(DWORD,BOOL,LPCWSTR);
-#if (_WIN32_WINNT >= _NT5) || (_WIN32_WINDOWS >= _WME)
+#if (_WIN32_WINNT >= 0x0500) || (_WIN32_WINDOWS >= 0x0490)
 HANDLE WINAPI OpenThread(DWORD,BOOL,DWORD);
 #endif
 BOOL WINAPI OpenThreadToken(HANDLE,DWORD,BOOL,PHANDLE);
@@ -1598,7 +1598,7 @@ LPTOP_LEVEL_EXCEPTION_FILTER WINAPI SetUnhandledExceptionFilter(LPTOP_LEVEL_EXCE
 BOOL WINAPI SetupComm(HANDLE,DWORD,DWORD);
 BOOL WINAPI SetVolumeLabelA(LPCSTR,LPCSTR);
 BOOL WINAPI SetVolumeLabelW(LPCWSTR,LPCWSTR);
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 BOOL WINAPI SetVolumeMountPointA(LPCSTR,LPCSTR);
 BOOL WINAPI SetVolumeMountPointW(LPCWSTR,LPCWSTR);
 #endif
@@ -1666,7 +1666,7 @@ BOOL WINAPI WriteProfileStringA(LPCSTR,LPCSTR,LPCSTR);
 BOOL WINAPI WriteProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR);
 DWORD WINAPI WriteTapemark(HANDLE,DWORD,DWORD,BOOL);
 #define Yield()
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 BOOL WINAPI AllocateUserPhysicalPages(HANDLE,PULONG_PTR,PULONG_PTR);
 BOOL WINAPI FreeUserPhysicalPages(HANDLE,PULONG_PTR,PULONG_PTR);
 BOOL WINAPI MapUserPhysicalPages(PVOID,ULONG_PTR,PULONG_PTR);
@@ -1705,7 +1705,7 @@ typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
 #define CreateEvent CreateEventW
 #define CreateFile CreateFileW
 #define CreateFileMapping CreateFileMappingW
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 #define CreateHardLink CreateHardLinkW
 #define CreateJobObject CreateJobObjectW
 #endif
@@ -1718,7 +1718,7 @@ typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
 #define CreateWaitableTimer CreateWaitableTimerW
 #define DefineDosDevice DefineDosDeviceW
 #define DeleteFile DeleteFileW
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 #define DeleteVolumeMountPoint DeleteVolumeMountPointW
 #endif
 #define EncryptFile EncryptFileW
@@ -1733,12 +1733,12 @@ typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
 #define FindFirstChangeNotification FindFirstChangeNotificationW
 #define FindFirstFile FindFirstFileW
 #define FindFirstFileEx FindFirstFileExW
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 #define FindFirstVolume FindFirstVolumeW
 #define FindFirstVolumeMountPoint FindFirstVolumeMountPointW
 #endif
 #define FindNextFile FindNextFileW
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 #define FindNextVolume FindNextVolumeW
 #define FindNextVolumeMountPoint  FindNextVolumeMountPointW
 #endif
@@ -1763,12 +1763,12 @@ typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
 #define GetFileAttributesEx GetFileAttributesExW
 #define GetFullPathName GetFullPathNameW
 #define GetLogicalDriveStrings GetLogicalDriveStringsW
-#if (_WIN32_WINNT >= _NT5 || _WIN32_WINDOWS >= _W98)
+#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
 #define GetLongPathName GetLongPathNameW
 #endif
 #define GetModuleFileName GetModuleFileNameW
 #define GetModuleHandle GetModuleHandleW
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 #define GetModuleHandleEx GetModuleHandleExW
 #endif
 #define GetNamedPipeHandleState GetNamedPipeHandleStateW
@@ -1866,7 +1866,7 @@ typedef HW_PROFILE_INFOA HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
 #define CreateEvent CreateEventA
 #define CreateFile CreateFileA
 #define CreateFileMapping CreateFileMappingA
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 #define CreateHardLink CreateHardLinkA
 #define CreateJobObject CreateJobObjectA
 #endif
@@ -1879,7 +1879,7 @@ typedef HW_PROFILE_INFOA HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
 #define CreateWaitableTimer CreateWaitableTimerA
 #define DefineDosDevice DefineDosDeviceA
 #define DeleteFile DeleteFileA
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 #define DeleteVolumeMountPoint DeleteVolumeMountPointA
 #endif
 #define EncryptFile EncryptFileA
@@ -1894,12 +1894,12 @@ typedef HW_PROFILE_INFOA HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
 #define FindFirstChangeNotification FindFirstChangeNotificationA
 #define FindFirstFile FindFirstFileA
 #define FindFirstFileEx FindFirstFileExA
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 #define FindFirstVolume FindFirstVolumeA
 #define FindFirstVolumeMountPoint FindFirstVolumeMountPointA
 #endif
 #define FindNextFile FindNextFileA
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 #define FindNextVolume FindNextVolumeA
 #define FindNextVolumeMountPoint FindNextVolumeMountPointA
 #endif
@@ -1923,12 +1923,12 @@ typedef HW_PROFILE_INFOA HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
 #define GetFileAttributesEx GetFileAttributesExA
 #define GetFullPathName GetFullPathNameA
 #define GetLogicalDriveStrings GetLogicalDriveStringsA
-#if (_WIN32_WINNT >= _NT5 || _WIN32_WINDOWS >= _W98)
+#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
 #define GetLongPathName GetLongPathNameA
 #endif
 #define GetNamedPipeHandleState GetNamedPipeHandleStateA
 #define GetModuleHandle GetModuleHandleA
-#if (_WIN32_WINNT >= _NT5)
+#if (_WIN32_WINNT >= 0x0500)
 #define GetModuleHandleEx GetModuleHandleExA
 #endif
 #define GetModuleFileName GetModuleFileNameA