diff --git a/Foundation/include/Poco/UnWindows.h b/Foundation/include/Poco/UnWindows.h
index 0c472ee10..b4778bf31 100644
--- a/Foundation/include/Poco/UnWindows.h
+++ b/Foundation/include/Poco/UnWindows.h
@@ -5,25 +5,7 @@
 // Package: Core
 // Module:  UnWindows
 //
-// A wrapper around the <windows.h> header file that #undef's some
-// of the macros for function names defined by <windows.h> that
-// are a frequent source of conflicts (e.g., GetUserName).
-//
-// Remember, that most of the WIN32 API functions come in two variants,
-// an Unicode variant (e.g., GetUserNameA) and an ASCII variant (GetUserNameW).
-// There is also a macro (GetUserName) that's either defined to be the Unicode
-// name or the ASCII name, depending on whether the UNICODE macro is #define'd
-// or not. POCO always calls the Unicode functions directly.
-//
-// These macro definitions are a frequent case of problems and naming conflicts,
-// especially for C++ programmers. Say, you define a class with a member function named
-// GetUserName. Depending on whether "Poco/UnWindows.h" has been included by a particular
-// translation unit or not, this might be changed to GetUserNameA/GetUserNameW, or not.
-// While, due to naming conventions used, this is less of a problem in POCO, some
-// of the users of POCO might use a different naming convention where this can become
-// a problem.
-//
-// To disable the #undef's, compile POCO with the POCO_NO_UNWINDOWS macro #define'd.
+// Simple wrapper around the <windows.h> header file.
 //
 // Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -44,17 +26,6 @@
 #endif
 
 
-// Microsoft Visual C++ includes copies of the Windows header files 
-// that were current at the time Visual C++ was released.
-// The Windows header files use macros to indicate which versions 
-// of Windows support many programming elements. Therefore, you must 
-// define these macros to use new functionality introduced in each 
-// major operating system release. (Individual header files may use 
-// different macros; therefore, if compilation problems occur, check 
-// the header file that contains the definition for conditional 
-// definitions.) For more information, see SdkDdkVer.h.
-
-
 #if !defined(POCO_NO_WINDOWS_H)
     #include <windows.h>
     #ifdef __MINGW32__
@@ -65,55 +36,4 @@
 #endif
 
 
-#if !defined(POCO_NO_UNWINDOWS)
-// A list of annoying macros to #undef.
-// Extend as required.
-#undef GetBinaryType
-#undef GetShortPathName
-#undef GetLongPathName
-#undef GetEnvironmentStrings
-#undef SetEnvironmentStrings
-#undef FreeEnvironmentStrings
-#undef FormatMessage
-#undef EncryptFile
-#undef DecryptFile
-#undef CreateMutex
-#undef OpenMutex
-#undef CreateEvent
-#undef OpenEvent
-#undef CreateSemaphore
-#undef OpenSemaphore
-#undef LoadLibrary
-#undef GetModuleFileName
-#undef CreateProcess
-#undef GetCommandLine
-#undef GetEnvironmentVariable
-#undef SetEnvironmentVariable
-#undef ExpandEnvironmentStrings
-#undef OutputDebugString
-#undef FindResource
-#undef UpdateResource
-#undef FindAtom
-#undef AddAtom
-#undef GetSystemDirectory
-#undef GetTempPath
-#undef GetTempFileName
-#undef SetCurrentDirectory
-#undef GetCurrentDirectory
-#undef CreateDirectory
-#undef RemoveDirectory
-#undef CreateFile
-#undef DeleteFile
-#undef SearchPath
-#undef CopyFile
-#undef MoveFile
-#undef ReplaceFile
-#undef GetComputerName
-#undef SetComputerName
-#undef GetUserName
-#undef LogonUser
-#undef GetVersion
-#undef GetObject
-#endif // POCO_NO_UNWINDOWS
-
 #endif // Foundation_UnWindows_INCLUDED