Merge pull request #2017 from jwillemsen/jwi-cleanupwince

Remove Windows CE support

173 files changed, 303 insertions, 4609 deletions

diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html
index df575bdd555..dbef0e70184 100644
--- a/ACE/ACE-INSTALL.html
+++ b/ACE/ACE-INSTALL.html
@@ -181,7 +181,7 @@ document</a>.</p><p>
     <td>Maintains ACE on many platforms required for their ACE and
         TAO service offerings. We support AIX,
         Embarcadero C++ Builder,
-        Windows CE, MinGW, Microsoft Visual C++, GCC,
+        MinGW, Microsoft Visual C++, GCC,
         Cygwin, VxWorks 6.x (kernel and rtp), OpenVMS on IA64,
         BlueCAT Linux, RedHat Linux, Fedora, MacOSX, Solaris,
         SuSE Linux on IA32/EM64T/IA64, RTEMS, QNX, LynxOS,
@@ -2065,11 +2065,6 @@ libraries.
       Please see the <a href="#NonStaticObjectManager">Non-static
       ACE_Object_Manager</a> discussion below.</p><p>
 
-  </p></li><li><b>Windows CE</b><p>
-
-      Take a look at (<a href="docs/CE-status.txt">CE-status.txt</a>) for
-      up-to-date information about ACE on Windows CE and Windows Mobile.
-
   </p></li><li><b> Solaris 7, 8, 9, and 10 using Sun ONE Studio 8 (C++ 5.5)
        or higher, Centerline C++ 2.x, GNU gcc 2.95 and
        later.</b><p>
diff --git a/ACE/NEWS b/ACE/NEWS
index 62752d8e085..0f136355f7c 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -1,6 +1,8 @@
 USER VISIBLE CHANGES BETWEEN ACE-7.0.11 and ACE-7.0.12
 ======================================================
 
+. Removed Windows CE support
+
 USER VISIBLE CHANGES BETWEEN ACE-7.0.10 and ACE-7.0.11
 ======================================================
 
diff --git a/ACE/ace/Asynch_Connector.cpp b/ACE/ace/Asynch_Connector.cpp
index 480c24b9551..5d9d5fdd16e 100644
--- a/ACE/ace/Asynch_Connector.cpp
+++ b/ACE/ace/Asynch_Connector.cpp
@@ -7,7 +7,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if (defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)) && !defined(ACE_HAS_WINCE)
+#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
 // This only works on platforms that support async I/O.
 
 #include "ace/OS_NS_sys_socket.h"
diff --git a/ACE/ace/Asynch_Connector.h b/ACE/ace/Asynch_Connector.h
index ad09d0a1879..dca8a9aef3d 100644
--- a/ACE/ace/Asynch_Connector.h
+++ b/ACE/ace/Asynch_Connector.h
@@ -18,7 +18,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if (defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)) && !defined(ACE_HAS_WINCE)
+#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
 // This only works on platforms that support async i/o.
 
 #include "ace/Asynch_IO.h"
diff --git a/ACE/ace/Asynch_IO.cpp b/ACE/ace/Asynch_IO.cpp
index b745791a118..5502dd2191c 100644
--- a/ACE/ace/Asynch_IO.cpp
+++ b/ACE/ace/Asynch_IO.cpp
@@ -432,7 +432,7 @@ ACE_Asynch_Read_File::read (ACE_Message_Block &message_block,
                                       signal_number);
 }
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if defined (ACE_WIN32)
 int
 ACE_Asynch_Read_File::readv (ACE_Message_Block &message_block,
                              size_t bytes_to_read,
@@ -455,7 +455,7 @@ ACE_Asynch_Read_File::readv (ACE_Message_Block &message_block,
                                        priority,
                                        signal_number);
 }
-#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#endif /* defined (ACE_WIN32) */
 
 ACE_Asynch_Operation_Impl *
 ACE_Asynch_Read_File::implementation () const
@@ -540,7 +540,7 @@ ACE_Asynch_Write_File::write (ACE_Message_Block &message_block,
                                        signal_number);
 }
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if defined (ACE_WIN32)
 int
 ACE_Asynch_Write_File::writev (ACE_Message_Block &message_block,
                                size_t bytes_to_write,
@@ -563,7 +563,7 @@ ACE_Asynch_Write_File::writev (ACE_Message_Block &message_block,
                                         priority,
                                         signal_number);
 }
-#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#endif /* defined (ACE_WIN32) */
 
 ACE_Asynch_Operation_Impl *
 ACE_Asynch_Write_File::implementation () const
diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h
index 677c814d201..c528be4188e 100644
--- a/ACE/ace/Asynch_IO.h
+++ b/ACE/ace/Asynch_IO.h
@@ -4,9 +4,8 @@
 /**
  *  @file    Asynch_IO.h
  *
- *  This works on Win32 (defined (ACE_WIN32) && !defined
- *  (ACE_HAS_WINCE)) platforms and on POSIX4 platforms with {aio_*}
- *  routines (defined (ACE_HAS_AIO_CALLS))
+ *  This works on Win32 (defined (ACE_WIN32)) platforms and on
+ *  POSIX4 platforms with {aio_*} routines (defined (ACE_HAS_AIO_CALLS))
  *
  *  On Win32 platforms, the implementation of
  *  {ACE_Asynch_Transmit_File} and {ACE_Asynch_Accept} are only
@@ -639,7 +638,7 @@ public:
             int priority = 0,
             int signal_number = ACE_SIGRTMIN);
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if defined (ACE_WIN32)
   /**
   * Same as above but with scatter support, through chaining of composite
   * message blocks using the continuation field.
@@ -653,7 +652,7 @@ public:
              const void *act = 0,
              int priority = 0,
              int signal_number = ACE_SIGRTMIN);
-#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#endif /* defined (ACE_WIN32) */
 
   /// Return the underlying implementation class.
   //  (this should be protected...)
@@ -774,7 +773,7 @@ public:
              int priority = 0,
              int signal_number = ACE_SIGRTMIN);
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if defined (ACE_WIN32)
   /**
   * Same as above but with gather support, through chaining of composite
   * message blocks using the continuation field.
@@ -788,7 +787,7 @@ public:
               const void *act = 0,
               int priority = 0,
               int signal_number = ACE_SIGRTMIN);
-#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#endif /* defined (ACE_WIN32) */
 
   /// Return the underlying implementation class.
   //  (this should be protected...)
diff --git a/ACE/ace/Asynch_IO_Impl.h b/ACE/ace/Asynch_IO_Impl.h
index 2f7e952ad15..40e79e25de6 100644
--- a/ACE/ace/Asynch_IO_Impl.h
+++ b/ACE/ace/Asynch_IO_Impl.h
@@ -160,7 +160,7 @@ public:
                     int priority,
                     int signal_number) = 0;
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if defined (ACE_WIN32)
   /**
   * Same as above but with scatter support, through chaining of composite
   * message blocks using the continuation field.
@@ -170,7 +170,7 @@ public:
                      const void *act,
                      int priority,
                      int signal_number) = 0;
-#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#endif /* defined (ACE_WIN32) */
 
 protected:
   /// Do-nothing constructor.
@@ -224,7 +224,7 @@ public:
                      int priority,
                      int signal_number) = 0;
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if defined (ACE_WIN32)
   /**
   * Same as above but with gather support, through chaining of composite
   * message blocks using the continuation field.
@@ -234,7 +234,7 @@ public:
                       const void *act,
                       int priority,
                       int signal_number) = 0;
-#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#endif /* defined (ACE_WIN32) */
 
 protected:
   /// Do-nothing constructor.
@@ -293,7 +293,7 @@ public:
                     int priority,
                     int signal_number) = 0;
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if defined (ACE_WIN32)
   /**
   * Same as above but with scatter support, through chaining of composite
   * message blocks using the continuation field.
@@ -307,7 +307,7 @@ public:
                      const void *act,
                      int priority,
                      int signal_number) = 0;
-#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#endif /* defined (ACE_WIN32) */
 
   /// This starts off an asynchronous read. Upto @a bytes_to_read will
   /// be read and stored in the @a message_block.
@@ -317,7 +317,7 @@ public:
                     int priority,
                     int signal_number) = 0;
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if defined (ACE_WIN32)
   /**
   * Same as above but with scatter support, through chaining of composite
   * message blocks using the continuation field.
@@ -327,7 +327,7 @@ public:
                      const void *act,
                      int priority,
                      int signal_number) = 0;
-#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#endif /* defined (ACE_WIN32) */
 
 protected:
   /// Do-nothing constructor.
@@ -376,7 +376,7 @@ public:
                      int priority,
                      int signal_number) = 0;
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if defined (ACE_WIN32)
   /**
   * Same as above but with gather support, through chaining of composite
   * message blocks using the continuation field.
@@ -390,7 +390,7 @@ public:
                       const void *act,
                       int priority,
                       int signal_number) = 0;
-#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#endif /* defined (ACE_WIN32) */
 
   /// This starts off an asynchronous write.  Upto @a bytes_to_write
   /// will be written from the @a message_block.
@@ -400,7 +400,7 @@ public:
                      int priority,
                      int signal_number) = 0;
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if defined (ACE_WIN32)
   /**
   * Same as above but with gather support, through chaining of composite
   * message blocks using the continuation field.
@@ -410,7 +410,7 @@ public:
                       const void *act,
                       int priority,
                       int signal_number) = 0;
-#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#endif /* defined (ACE_WIN32) */
 
 protected:
   /// Do-nothing constructor.
diff --git a/ACE/ace/CE_Screen_Output.cpp b/ACE/ace/CE_Screen_Output.cpp
deleted file mode 100644
index 8711f1e57c4..00000000000
--- a/ACE/ace/CE_Screen_Output.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-#include "ace/CE_Screen_Output.h"
-#if defined (ACE_HAS_WINCE)
-
-#include "ace/Log_Category.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_CE_Screen_Output::ACE_CE_Screen_Output(HWND hEdit)
-: handler_(hEdit)
-, pFile_(0)
-{
-}
-
-ACE_CE_Screen_Output::ACE_CE_Screen_Output()
-: handler_(0)
-, pFile_(0)
-{
-}
-
-ACE_CE_Screen_Output::~ACE_CE_Screen_Output()
-{
-    if (pFile_ != 0) {
-        fclose(pFile_);
-    }
-}
-
-void ACE_CE_Screen_Output::log(ACE_Log_Record &log_record)
-{
-    ACE_TCHAR verbose_msg[ACE_Log_Record::MAXVERBOSELOGMSGLEN];
-    int result = log_record.format_msg (ACE_TEXT("WindozeCE"),  // host name
-                                        0,                          // verbose flag
-                                        verbose_msg);
-
-    if (result == 0)
-    {
-        verbose_msg[ ACE_OS::strlen(verbose_msg) - 1 ] = 0;  // CE does not like '\n' by itself.
-        *this << verbose_msg << endl;
-    }
-}
-
-void ACE_CE_Screen_Output::SetOutputWindow(HWND hEdit)
-{
-    handler_ = hEdit;
-}
-
-void ACE_CE_Screen_Output::clear()
-{
-    SetWindowText(handler_, 0);
-}
-
-ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (ACE_TCHAR* output)
-{
-    int length = GetWindowTextLength(handler_);
-    SendMessage(handler_, EM_SETSEL, length, length);
-    SendMessage(handler_, EM_REPLACESEL, 0, (LPARAM)output);
-
-    if (pFile_ != 0)
-    {
-        fwprintf(pFile_, L"%s", output);
-    }
-
-    return *this;
-}
-
-ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (const ACE_TCHAR* output)
-{
-    ACE_TCHAR* buffer = ACE_OS::strdup(output);
-    if (buffer != 0)
-    {
-        *this << buffer;
-        delete buffer;
-    }
-    return *this;
-}
-
-ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (ACE_ANTI_TCHAR* output)
-{
-    *this << ACE_TEXT_CHAR_TO_TCHAR(output);
-    return *this;
-}
-
-ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (const ACE_ANTI_TCHAR* output)
-{
-    *this << ACE_TEXT_CHAR_TO_TCHAR(output);
-    return *this;
-}
-
-ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (char output)
-{
-    *this << (int)output;
-    return *this;
-}
-
-ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned char output)
-{
-    *this << (int)output;
-    return *this;
-}
-
-ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned short output)
-{
-    ACE_TCHAR buffer[20];
-    wsprintf(buffer, ACE_TEXT("%u"), output);
-    *this << buffer;
-    return *this;
-}
-
-ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (int output)
-{
-    ACE_TCHAR buffer[20];
-    wsprintf(buffer, ACE_TEXT("%d"), output);
-    *this << buffer;
-    return *this;
-}
-
-ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned int output)
-{
-    ACE_TCHAR buffer[20];
-    wsprintf(buffer, ACE_TEXT("%du"), output);
-    *this << buffer;
-    return *this;
-}
-
-ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (float output)
-{
-    ACE_TCHAR buffer[20];
-    swprintf(buffer, ACE_TEXT("%f"), output);
-    *this << buffer;
-    return *this;
-}
-
-ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (long output)
-{
-    ACE_TCHAR buffer[20];
-    wsprintf(buffer, ACE_TEXT("%l"), output);
-    *this << buffer;
-    return *this;
-}
-
-ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned long output)
-{
-    ACE_TCHAR buffer[20];
-    wsprintf(buffer, ACE_TEXT("%lu"), output);
-    *this << buffer;
-    return *this;
-}
-
-ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (FILE* pFile)
-{
-    pFile_ = pFile;
-    return *this;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif  // ACE_HAS_WINCE
diff --git a/ACE/ace/CE_Screen_Output.h b/ACE/ace/CE_Screen_Output.h
deleted file mode 100644
index 032f03924b6..00000000000
--- a/ACE/ace/CE_Screen_Output.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CE_Screen_Output.h
- *
- *  @author Si Mong Park  <spark@ociweb.com>
- */
-//=============================================================================
-
-#ifndef ACE_CE_SCREEN_OUTPUT_H
-#define ACE_CE_SCREEN_OUTPUT_H
-
-#include /**/ "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_WINCE)
-
-#include "ace/Log_Msg_Callback.h"
-#include "ace/Log_Record.h"
-
-namespace
-{
-  const ACE_TCHAR endl[] = ACE_TEXT("\r\n");
-  const ACE_TCHAR tab[]  = ACE_TEXT("\t");
-}
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_CE_Screen_Output
- *
- * @brief Replacement of text output for Windows CE.
- *
- * This class allows standard text output to be displayed on
- * text window for Windows CE.  Generally, all ACE output will
- * go through under CE if and only if user uses Windows CE
- * implementation by using main_ce instead of main.
- * Also, for the easier debugging purpose, object pointer of
- * this class can be gotten from ACE_Log_Msg::msg_callback()
- * and then can be used directly by user just like cout stream.
- */
-class ACE_Export ACE_CE_Screen_Output : public ACE_Log_Msg_Callback
-{
-public:
-  ACE_CE_Screen_Output (HWND hEdit);
-
-  ACE_CE_Screen_Output ();
-
-  virtual ~ACE_CE_Screen_Output();
-
-  /// Implementation of pure virtual function from ACE_Log_Msg_Callback.
-  virtual void log (ACE_Log_Record &log_record);
-
-  /// Interface to specify active window handle.
-  void SetOutputWindow (HWND hWnd);
-
-  void clear ();
-
-  /// Stream insertion operator that performs actual print out.
-  /**
-   * @note This is the only one operator that performs output.  All
-   *       other perators convert the type and use this operator
-   *       underneath.
-   */
-  ACE_CE_Screen_Output& operator << (ACE_TCHAR*);
-  ACE_CE_Screen_Output& operator << (const ACE_TCHAR*);
-
-  ACE_CE_Screen_Output& operator << (ACE_ANTI_TCHAR* output);
-  ACE_CE_Screen_Output& operator << (const ACE_ANTI_TCHAR* output);
-
-  ACE_CE_Screen_Output& operator << (char output);
-  ACE_CE_Screen_Output& operator << (unsigned char output);
-
-  ACE_CE_Screen_Output& operator << (unsigned short output);
-
-  ACE_CE_Screen_Output& operator << (int output);
-  ACE_CE_Screen_Output& operator << (unsigned int output);
-
-  ACE_CE_Screen_Output& operator << (float output);
-
-  ACE_CE_Screen_Output& operator << (long output);
-  ACE_CE_Screen_Output& operator << (unsigned long output);
-
-  ACE_CE_Screen_Output& operator << (FILE* pFile);
-
-private:
-  ACE_CE_Screen_Output (ACE_CE_Screen_Output&);
-
-private:
-  HWND handler_;
-
-  /// FILE pointer that used to save output to file.  This class does
-  /// not own the file handler pointer.
-  FILE* pFile_;
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif  // ACE_HAS_WINCE
-#endif  // ACE_CE_SCREEN_OUTPUT_H
diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp
index 01e10fc9c0c..56cb81fd8ea 100644
--- a/ACE/ace/Configuration.cpp
+++ b/ACE/ace/Configuration.cpp
@@ -966,11 +966,7 @@ ACE_Configuration_Win32Registry::resolve_key (HKEY hKey,
   HKEY result = 0;
   // Make a copy of hKey
   int errnum;
-#if defined (ACE_HAS_WINCE)
-  if ((errnum = RegOpenKeyEx (hKey, 0, 0, 0, &result)) != ERROR_SUCCESS)
-#else
   if ((errnum = RegOpenKey (hKey, 0, &result)) != ERROR_SUCCESS)
-#endif  // ACE_HAS_WINCE
     {
       errno = errnum;
       return 0;
@@ -994,17 +990,9 @@ ACE_Configuration_Win32Registry::resolve_key (HKEY hKey,
       // Open the key
       HKEY subkey;
 
-#if defined (ACE_HAS_WINCE)
-      if ((errnum = ACE_TEXT_RegOpenKeyEx (result,
-                                           temp,
-                                           0,
-                                           0,
-                                           &subkey)) != ERROR_SUCCESS)
-#else
       if ((errnum = ACE_TEXT_RegOpenKey (result,
                                          temp,
                                          &subkey)) != ERROR_SUCCESS)
-#endif  // ACE_HAS_WINCE
         {
           // try creating it
           if (!create || (errnum = ACE_TEXT_RegCreateKeyEx (result,
diff --git a/ACE/ace/Date_Time.inl b/ACE/ace/Date_Time.inl
index ef2a39b4d3e..25bb2e2e0db 100644
--- a/ACE/ace/Date_Time.inl
+++ b/ACE/ace/Date_Time.inl
@@ -9,22 +9,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_INLINE void
 ACE_Date_Time::update (const ACE_Time_Value& timevalue)
 {
-#if defined (ACE_HAS_WINCE)
-  // CE doesn't do localtime().
-  FILETIME file_time = timevalue;
-  FILETIME local_file_time;
-  SYSTEMTIME sys_time;
-  ::FileTimeToLocalFileTime (&file_time, &local_file_time);
-  ::FileTimeToSystemTime (&local_file_time, &sys_time);
-  this->day_ = sys_time.wDay;
-  this->month_ = sys_time.wMonth;
-  this->year_ = sys_time.wYear;
-  this->hour_ = sys_time.wHour;
-  this->minute_ = sys_time.wMinute;
-  this->second_ = sys_time.wSecond;
-  this->microsec_ = sys_time.wMilliseconds * 1000;
-  this->wday_ = sys_time.wDayOfWeek;
-#else
   time_t time = timevalue.sec ();
   struct tm tm_time;
   ACE_OS::localtime_r (&time, &tm_time);
@@ -36,7 +20,6 @@ ACE_Date_Time::update (const ACE_Time_Value& timevalue)
   this->second_ = tm_time.tm_sec;
   this->microsec_ = timevalue.usec ();
   this->wday_ = tm_time.tm_wday;
-#endif /* ACE_HAS_WINCE */
 }
 
 ACE_INLINE void
diff --git a/ACE/ace/ETCL/ETCL_l.cpp b/ACE/ace/ETCL/ETCL_l.cpp
index b4fcaace55e..1addcb5319e 100644
--- a/ACE/ace/ETCL/ETCL_l.cpp
+++ b/ACE/ace/ETCL/ETCL_l.cpp
@@ -1529,18 +1529,7 @@ FILE *file;
   b->yy_input_file = file;
   b->yy_fill_buffer = 1;
 
-#if defined (ACE_HAS_WINCE)
-    // Mimic the behavior as WinCE does not have isatty().
-    if ((file != 0) && (file == ACE_OS::fileno(file))) {
-        b->yy_is_interactive = 1;
-    }
-    else {
-        b->yy_is_interactive = 0;
-    }
-#else
   b->yy_is_interactive = file ? (ACE_OS::isatty( ACE_OS::fileno(file) ) > 0) : 0;
-#endif  // ACE_HAS_WINCE
-
   }
 
 
diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h
index e8e64b20a6c..aff8cf083c6 100644
--- a/ACE/ace/Global_Macros.h
+++ b/ACE/ace/Global_Macros.h
@@ -676,20 +676,7 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
 # define ACE_SVC_FACTORY_DEFINE(X) ACE_FACTORY_DEFINE (ACE_Svc, X)
 //@}
 
-#if defined (ACE_WIN32)
-// These are used in SPIPE_Acceptor/Connector, but are ignored at runtime.
-#   if defined (ACE_HAS_WINCE)
-#     if !defined (PIPE_TYPE_MESSAGE)
-#       define PIPE_TYPE_MESSAGE  0
-#     endif
-#     if !defined (PIPE_READMODE_MESSAGE)
-#       define PIPE_READMODE_MESSAGE  0
-#     endif
-#     if !defined (PIPE_WAIT)
-#       define PIPE_WAIT  0
-#     endif
-#   endif /* ACE_HAS_WINCE */
-#else /* !ACE_WIN32 */
+#if !defined (ACE_WIN32)
 // Add some typedefs and macros to enhance Win32 conformance...
 #   if !defined (LPSECURITY_ATTRIBUTES)
 #     define LPSECURITY_ATTRIBUTES int
@@ -736,8 +723,7 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
 #   if !defined(PIPE_TYPE_MESSAGE)
 #     define PIPE_TYPE_MESSAGE 0
 #   endif /* !defined PIPE_TYPE_MESSAGE */
-#endif /* ACE_WIN32 */
-
+#endif /* !ACE_WIN32 */
 
 // Some useful abstractions for expressions involving
 // ACE_Allocator.malloc ().  The difference between ACE_NEW_MALLOC*
diff --git a/ACE/ace/High_Res_Timer.cpp b/ACE/ace/High_Res_Timer.cpp
index ef30f0833fb..1546cd03d07 100644
--- a/ACE/ace/High_Res_Timer.cpp
+++ b/ACE/ace/High_Res_Timer.cpp
@@ -227,7 +227,7 @@ ACE_High_Res_Timer::global_scale_factor ()
 #endif /* (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \
            ACE_HAS_PENTIUM) && \
           ! ACE_HAS_HI_RES_TIMER &&
-          ((WIN32 && ! WINCE) || ghs || __GNUG__) */
+          ((WIN32) || ghs || __GNUG__) */
 
   return ACE_High_Res_Timer::global_scale_factor_;
 }
diff --git a/ACE/ace/Lib_Find.cpp b/ACE/ace/Lib_Find.cpp
index a5918e499d9..d3f93584e8e 100644
--- a/ACE/ace/Lib_Find.cpp
+++ b/ACE/ace/Lib_Find.cpp
@@ -190,15 +190,14 @@ ACE::ldfind (const ACE_TCHAR* filename,
   return -1;
 #endif /* ACE_OPENVMS */
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && \
-    !defined (ACE_HAS_PHARLAP)
+#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
   ACE_TCHAR expanded_filename[MAXPATHLEN];
   if (ACE_TEXT_ExpandEnvironmentStrings (filename,
                                          expanded_filename,
                                          sizeof expanded_filename
                                          / sizeof (ACE_TCHAR)))
     filename = expanded_filename;
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE && !ACE_HAS_PHARLAP */
+#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */
 
   ACE_TCHAR tempcopy[MAXPATHLEN + 1];
   ACE_TCHAR searchpathname[MAXPATHLEN + 1];
@@ -338,7 +337,7 @@ ACE::ldfind (const ACE_TCHAR* filename,
       // OS platform).
       else
         {
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32)
           ACE_TCHAR *file_component = 0;
           DWORD pathlen =
             ACE_TEXT_SearchPath (0,
@@ -389,29 +388,6 @@ ACE::ldfind (const ACE_TCHAR* filename,
 #    endif /* ACE_WIN32 || !ACE_USES_WCHAR */
 #  endif /* ACE_DEFAULT_LD_SEARCH_PATH */
 
-#if defined (ACE_HAS_WINCE)
-            ACE_TCHAR *ld_path_temp = 0;
-            if (ld_path != 0)
-              {
-                ld_path_temp = (ACE_TCHAR *)
-                  ACE_OS::malloc ((ACE_OS::strlen (ld_path) + 2)
-                                  * sizeof (ACE_TCHAR));
-                if (ld_path_temp != 0)
-                  {
-                    ACE_OS::strcpy (ld_path_temp,
-                                    ACE_LD_SEARCH_PATH_SEPARATOR_STR);
-
-                    ACE_OS::strcat (ld_path_temp, ld_path);
-                    ld_path = ld_path_temp;
-                  }
-                else
-                  {
-                    ACE_OS::free ((void *) ld_path_temp);
-                    ld_path = ld_path_temp = 0;
-                  }
-              }
-#endif /* ACE_HAS_WINCE */
-
           if (ld_path != 0
               && (ld_path = ACE_OS::strdup (ld_path)) != 0)
             {
@@ -492,10 +468,6 @@ ACE::ldfind (const ACE_TCHAR* filename,
                                      nextholder);
                 }
 
-#if defined (ACE_HAS_WINCE)
-              if (ld_path_temp != 0)
-                ACE_OS::free (ld_path_temp);
-#endif /* ACE_HAS_WINCE */
 #if defined (ACE_HAS_ALLOC_HOOKS)
               ACE_Allocator::instance()->free ((void *) ld_path);
 #else
@@ -506,7 +478,7 @@ ACE::ldfind (const ACE_TCHAR* filename,
 #endif /* ACE_LD_DECORATOR_STR && !ACE_DISABLE_DEBUG_DLL_CHECK */
                 return result;
             }
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE */
+#endif /* ACE_WIN32 */
         }
 #if defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK)
     }
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index 88f584c2ed1..b0f51f7cb0f 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -80,11 +80,11 @@ public:
 };
 #endif /* ACE_MT_SAFE */
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP)
+#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
 #  define ACE_LOG_MSG_SYSLOG_BACKEND ACE_Log_Msg_NT_Event_Log
 #elif defined (ACE_ANDROID)
 #  define ACE_LOG_MSG_SYSLOG_BACKEND ACE_Log_Msg_Android_Logcat
-#elif !defined (ACE_LACKS_UNIX_SYSLOG) && !defined (ACE_HAS_WINCE)
+#elif !defined (ACE_LACKS_UNIX_SYSLOG)
 #  define ACE_LOG_MSG_SYSLOG_BACKEND ACE_Log_Msg_UNIX_Syslog
 #endif
 
diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h
index b36fc903eca..2608b6c0eb2 100644
--- a/ACE/ace/Log_Msg.h
+++ b/ACE/ace/Log_Msg.h
@@ -374,10 +374,6 @@ public:
   /// restarted.
   bool restart () const;
 
-  // = Notice that the following two function is equivalent to
-  //   "void msg_ostream (HANDLE)" and "HANDLE msg_ostream ()"
-  //   on Windows CE.  There is no <iostream.h> support on CE.
-
   /// Update the ostream without overwriting the delete_ostream_ flag.
   void msg_ostream (ACE_OSTREAM_TYPE *);
 
diff --git a/ACE/ace/Log_Record.h b/ACE/ace/Log_Record.h
index 0cca3bfe113..152e2940eb4 100644
--- a/ACE/ace/Log_Record.h
+++ b/ACE/ace/Log_Record.h
@@ -73,11 +73,11 @@ public:
   /// FILE if the corresponding type is enabled.
   int print (const ACE_TCHAR host_name[],
              u_long verbose_flag,
-#if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_STDERR)
+#if !defined (ACE_LACKS_STDERR)
              FILE *fp = stderr);
 #else
              FILE *fp);
-#endif /* ACE_HAS_WINCE */
+#endif /* ACE_LACKS_STDERR */
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   /// Write the contents of the logging record to the appropriate
diff --git a/ACE/ace/MEM_Acceptor.h b/ACE/ace/MEM_Acceptor.h
index 2ee834409cf..eebc834e5f6 100644
--- a/ACE/ace/MEM_Acceptor.h
+++ b/ACE/ace/MEM_Acceptor.h
@@ -24,10 +24,7 @@
 
 #include "ace/MEM_Stream.h"
 #include "ace/MEM_Addr.h"
-
-#if !defined (ACE_HAS_WINCE)
 #include "ace/OS_QoS.h"
-#endif  // ACE_HAS_WINCE
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -151,14 +148,12 @@ protected:
               bool restart = true,
               bool reset_new_handle = false) const;
 
-#if !defined (ACE_HAS_WINCE)
   int accept (ACE_SOCK_Stream &new_stream,
               ACE_Accept_QoS_Params qos_params,
               ACE_Addr *remote_addr = 0,
               ACE_Time_Value *timeout = 0,
               bool restart = true,
               bool reset_new_handle = false) const;
-#endif  // ACE_HAS_WINCE
 
 private:
   /// The filename prefix of the created mmap files.  It should
diff --git a/ACE/ace/MEM_Acceptor.inl b/ACE/ace/MEM_Acceptor.inl
index 4d31ef56f20..35b2d9adaa2 100644
--- a/ACE/ace/MEM_Acceptor.inl
+++ b/ACE/ace/MEM_Acceptor.inl
@@ -27,7 +27,6 @@ ACE_MEM_Acceptor::accept (ACE_SOCK_Stream &new_stream,
     (new_stream, remote_addr, timeout, restart, reset_new_handle);
 }
 
-#if !defined (ACE_HAS_WINCE)
 ACE_INLINE int
 ACE_MEM_Acceptor::accept (ACE_SOCK_Stream &new_stream,
                           ACE_Accept_QoS_Params qos_params,
@@ -39,7 +38,6 @@ ACE_MEM_Acceptor::accept (ACE_SOCK_Stream &new_stream,
   return this->ACE_SOCK_Acceptor::accept
     (new_stream, qos_params, remote_addr, timeout, restart, reset_new_handle);
 }
-#endif  // ACE_HAS_WINCE
 
 ACE_INLINE int
 ACE_MEM_Acceptor::get_local_addr (ACE_MEM_Addr &sap) const
diff --git a/ACE/ace/MMAP_Memory_Pool.cpp b/ACE/ace/MMAP_Memory_Pool.cpp
index ea1c432895e..607d3177196 100644
--- a/ACE/ace/MMAP_Memory_Pool.cpp
+++ b/ACE/ace/MMAP_Memory_Pool.cpp
@@ -294,11 +294,7 @@ ACE_MMAP_Memory_Pool::map_file (size_t map_size)
                        0,
                        this->sa_) == -1
       || (this->base_addr_ != 0
-#ifdef ACE_HAS_WINCE
-      && this->mmap_.addr () == 0))  // WinCE does not allow users to specify alloc addr.
-#else
       && this->mmap_.addr () != this->base_addr_))
-#endif  // ACE_HAS_WINCE
     {
 #if 0
       ACELIB_ERROR ((LM_ERROR,
diff --git a/ACE/ace/Monitor_Control/Monitor_Control.mpc b/ACE/ace/Monitor_Control/Monitor_Control.mpc
index 11366c50ada..a510ac2da38 100644
--- a/ACE/ace/Monitor_Control/Monitor_Control.mpc
+++ b/ACE/ace/Monitor_Control/Monitor_Control.mpc
@@ -2,7 +2,6 @@
 project(Monitor_Control) : acelib, ace_etcl_parser, ace_output, install {
   dynamicflags += MONITOR_CONTROL_BUILD_DLL
   sharedname   = ACE_Monitor_Control
-  avoids += wince
 
   Source_Files {
     Auto_Update_Starter.cpp
diff --git a/ACE/ace/OS_Errno.cpp b/ACE/ace/OS_Errno.cpp
index 065eb39e133..1c2f75e490a 100644
--- a/ACE/ace/OS_Errno.cpp
+++ b/ACE/ace/OS_Errno.cpp
@@ -13,31 +13,3 @@
 # include "ace/OS_Errno.inl"
 #endif /* ACE_HAS_INLINED_OSCALLS */
 
-#if defined (ACE_HAS_WINCE_BROKEN_ERRNO)
-
-#include "ace/OS_Memory.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_CE_Errno *ACE_CE_Errno::instance_ = 0;
-DWORD ACE_CE_Errno::errno_key_ = 0xffffffff;
-
-void
-ACE_CE_Errno::init ()
-{
-  ACE_NEW (ACE_CE_Errno::instance_,
-           ACE_CE_Errno ());
-  ACE_CE_Errno::errno_key_ = TlsAlloc ();
-}
-
-void
-ACE_CE_Errno::fini ()
-{
-  TlsFree (ACE_CE_Errno::errno_key_);
-  delete ACE_CE_Errno::instance_;
-  ACE_CE_Errno::instance_ = 0;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */
diff --git a/ACE/ace/OS_Errno.h b/ACE/ace/OS_Errno.h
index d50463c9b68..9ebdc03b5c7 100644
--- a/ACE/ace/OS_Errno.h
+++ b/ACE/ace/OS_Errno.h
@@ -55,18 +55,13 @@ public:
   /// Reset the value of @c errno to <error>.
   ~ACE_Errno_Guard ();
 
-#if defined (ACE_HAS_WINCE_BROKEN_ERRNO)
-  /// Assign @a errno_ref to <error_>.
-  int operator= (const ACE_ERRNO_TYPE &errno_ref);
-#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */
-
-  /// Assign <error> to <error_>.
+  /// Assign @a erro> to error_.
   int operator= (int error);
 
-  /// Compare <error> with <error_> for equality.
+  /// Compare @a error with error_ for equality.
   bool operator== (int error);
 
-  /// Compare <error> with <error_> for inequality.
+  /// Compare @a error with error_ for inequality.
   bool operator!= (int error);
 
 private:
diff --git a/ACE/ace/OS_Errno.inl b/ACE/ace/OS_Errno.inl
index 0a7fa0f4ff2..32d9ea284bd 100644
--- a/ACE/ace/OS_Errno.inl
+++ b/ACE/ace/OS_Errno.inl
@@ -35,14 +35,6 @@ ACE_Errno_Guard::~ACE_Errno_Guard ()
 #endif /* ACE_MT_SAFE */
 }
 
-#if defined (ACE_HAS_WINCE_BROKEN_ERRNO)
-ACE_INLINE int
-ACE_Errno_Guard::operator= (const ACE_ERRNO_TYPE &error)
-{
-  return this->error_ = error;
-}
-#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */
-
 ACE_INLINE int
 ACE_Errno_Guard::operator= (int error)
 {
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
index a99cdd35ef2..3a5a8d99242 100644
--- a/ACE/ace/OS_NS_Thread.cpp
+++ b/ACE/ace/OS_NS_Thread.cpp
@@ -30,9 +30,6 @@ ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args)
 #if !defined(ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400)
 # define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \
        (*THR_ID = ::_beginthreadex ((void(_Optlink*)(void*))ENTRY_POINT, STACK, STACKSIZE, ARGS), *THR_ID)
-#elif defined (ACE_HAS_WINCE)
-# define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \
-      CreateThread (0, STACKSIZE, (unsigned long (__stdcall *) (void *)) ENTRY_POINT, ARGS, (FLAGS) & (CREATE_SUSPENDED | STACK_SIZE_PARAM_IS_A_RESERVATION), (unsigned long *) THR_ID)
 #elif defined(ACE_HAS_WTHREADS)
   // Green Hills compiler gets confused when __stdcall is embedded in
   // parameter list, so we define the type ACE_WIN32THRFUNC_T and use it
@@ -1466,13 +1463,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
       // Wait to be awakened by a ACE_OS::signal() or
       // ACE_OS::broadcast().
 #     if defined (ACE_WIN32)
-#       if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
       result = ::WaitForSingleObject (cv->sema_, msec_timeout);
-#       else /* ACE_USES_WINCE_SEMA_SIMULATION */
-      // Can't use Win32 API on our simulated semaphores.
-      result = ACE_OS::sema_wait (&cv->sema_,
-                                  timeout);
-#       endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 #     elif defined (ACE_VXWORKS)
       // Inline the call to ACE_OS::sema_wait () because it takes an
       // ACE_Time_Value argument.  Avoid the cost of that conversion . . .
@@ -1657,16 +1648,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
     return -1;
 
   // Wait to be awakened by a ACE_OS::signal() or ACE_OS::broadcast().
-#     if defined (ACE_USES_WINCE_SEMA_SIMULATION)
-  // Can't use Win32 API on simulated semaphores.
-  result = ACE_OS::sema_wait (&cv->sema_,
-                              timeout);
-
-  if (result == -1 && errno == ETIME)
-    result = WAIT_TIMEOUT;
-#     else
   result = ::WaitForSingleObject (cv->sema_, msec_timeout);
-#     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 
   // Reacquire lock to avoid race conditions.
   if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0)
@@ -1748,16 +1730,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv,
 
   // Wait to be awakened by a ACE_OS::cond_signal() or
   // ACE_OS::cond_broadcast().
-#     if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
   result = ::WaitForSingleObject (cv->sema_, INFINITE);
-#     else
-  // Can't use Win32 API on simulated semaphores.
-  result = ACE_OS::sema_wait (&cv->sema_);
-
-  if (result != WAIT_OBJECT_0 && errno == ETIME)
-    result = WAIT_TIMEOUT;
-
-#     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 
   // Reacquire lock to avoid race conditions.
   if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0)
@@ -1920,20 +1893,11 @@ ACE_OS::mutex_init (ACE_mutex_t *m,
   switch (lock_scope)
 {
   case USYNC_PROCESS:
-#   if defined (ACE_HAS_WINCE)
-      // @@todo (brunsch) This idea should be moved into ACE_OS_Win32.
-      m->proc_mutex_ =
-  ::CreateMutexW (ACE_OS::default_win32_security_attributes_r
-                          (sa, &sa_buffer, &sd_buffer),
-                        FALSE,
-                        ACE_Ascii_To_Wide (name).wchar_rep ());
-#   else /* ACE_HAS_WINCE */
       m->proc_mutex_ =
-  ::CreateMutexA (ACE_OS::default_win32_security_attributes_r
-                          (sa, &sa_buffer, &sd_buffer),
-                        FALSE,
-                        name);
-#   endif /* ACE_HAS_WINCE */
+        ::CreateMutexA (ACE_OS::default_win32_security_attributes_r
+                                (sa, &sa_buffer, &sd_buffer),
+                              FALSE,
+                              name);
       if (m->proc_mutex_ == 0)
         ACE_FAIL_RETURN (-1);
       else
@@ -2587,20 +2551,11 @@ ACE_OS::event_init (ACE_event_t *event,
   ACE_UNUSED_ARG (arg);
   SECURITY_ATTRIBUTES sa_buffer;
   SECURITY_DESCRIPTOR sd_buffer;
-# if defined (ACE_HAS_WINCE)
-  // @@todo (brunsch) This idea should be moved into ACE_OS_Win32.
-  *event = ::CreateEventW (ACE_OS::default_win32_security_attributes_r
-                             (sa, &sa_buffer, &sd_buffer),
-                           manual_reset,
-                           initial_state,
-                           ACE_Ascii_To_Wide (name).wchar_rep ());
-# else /* ACE_HAS_WINCE */
   *event = ::CreateEventA (ACE_OS::default_win32_security_attributes_r
                              (sa, &sa_buffer, &sd_buffer),
                            manual_reset,
                            initial_state,
                            name);
-# endif /* ACE_HAS_WINCE */
   if (*event == 0)
     ACE_FAIL_RETURN (-1);
   else
@@ -3305,8 +3260,7 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
       return -1;
     }
 
-#elif defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
-
+#elif defined (ACE_WIN32)
   // PharLap ETS can act on the current thread - it can set the
   // quantum also, unlike Win32. All this only works on the RT
   // version.
@@ -3318,16 +3272,13 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
   if (sched_params.quantum() != ACE_Time_Value::zero)
     EtsSetTimeSlice (sched_params.quantum().msec());
 #   endif
-
 # else
-
   if (sched_params.quantum () != ACE_Time_Value::zero)
     {
       // I don't know of a way to set the quantum on Win32.
       errno = EINVAL;
       return -1;
     }
-
 # endif /* ACE_HAS_PHARLAP_RT */
 
   if (sched_params.scope () == ACE_SCOPE_THREAD)
@@ -4075,7 +4026,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
                           flags | THR_SUSPENDED);
       // Have to duplicate the handle because
       // CWinThread::~CWinThread() closes the original handle.
-#     if !defined (ACE_HAS_WINCE)
       (void) ::DuplicateHandle (::GetCurrentProcess (),
                                 cwin_thread->m_hThread,
                                 ::GetCurrentProcess (),
@@ -4083,7 +4033,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
                                 0,
                                 TRUE,
                                 DUPLICATE_SAME_ACCESS);
-#     endif /* ! ACE_HAS_WINCE */
       *thr_id = cwin_thread->m_nThreadID;
 
       if (ACE_BIT_ENABLED (flags, THR_SUSPENDED) == 0)
diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h
index 8ae8f7141aa..763ee8cdd10 100644
--- a/ACE/ace/OS_NS_Thread.h
+++ b/ACE/ace/OS_NS_Thread.h
@@ -264,31 +264,7 @@ typedef struct
 typedef HANDLE ACE_event_t;
 
 #     if defined (ACE_WIN32)
-//@@ ACE_USES_WINCE_SEMA_SIMULATION is used to debug
-//   semaphore simulation on WinNT.  It should be
-//   changed to ACE_USES_HAS_WINCE at some later point.
-#       if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
 typedef HANDLE ACE_sema_t;
-#       else
-/**
- * @class ACE_sema_t
- *
- * @brief Semaphore simulation for Windows CE.
- */
-class ACE_Export ACE_sema_t
-{
-public:
-  /// Serializes access to @c count_.
-  ACE_thread_mutex_t lock_;
-
-  /// This event is signaled whenever the count becomes non-zero.
-  ACE_event_t count_nonzero_;
-
-  /// Current count of the semaphore.
-  u_int count_;
-};
-
-#       endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 #     endif /* defined (ACE_WIN32) */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl
index 0219e6dc1c6..fb6aa2860a6 100644
--- a/ACE/ace/OS_NS_Thread.inl
+++ b/ACE/ace/OS_NS_Thread.inl
@@ -609,15 +609,7 @@ ACE_OS::recursive_mutex_cond_unlock (ACE_recursive_thread_mutex_t *m,
   // Windows variants that depend on existing values and limits.
 
   state.relock_count_ = 0;
-  while (
-#      if !defined (ACE_HAS_WINCE)
-         m->LockCount > 0 && m->RecursionCount > 1
-#      else
-         // WinCE doesn't have RecursionCount and the LockCount semantic
-         // Mobile 5 has it 1-indexed.
-         m->LockCount > 1
-#      endif /* ACE_HAS_WINCE */
-         )
+  while (m->LockCount > 0 && m->RecursionCount > 1)
     {
       // This may fail if the current thread doesn't own the mutex. If it
       // does fail, it'll be on the first try, so don't worry about resetting
@@ -1482,14 +1474,7 @@ ACE_OS::sema_destroy (ACE_sema_t *s)
   int r2 = ACE_OS::cond_destroy (&s->count_nonzero_);
   return r1 != 0 || r2 != 0 ? -1 : 0;
 # elif defined (ACE_HAS_WTHREADS)
-#  if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CloseHandle (*s), ace_result_), int, -1);
-#  else /* ACE_USES_WINCE_SEMA_SIMULATION */
-  // Free up underlying objects of the simulated semaphore.
-  int const r1 = ACE_OS::thread_mutex_destroy (&s->lock_);
-  int const r2 = ACE_OS::event_destroy (&s->count_nonzero_);
-  return r1 != 0 || r2 != 0 ? -1 : 0;
-#  endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 # elif defined (ACE_VXWORKS)
   int result;
   ACE_OSCALL (::semDelete (s->sema_), int, result);
@@ -1790,7 +1775,6 @@ ACE_OS::sema_init (ACE_sema_t *s,
   return result;
 #  elif defined (ACE_HAS_WTHREADS)
   ACE_UNUSED_ARG (attributes);
-#    if ! defined (ACE_USES_WINCE_SEMA_SIMULATION)
   ACE_UNUSED_ARG (type);
   ACE_UNUSED_ARG (arg);
   // Create the semaphore with its value initialized to <count> and
@@ -1812,40 +1796,6 @@ ACE_OS::sema_init (ACE_sema_t *s,
       ACE_OS::set_errno_to_last_error ();
       return 0;
     }
-#    else /* ACE_USES_WINCE_SEMA_SIMULATION */
-  int result = -1;
-
-  // Initialize internal object for semaphore simulation.
-  // Grab the lock as soon as possible when we initializing
-  // the semaphore count.  Notice that we initialize the
-  // event object as "manually reset" so we can amortize the
-  // cost for singling/reseting the event.
-  // @@ I changed the mutex type to thread_mutex.  Notice that this
-  // is basically a CriticalSection object and doesn't not has
-  // any security attribute whatsoever.  However, since this
-  // semaphore implementation only works within a process, there
-  // shouldn't any security issue at all.
-  if (ACE_OS::thread_mutex_init (&s->lock_, type, name, (ACE_mutexattr_t *)arg) == 0
-      && ACE_OS::event_init (&s->count_nonzero_, 1,
-                             count > 0, type, name, arg, sa) == 0
-      && ACE_OS::thread_mutex_lock (&s->lock_) == 0)
-    {
-      s->count_ = count;
-
-      if (ACE_OS::thread_mutex_unlock (&s->lock_) == 0)
-        result = 0;
-    }
-
-  // Destroy the internal objects if we didn't initialize
-  // either of them successfully.  Don't bother to check
-  // for errors.
-  if (result == -1)
-    {
-      ACE_OS::thread_mutex_destroy (&s->lock_);
-      ACE_OS::event_destroy (&s->count_nonzero_);
-    }
-  return result;
-#    endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 #  elif defined (ACE_VXWORKS)
   ACE_UNUSED_ARG (attributes);
   ACE_UNUSED_ARG (name);
@@ -1895,7 +1845,6 @@ ACE_OS::sema_init (ACE_sema_t *s,
 {
 # if defined (ACE_HAS_WTHREADS)
   ACE_UNUSED_ARG (attributes);
-#   if ! defined (ACE_USES_WINCE_SEMA_SIMULATION)
   ACE_UNUSED_ARG (type);
   ACE_UNUSED_ARG (arg);
   // Create the semaphore with its value initialized to <count> and
@@ -1917,40 +1866,6 @@ ACE_OS::sema_init (ACE_sema_t *s,
       ACE_OS::set_errno_to_last_error ();
       return 0;
     }
-#   else /* ACE_USES_WINCE_SEMA_SIMULATION */
-  int result = -1;
-
-  // Initialize internal object for semaphore simulation.
-  // Grab the lock as soon as possible when we initializing
-  // the semaphore count.  Notice that we initialize the
-  // event object as "manually reset" so we can amortize the
-  // cost for singling/reseting the event.
-  // @@ I changed the mutex type to thread_mutex.  Notice that this
-  // is basically a CriticalSection object and doesn't not has
-  // any security attribute whatsoever.  However, since this
-  // semaphore implementation only works within a process, there
-  // shouldn't any security issue at all.
-  if (ACE_OS::thread_mutex_init (&s->lock_, type, name, (ACE_mutexattr_t *)arg) == 0
-      && ACE_OS::event_init (&s->count_nonzero_, 1,
-                             count > 0, type, name, arg, sa) == 0
-      && ACE_OS::thread_mutex_lock (&s->lock_) == 0)
-    {
-      s->count_ = count;
-
-      if (ACE_OS::thread_mutex_unlock (&s->lock_) == 0)
-        result = 0;
-    }
-
-  // Destroy the internal objects if we didn't initialize
-  // either of them successfully.  Don't bother to check
-  // for errors.
-  if (result == -1)
-    {
-      ACE_OS::thread_mutex_destroy (&s->lock_);
-      ACE_OS::event_destroy (&s->count_nonzero_);
-    }
-  return result;
-#   endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 # else /* ACE_HAS_WTHREADS */
   // Just call the normal char version.
   return ACE_OS::sema_init (s, count, type, attributes, ACE_Wide_To_Ascii (name).char_rep (), arg, max, sa);
@@ -2024,29 +1939,9 @@ ACE_OS::sema_post (ACE_sema_t *s)
     }
   return result;
 #   elif defined (ACE_HAS_WTHREADS)
-#     if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::ReleaseSemaphore (*s, 1, 0),
                                           ace_result_),
                         int, -1);
-#     else /* ACE_USES_WINCE_SEMA_SIMULATION */
-  int result = -1;
-
-  // Since we are simulating semaphores, we need to update semaphore
-  // count manually.  Grab the lock to prevent race condition first.
-  if (ACE_OS::thread_mutex_lock (&s->lock_) == 0)
-    {
-      // Check the original state of event object.  Single the event
-      // object in transition from semaphore not available to
-      // semaphore available.
-      if (s->count_++ <= 0)
-        result = ACE_OS::event_signal (&s->count_nonzero_);
-      else
-        result = 0;
-
-      ACE_OS::thread_mutex_unlock (&s->lock_);
-    }
-  return result;
-#     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 #   elif defined (ACE_VXWORKS)
   return ::semGive (s->sema_);
 #   endif /* ACE_HAS_STHREADS */
@@ -2059,7 +1954,7 @@ ACE_OS::sema_post (ACE_sema_t *s)
 ACE_INLINE int
 ACE_OS::sema_post (ACE_sema_t *s, u_int release_count)
 {
-#if defined (ACE_WIN32) && !defined (ACE_USES_WINCE_SEMA_SIMULATION)
+#if defined (ACE_WIN32)
   // Win32 supports this natively.
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::ReleaseSemaphore (*s, release_count, 0),
                                           ace_result_), int, -1);
@@ -2133,7 +2028,6 @@ ACE_OS::sema_trywait (ACE_sema_t *s)
     }
   return result;
 #   elif defined (ACE_HAS_WTHREADS)
-#     if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
   DWORD result = ::WaitForSingleObject (*s, 0);
 
   if (result == WAIT_OBJECT_0)
@@ -2147,41 +2041,6 @@ ACE_OS::sema_trywait (ACE_sema_t *s)
       // This is a hack, we need to find an appropriate mapping...
       return -1;
     }
-#     else /* ACE_USES_WINCE_SEMA_SIMULATION */
-  // Check the status of semaphore first.  Return immediately
-  // if the semaphore is not available and avoid grabing the
-  // lock.
-  DWORD result = ::WaitForSingleObject (s->count_nonzero_, 0);
-
-  if (result == WAIT_OBJECT_0)  // Proceed when it is available.
-    {
-      ACE_OS::thread_mutex_lock (&s->lock_);
-
-      // Need to double check if the semaphore is still available.
-      // The double checking scheme will slightly affect the
-      // efficiency if most of the time semaphores are not blocked.
-      result = ::WaitForSingleObject (s->count_nonzero_, 0);
-      if (result == WAIT_OBJECT_0)
-        {
-          // Adjust the semaphore count.  Only update the event
-          // object status when the state changed.
-          s->count_--;
-          if (s->count_ <= 0)
-            ACE_OS::event_reset (&s->count_nonzero_);
-          result = 0;
-        }
-
-      ACE_OS::thread_mutex_unlock (&s->lock_);
-    }
-
-  // Translate error message to errno used by ACE.
-  if (result == WAIT_TIMEOUT)
-    errno = EBUSY;
-  else
-    ACE_OS::set_errno_to_last_error ();
-  // This is taken from the hack above. ;)
-  return -1;
-#     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 #   elif defined (ACE_VXWORKS)
   if (::semTake (s->sema_, NO_WAIT) == ERROR)
     if (errno == S_objLib_OBJ_UNAVAILABLE)
@@ -2252,7 +2111,6 @@ ACE_OS::sema_wait (ACE_sema_t *s)
   return result < 0 ? -1 : result;
 
 #   elif defined (ACE_HAS_WTHREADS)
-#     if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
   switch (::WaitForSingleObject (*s, INFINITE))
     {
     case WAIT_OBJECT_0:
@@ -2263,46 +2121,6 @@ ACE_OS::sema_wait (ACE_sema_t *s)
       return -1;
     }
   /* NOTREACHED */
-#     else /* ACE_USES_WINCE_SEMA_SIMULATION */
-  // Timed wait.
-  int result = -1;
-  for (;;)
-    // Check if the semaphore is avialable or not and wait forever.
-    // Don't bother to grab the lock if it is not available (to avoid
-    // deadlock.)
-    switch (::WaitForSingleObject (s->count_nonzero_, INFINITE))
-      {
-      case WAIT_OBJECT_0:
-        ACE_OS::thread_mutex_lock (&s->lock_);
-
-        // Need to double check if the semaphore is still available.
-        // This time, we shouldn't wait at all.
-        if (::WaitForSingleObject (s->count_nonzero_, 0) == WAIT_OBJECT_0)
-          {
-            // Decrease the internal counter.  Only update the event
-            // object's status when the state changed.
-            s->count_--;
-            if (s->count_ <= 0)
-              ACE_OS::event_reset (&s->count_nonzero_);
-            result = 0;
-          }
-
-        ACE_OS::thread_mutex_unlock (&s->lock_);
-        // if we didn't get a hold on the semaphore, the result won't
-        // be 0 and thus, we'll start from the beginning again.
-        if (result == 0)
-          return 0;
-        break;
-
-      default:
-        // Since we wait indefinitely, anything other than
-        // WAIT_OBJECT_O indicates an error.
-        ACE_OS::set_errno_to_last_error ();
-        // This is taken from the hack above. ;)
-        return -1;
-      }
-  /* NOTREACHED */
-#     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 #   elif defined (ACE_VXWORKS)
   return ::semTake (s->sema_, WAIT_FOREVER);
 #   endif /* ACE_HAS_STHREADS */
@@ -2455,7 +2273,6 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv)
   ACE_PTHREAD_CLEANUP_POP (0);
   return result < 0 ? -1 : result;
 #   elif defined (ACE_HAS_WTHREADS)
-#     if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
   int msec_timeout;
 
   if (tv == ACE_Time_Value::zero)
@@ -2489,78 +2306,6 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv)
       return -1;
     }
   /* NOTREACHED */
-#     else /* ACE_USES_WINCE_SEMA_SIMULATION */
-  // Note that in this mode, the acquire is done in two steps, and
-  // we may get signaled but cannot grab the semaphore before
-  // timeout.  In that case, we'll need to restart the process with
-  // updated timeout value.
-
-  // tv is an absolute time, but we need relative to work with the Windows
-  // API. Also, some users have become accustomed to using a 0 time value
-  // as a shortcut for "now", which works on non-Windows because 0 is
-  // always earlier than now. However, the need to convert to relative time
-  // means we need to watch out for this case.
-  ACE_Time_Value relative_time (ACE_Time_Value::zero);
-  if (tv != ACE_Time_Value::zero)
-    relative_time = tv.to_relative_time ();
-  int result = -1;
-
-  // While we are not timeout yet. >= 0 will let this go through once
-  // and if not able to get the object, it should hit WAIT_TIMEOUT
-  // right away.
-  while (relative_time >= ACE_Time_Value::zero)
-    {
-      // Wait for our turn to get the object.
-      switch (::WaitForSingleObject (s->count_nonzero_, relative_time.msec ()))
-        {
-        case WAIT_OBJECT_0:
-          ACE_OS::thread_mutex_lock (&s->lock_);
-
-          // Need to double check if the semaphore is still available.
-          // We can only do a "try lock" styled wait here to avoid
-          // blocking threads that want to signal the semaphore.
-          if (::WaitForSingleObject (s->count_nonzero_, 0) == WAIT_OBJECT_0)
-            {
-              // As before, only reset the object when the semaphore
-              // is no longer available.
-              s->count_--;
-              if (s->count_ <= 0)
-                ACE_OS::event_reset (&s->count_nonzero_);
-              result = 0;
-            }
-
-          ACE_OS::thread_mutex_unlock (&s->lock_);
-
-          // Only return when we successfully get the semaphore.
-          if (result == 0)
-            {
-              tv = tv.now ();     // Update to time acquired
-              return 0;
-            }
-          break;
-
-          // We have timed out.
-        case WAIT_TIMEOUT:
-          errno = ETIME;
-          return -1;
-
-          // What?
-        default:
-          ACE_OS::set_errno_to_last_error ();
-          // This is taken from the hack above. ;)
-          return -1;
-        };
-
-      // Haven't been able to get the semaphore yet, update the
-      // timeout value to reflect the remaining time we want to wait.
-      // in case of tv == 0 relative_time will now be < 0 and we will be out of time
-      relative_time = tv.to_relative_time ();
-    }
-
-  // We have timed out.
-  errno = ETIME;
-  return -1;
-#     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 #   elif defined (ACE_VXWORKS)
   // Note that we must convert between absolute time (which is
   // passed as a parameter) and relative time (which is what
@@ -2854,12 +2599,7 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getprio (ht_id, &priority), result), int);
 # elif defined (ACE_HAS_WTHREADS)
   ACE_Errno_Guard error (errno);
-
-#   if defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY)
-  priority = ::CeGetThreadPriority (ht_id);
-#   else
   priority = ::GetThreadPriority (ht_id);
-#   endif /* defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY) */
 
 #   if defined (ACE_HAS_PHARLAP)
 #     if defined (ACE_PHARLAP_LABVIEW_RT)
@@ -2868,14 +2608,12 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy)
   DWORD timeslice = ::EtsGetTimeSlice ();
   policy = timeslice == 0 ? ACE_SCHED_OTHER : ACE_SCHED_FIFO;
 #     endif /* ACE_PHARLAP_LABVIEW_RT */
-#   elif !defined (ACE_HAS_WINCE)
-  DWORD priority_class = ::GetPriorityClass (::GetCurrentProcess ());
+#   else
+  DWORD const priority_class = ::GetPriorityClass (::GetCurrentProcess ());
   if (priority_class == 0 && (error = ::GetLastError ()) != NO_ERROR)
     ACE_FAIL_RETURN (-1);
 
-  policy =
-    (priority_class ==
-     REALTIME_PRIORITY_CLASS) ? ACE_SCHED_FIFO : ACE_SCHED_OTHER;
+  policy = (priority_class == REALTIME_PRIORITY_CLASS) ? ACE_SCHED_FIFO : ACE_SCHED_OTHER;
 #   endif /* ACE_HAS_PHARLAP */
 
   return 0;
@@ -3401,17 +3139,9 @@ ACE_OS::thr_setprio (ACE_hthread_t ht_id, int priority, int policy)
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setprio (ht_id, priority), result), int);
 # elif defined (ACE_HAS_WTHREADS)
-
-#   if defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY)
-  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CeSetThreadPriority (ht_id, priority),
-                                          ace_result_),
-                        int, -1);
-#   else
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::SetThreadPriority (ht_id, priority),
                                           ace_result_),
                         int, -1);
-#   endif /* defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY) */
-
 # elif defined (ACE_HAS_VXTHREADS)
   ACE_OSCALL_RETURN (::taskPrioritySet (ht_id, priority), int);
 # else
diff --git a/ACE/ace/OS_NS_dlfcn.inl b/ACE/ace/OS_NS_dlfcn.inl
index 840ef48e1bb..93f09f91229 100644
--- a/ACE/ace/OS_NS_dlfcn.inl
+++ b/ACE/ace/OS_NS_dlfcn.inl
@@ -182,25 +182,14 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle,
     return nullptr;
 
   // Get the correct OS type.
-#if defined (ACE_HAS_WINCE)
-  // CE (at least thru Pocket PC 2003) offers GetProcAddressW, not ...A, so
-  // we always need a wide-char string.
-  const wchar_t *symbolname = 0;
-#  if defined (ACE_USES_WCHAR)
-  symbolname = sname;
-#  else
-  ACE_Ascii_To_Wide sname_xlate (sname);
-  symbolname = sname_xlate.wchar_rep ();
-#  endif /* ACE_USES_WCHAR */
-#elif defined (ACE_USES_WCHAR)
-  // WinCE is WCHAR always; other platforms need a char * symbol name
+#if defined (ACE_USES_WCHAR)
   ACE_Wide_To_Ascii w_sname (sname);
   char *symbolname = w_sname.char_rep ();
 #elif defined (ACE_VXWORKS)
   char *symbolname = const_cast<char *> (sname);
 #else
   const char *symbolname = sname;
-#endif /* ACE_HAS_WINCE */
+#endif /* ACE_USES_WCHAR */
 
 # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
 
diff --git a/ACE/ace/OS_NS_errno.h b/ACE/ace/OS_NS_errno.h
index d953d61552a..eedece4661d 100644
--- a/ACE/ace/OS_NS_errno.h
+++ b/ACE/ace/OS_NS_errno.h
@@ -50,44 +50,10 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
-#if defined (ACE_HAS_WINCE_BROKEN_ERRNO)
-/**
- * @class ACE_CE_Errno
- *
- * Some versions of CE don't support @c errno and some versions'
- * implementations are busted.  So we implement our own.
- * Our implementation takes up one Tls key, however, it does not
- * allocate memory from the heap so there's no problem with cleaning
- * up the errno when a thread exit.
- */
-class ACE_Export ACE_CE_Errno
-{
-public:
-  ACE_CE_Errno () = default;
-  static void init ();
-  static void fini ();
-  static ACE_CE_Errno *instance ();
-
-  operator int () const;
-  int operator= (int);
-
-private:
-  static ACE_CE_Errno *instance_;
-  static DWORD errno_key_;
-};
-
-# define errno (* (ACE_CE_Errno::instance ()))
-#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */
-
-#if defined (ACE_HAS_WINCE_BROKEN_ERRNO)
-#  define ACE_ERRNO_TYPE ACE_CE_Errno
-#  define ACE_ERRNO_GET ACE_CE_Errno::instance ()->operator int()
-#else
-#  if !defined (ACE_ERRNO_TYPE)
-#   define ACE_ERRNO_TYPE int
-#  endif  /* !ACE_ERRNO_TYPE */
-#  define ACE_ERRNO_GET errno
-#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */
+#if !defined (ACE_ERRNO_TYPE)
+# define ACE_ERRNO_TYPE int
+#endif  /* !ACE_ERRNO_TYPE */
+#define ACE_ERRNO_GET errno
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/ACE/ace/OS_NS_errno.inl b/ACE/ace/OS_NS_errno.inl
index 9dcbe998360..d77546fe3f9 100644
--- a/ACE/ace/OS_NS_errno.inl
+++ b/ACE/ace/OS_NS_errno.inl
@@ -52,29 +52,4 @@ ACE_OS::set_errno_to_wsa_last_error ()
 # endif /* defined(ACE_WIN32) */
 }
 
-#if defined (ACE_HAS_WINCE_BROKEN_ERRNO)
-
-ACE_INLINE ACE_CE_Errno *
-ACE_CE_Errno::instance ()
-{
-  // This should be inlined.
-  return ACE_CE_Errno::instance_;
-}
-
-ACE_INLINE
-ACE_CE_Errno::operator int () const
-{
-  return (int) TlsGetValue (ACE_CE_Errno::errno_key_);
-}
-
-ACE_INLINE int
-ACE_CE_Errno::operator= (int x)
-{
-  // error checking?
-  TlsSetValue (ACE_CE_Errno::errno_key_, (void *) x);
-  return x;
-}
-
-#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */
-
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_NS_fcntl.cpp b/ACE/ace/OS_NS_fcntl.cpp
index f462b0d75dd..ab6bd35fef2 100644
--- a/ACE/ace/OS_NS_fcntl.cpp
+++ b/ACE/ace/OS_NS_fcntl.cpp
@@ -76,16 +76,6 @@ ACE_OS::open (const char *filename,
   SECURITY_ATTRIBUTES sa_buffer;
   SECURITY_DESCRIPTOR sd_buffer;
 
-#if defined (ACE_HAS_WINCE)
-  ACE_HANDLE h = ::CreateFileW (ACE_Ascii_To_Wide (filename).wchar_rep (),
-                                access,
-                                shared_mode,
-                                ACE_OS::default_win32_security_attributes_r
-                                  (sa, &sa_buffer, &sd_buffer),
-                                creation,
-                                flags,
-                                0);
-#else /* ACE_HAS_WINCE */
   ACE_HANDLE h = ::CreateFileA (filename,
                                 access,
                                 shared_mode,
@@ -94,7 +84,6 @@ ACE_OS::open (const char *filename,
                                 creation,
                                 flags,
                                 0);
-#endif /* ACE_HAS_WINCE */
 
   if (ACE_BIT_ENABLED (mode, _O_APPEND))
     {
diff --git a/ACE/ace/OS_NS_math.h b/ACE/ace/OS_NS_math.h
index de6d2e1516c..ede8de33bd1 100644
--- a/ACE/ace/OS_NS_math.h
+++ b/ACE/ace/OS_NS_math.h
@@ -91,16 +91,6 @@ namespace ACE_OS
     return std::floor (x);
   }
 
-#if defined (ACE_HAS_WINCE)
-  /// Windows CE has an intrinsic floor for float
-  template <>
-  inline
-  float floor (float x)
-  {
-    return std::floorf (x);
-  }
-#endif
-
   /// This method computes the smallest integral value not less than x.
   template <typename T>
   inline
@@ -109,16 +99,6 @@ namespace ACE_OS
     return std::ceil (x);
   }
 
-#if defined (ACE_HAS_WINCE)
-  /// Windows CE has an intrinsic ceil for float
-  template <>
-  inline
-  float ceil (float x)
-  {
-    return std::ceilf (x);
-  }
-#endif
-
   /// This method computes the base-2 logarithm of x.
   ACE_NAMESPACE_INLINE_FUNCTION
   double log2 (double x);
diff --git a/ACE/ace/OS_NS_netdb.cpp b/ACE/ace/OS_NS_netdb.cpp
index e60ac8a418e..2af9006fb5f 100644
--- a/ACE/ace/OS_NS_netdb.cpp
+++ b/ACE/ace/OS_NS_netdb.cpp
@@ -49,7 +49,7 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node)
 {
   ACE_OS_TRACE ("ACE_OS::getmacaddress");
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32)
 # if !defined (ACE_HAS_PHARLAP)
     /** Define a structure for use with the netbios routine */
     struct ADAPTERSTAT
diff --git a/ACE/ace/OS_NS_signal.inl b/ACE/ace/OS_NS_signal.inl
index 4f40510368c..5211a0730e2 100644
--- a/ACE/ace/OS_NS_signal.inl
+++ b/ACE/ace/OS_NS_signal.inl
@@ -56,7 +56,7 @@ sigaction (int signum, const ACE_SIGACTION *nsa, ACE_SIGACTION *osa)
   ACE_OS_TRACE ("ACE_OS::sigaction");
   if (signum == 0)
     return 0;
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32)
   struct sigaction sa;
 
   if (osa == 0)
@@ -78,7 +78,7 @@ sigaction (int signum, const ACE_SIGACTION *nsa, ACE_SIGACTION *osa)
   return ::sigaction (signum, const_cast<ACE_SIGACTION*> (nsa), osa);
 #else
   return ::sigaction (signum, nsa, osa);
-#endif /* ACE_WIN32 !ACE_HAS_WINCE */
+#endif /* ACE_WIN32 */
 }
 
 ACE_INLINE int
@@ -190,15 +190,14 @@ signal (int signum, ACE_SignalHandler func)
     return 0;
   else
     {
-#if (defined ACE_WIN32 && !defined ACE_HAS_WINCE) || \
+#if (defined ACE_WIN32) || \
     (!defined ACE_LACKS_UNIX_SIGNALS && !defined ACE_LACKS_SIGNAL)
       return ::signal (signum, func);
 #else
-      // @@ WINCE: Don't know how to implement signal on WinCE (yet.)
       ACE_UNUSED_ARG (signum);
       ACE_UNUSED_ARG (func);
-      ACE_NOTSUP_RETURN (0);     // Should return SIG_ERR but it is not defined on WinCE.
-#endif /* defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) || !defined (ACE_LACKS_UNIX_SIGNALS) */
+      ACE_NOTSUP_RETURN (0);     // Should return SIG_ERR but maybe not defined on all platforms
+#endif /* defined (ACE_WIN32) || !defined (ACE_LACKS_UNIX_SIGNALS) */
     }
 }
 
diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp
index 1b271b703fc..76db871d18d 100644
--- a/ACE/ace/OS_NS_stdio.cpp
+++ b/ACE/ace/OS_NS_stdio.cpp
@@ -26,7 +26,7 @@ ACE_TEXT_OSVERSIONINFO ACE_OS::win32_versioninfo_;
 HINSTANCE ACE_OS::win32_resource_module_;
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#   if defined (ACE_HAS_DLL) && (ACE_HAS_DLL == 1) && !defined (ACE_HAS_WINCE)
+#   if defined (ACE_HAS_DLL) && (ACE_HAS_DLL == 1)
 // This function is called by the OS when the ACE DLL is loaded. We
 // use it to determine the default module containing ACE's resources.
 extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID)
@@ -86,7 +86,7 @@ ace_flock_t::dump () const
 /*****************************************************************************/
 
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32)
 namespace
 {
   /// Translate fopen's mode char to open's mode.  This helper function
diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h
index 3a4e6bdf91c..d1e01ee4a56 100644
--- a/ACE/ace/OS_NS_stdio.h
+++ b/ACE/ace/OS_NS_stdio.h
@@ -32,7 +32,7 @@
 #  include "ace/os_include/os_unistd.h"
 #endif /* CYGWIN32 || ACE_OPENVMS */
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32)
 # include "io.h"
 #endif
 
@@ -299,7 +299,7 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   ACE_HANDLE fileno (FILE *stream);
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32)
   extern ACE_Export
 #else
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -307,19 +307,19 @@ namespace ACE_OS {
   FILE *fopen (const char *filename, const char *mode);
 
 #if defined (ACE_HAS_WCHAR)
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32)
   extern ACE_Export
 #else
   ACE_NAMESPACE_INLINE_FUNCTION
 #endif /* ACE_WIN32 */
   FILE *fopen (const char *filename, const wchar_t *mode);
-#  if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#  if defined (ACE_WIN32)
   extern ACE_Export
 #  else
   ACE_NAMESPACE_INLINE_FUNCTION
 #  endif /* ACE_WIN32 */
   FILE *fopen (const wchar_t *filename, const wchar_t *mode);
-#  if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#  if defined (ACE_WIN32)
   extern ACE_Export
 #  else
   ACE_NAMESPACE_INLINE_FUNCTION
diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl
index b97adfdbbc9..ac5f568abdf 100644
--- a/ACE/ace/OS_NS_stdio.inl
+++ b/ACE/ace/OS_NS_stdio.inl
@@ -364,7 +364,7 @@ ACE_OS::cuserid (char *user, size_t maxlen)
       ::remCurIdGet (user, 0);
       return user;
     }
-#elif defined (ACE_HAS_PHARLAP) || defined (ACE_HAS_WINCE)
+#elif defined (ACE_HAS_PHARLAP)
   ACE_UNUSED_ARG (user);
   ACE_UNUSED_ARG (maxlen);
   ACE_NOTSUP_RETURN (0);
@@ -458,11 +458,7 @@ ACE_OS::cuserid (char *user, size_t maxlen)
 ACE_INLINE wchar_t *
 ACE_OS::cuserid (wchar_t *user, size_t maxlen)
 {
-# if defined (ACE_HAS_WINCE)
-  ACE_UNUSED_ARG (user);
-  ACE_UNUSED_ARG (maxlen);
-  ACE_NOTSUP_RETURN (0);
-# elif defined (ACE_WIN32)
+# if defined (ACE_WIN32)
   BOOL const result = GetUserNameW (user, (u_long *) &maxlen);
   if (result == FALSE)
     ACE_FAIL_RETURN (0);
@@ -499,13 +495,7 @@ ACE_INLINE FILE *
 ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode)
 {
   ACE_OS_TRACE ("ACE_OS::fdopen");
-#if defined (ACE_HAS_WINCE)
-# if defined (ACE_HAS_NONCONST_WFDOPEN)
-  return ::_wfdopen ((int)handle, const_cast <ACE_TCHAR*> (ACE_TEXT_ALWAYS_WCHAR (mode)));
-# else
-  return ::_wfdopen (handle, ACE_TEXT_ALWAYS_WCHAR (mode));
-# endif
-#elif defined (ACE_WIN32)
+#if defined (ACE_WIN32)
   // kernel file handle -> FILE* conversion...
   // Options: _O_APPEND, _O_RDONLY and _O_TEXT are lost
 
@@ -534,7 +524,7 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode)
   ACE_NOTSUP_RETURN (0);
 #else
   return ::fdopen (handle, ACE_TEXT_ALWAYS_CHAR (mode));
-#endif /* ACE_HAS_WINCE */
+#endif /* ACE_WIN32 */
 }
 
 ACE_INLINE int
@@ -612,7 +602,7 @@ ACE_OS::fileno (FILE *stream)
 #endif
 }
 
-#if !(defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if !defined (ACE_WIN32)
 // Win32 PC implementation of fopen () is in OS_NS_stdio.cpp.
 ACE_INLINE FILE *
 ACE_OS::fopen (const char *filename, const char *mode)
@@ -636,28 +626,20 @@ ACE_INLINE FILE *
 ACE_OS::fopen (const wchar_t *filename, const wchar_t *mode)
 {
   ACE_OS_TRACE ("ACE_OS::fopen");
-#if defined (ACE_HAS_WINCE)
-  return ::_wfopen (filename, mode);
-#else
   // Non-Windows doesn't use wchar_t file systems.
   ACE_Wide_To_Ascii n_filename (filename);
   ACE_Wide_To_Ascii n_mode (mode);
   return ::fopen (n_filename.char_rep (), n_mode.char_rep ());
-#endif /* ACE_HAS_WINCE */
 }
+
 // Win32 PC implementation of fopen () is in OS_NS_stdio.cpp.
 ACE_INLINE FILE *
 ACE_OS::fopen (const wchar_t *filename, const char *mode)
 {
   ACE_OS_TRACE ("ACE_OS::fopen");
-#if defined (ACE_HAS_WINCE)
-  ACE_Ascii_To_Wide n_mode (mode);
-  return ::_wfopen (filename, n_mode.wchar_rep ());
-#else
   // Non-Windows doesn't use wchar_t file systems.
   ACE_Wide_To_Ascii n_filename (filename);
   return ::fopen (n_filename.char_rep (), mode);
-#endif /* ACE_HAS_WINCE */
 }
 #endif /* ACE_HAS_WCHAR */
 
@@ -803,7 +785,7 @@ ACE_OS::perror (const char *s)
   ACE_UNUSED_ARG (s);
 #else
   ::perror (s);
-#endif /* ACE_HAS_WINCE */
+#endif /* ACE_LACKS_PERROR */
 }
 
 #if defined (ACE_HAS_WCHAR)
@@ -859,13 +841,6 @@ ACE_OS::rename (const char *old_name,
   ACE_UNUSED_ARG (new_name);
   ACE_UNUSED_ARG (flags);
   ACE_NOTSUP_RETURN (-1);
-# elif defined (ACE_HAS_WINCE)
-  // Win CE is always wide-char.
-  ACE_UNUSED_ARG (flags);
-  if (0 == ::MoveFile (ACE_TEXT_CHAR_TO_TCHAR (old_name),
-                       ACE_TEXT_CHAR_TO_TCHAR (new_name)))
-    ACE_FAIL_RETURN (-1);
-  return 0;
 # elif defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_MOVEFILEEX)
   // NT4 (and up) provides a way to rename/move a file with similar semantics
   // to what's usually done on UNIX - if there's an existing file with
@@ -881,7 +856,7 @@ ACE_OS::rename (const char *old_name,
 # else
   ACE_UNUSED_ARG (flags);
   return ::rename (old_name, new_name);
-# endif /* ACE_HAS_WINCE */
+# endif /* ACE_LACKS_RENAME */
 }
 
 #if defined (ACE_HAS_WCHAR)
@@ -895,11 +870,6 @@ ACE_OS::rename (const wchar_t *old_name,
   ACE_UNUSED_ARG (new_name);
   ACE_UNUSED_ARG (flags);
   ACE_NOTSUP_RETURN (-1);
-# elif defined (ACE_HAS_WINCE)
-  ACE_UNUSED_ARG (flags);
-  if (::MoveFileW (old_name, new_name) == 0)
-    ACE_FAIL_RETURN (-1);
-  return 0;
 # elif defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_MOVEFILEEX)
   // NT4 (and up) provides a way to rename/move a file with similar semantics
   // to what's usually done on UNIX - if there's an existing file with
@@ -917,14 +887,14 @@ ACE_OS::rename (const wchar_t *old_name,
   ACE_Wide_To_Ascii nold_name (old_name);
   ACE_Wide_To_Ascii nnew_name (new_name);
   return ACE_OS::rename (nold_name.char_rep (), nnew_name.char_rep (), flags);
-# endif /* ACE_HAS_WINCE */
+# endif /* ACE_LACKS_RENAME */
 }
 #endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE void
 ACE_OS::rewind (FILE *fp)
 {
-#if !defined (ACE_HAS_WINCE) && !defined (ACE_MQX)
+#if !defined (ACE_MQX)
   ACE_OS_TRACE ("ACE_OS::rewind");
 # if defined (ACE_LACKS_REWIND)
   ACE_UNUSED_ARG (fp);
@@ -933,9 +903,9 @@ ACE_OS::rewind (FILE *fp)
 # endif /* ACE_LACKS_REWIND */
 #else
   // This isn't perfect since it doesn't reset EOF, but it's probably
-  // the closest we can get on WINCE.
+  // the closest we can get on MQX.
   (void) std::fseek (fp, 0L, SEEK_SET);
-#endif /* ACE_HAS_WINCE */
+#endif /* !ACE_MQX */
 }
 
 #if !defined (ACE_DISABLE_TEMPNAM)
@@ -1100,7 +1070,7 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr)
 # if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \
      (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \
       defined (ACE_HAS_VSWPRINTF) || \
-      (defined (_MSC_VER) && !defined (ACE_HAS_WINCE))
+      (defined (_MSC_VER))
 
   // The XPG4/UNIX98/C99 signature of the wide-char sprintf has a
   // maxlen argument. Since this method doesn't supply one, pass in
diff --git a/ACE/ace/OS_NS_stdlib.cpp b/ACE/ace/OS_NS_stdlib.cpp
index ad6ed536954..1bef126ab39 100644
--- a/ACE/ace/OS_NS_stdlib.cpp
+++ b/ACE/ace/OS_NS_stdlib.cpp
@@ -37,13 +37,7 @@ ACE_EXIT_HOOK ACE_OS::exit_hook_ = 0;
 void *
 ACE_OS::calloc (size_t elements, size_t sizeof_elements)
 {
-#if !defined (ACE_HAS_WINCE)
   return ACE_CALLOC_FUNC (elements, sizeof_elements);
-#else
-  // @@ This will probably not work since it doesn't consider
-  // alignment properly.
-  return ACE_MALLOC_FUNC (elements * sizeof_elements);
-#endif /* ACE_HAS_WINCE */
 }
 
 void
@@ -51,13 +45,13 @@ ACE_OS::exit (int status)
 {
   ACE_OS_TRACE ("ACE_OS::exit");
 
-#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_HAS_WINCE) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER)
+#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER)
   // Shut down the ACE_Object_Manager, if it had registered its exit_hook.
   // With ACE_HAS_NONSTATIC_OBJECT_MANAGER, the ACE_Object_Manager is
   // instantiated on the main's stack.  ::exit () doesn't destroy it.
   if (exit_hook_)
     (*exit_hook_) ();
-#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
+#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
 
 #if defined (ACE_WIN32)
   ::ExitProcess ((UINT) status);
@@ -90,9 +84,7 @@ ACE_OS::free (void *ptr)
 ACE_TCHAR *
 ACE_OS::getenvstrings ()
 {
-#if defined (ACE_LACKS_GETENVSTRINGS)
-  ACE_NOTSUP_RETURN (0);
-#elif defined (ACE_WIN32)
+#if defined (ACE_WIN32)
 # if defined (ACE_USES_WCHAR)
   return ::GetEnvironmentStringsW ();
 # else /* ACE_USES_WCHAR */
@@ -110,13 +102,6 @@ ACE_OS::getenvstrings ()
 ACE_TCHAR *
 ACE_OS::strenvdup (const ACE_TCHAR *str)
 {
-#if defined (ACE_HAS_WINCE)
-  // WinCE doesn't have environment variables so we just skip it.
-  return ACE_OS::strdup (str);
-#elif defined (ACE_LACKS_STRENVDUP)
-  ACE_UNUSED_ARG (str);
-  ACE_NOTSUP_RETURN (0);
-#else
   const ACE_TCHAR * start = 0;
   if ((start = ACE_OS::strchr (str, ACE_TEXT ('$'))) != 0)
     {
@@ -170,7 +155,6 @@ ACE_OS::strenvdup (const ACE_TCHAR *str)
     }
   else
     return ACE_OS::strdup (str);
-#endif /* ACE_HAS_WINCE */
 }
 
 #if !defined (ACE_HAS_ITOA)
diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl
index b76ee71c5bd..19ef547d013 100644
--- a/ACE/ace/OS_NS_stdlib.inl
+++ b/ACE/ace/OS_NS_stdlib.inl
@@ -19,8 +19,6 @@ ACE_OS::_exit (int status)
   ACE_OS_TRACE ("ACE_OS::_exit");
 #if defined (ACE_VXWORKS)
   ::exit (status);
-#elif defined (ACE_HAS_WINCE)
-  ::TerminateProcess (::GetCurrentProcess (), status);
 #elif defined (ACE_MQX)
   _mqx_exit (status);
 #elif !defined (ACE_LACKS__EXIT)
@@ -336,7 +334,7 @@ ACE_OS::putenv (const char *string)
   ACE_NOTSUP_RETURN (0);
 #elif defined (ACE_PUTENV_EQUIVALENT)
   return ACE_PUTENV_EQUIVALENT (const_cast <char *> (string));
-#else /* ! ACE_HAS_WINCE */
+#else
   return ACE_STD_NAMESPACE::putenv (const_cast <char *> (string));
 #endif /* ACE_LACKS_PUTENV && ACE_HAS_SETENV */
 }
@@ -430,7 +428,7 @@ ACE_OS::rand_r (unsigned int *seed)
 # endif /* ACE_LACKS_RAND_R */
 }
 
-#  if !defined (ACE_LACKS_REALPATH)
+#if !defined (ACE_LACKS_REALPATH)
 ACE_INLINE char *
 ACE_OS::realpath (const char *file_name,
                   char *resolved_name)
@@ -462,7 +460,7 @@ ACE_OS::realpath (const wchar_t *file_name,
 #    endif /* ! ACE_WIN32 */
 }
 #  endif /* ACE_HAS_WCHAR */
-#endif /* ACE_HAS_WINCE */
+#endif /* !ACE_LACKS_REALPATH */
 
 ACE_INLINE ACE_EXIT_HOOK
 ACE_OS::set_exit_hook (ACE_EXIT_HOOK exit_hook)
diff --git a/ACE/ace/OS_NS_sys_mman.inl b/ACE/ace/OS_NS_sys_mman.inl
index 905b0b5e08a..1cc6bac8dd9 100644
--- a/ACE/ace/OS_NS_sys_mman.inl
+++ b/ACE/ace/OS_NS_sys_mman.inl
@@ -45,15 +45,6 @@ ACE_OS::mmap (void *addr,
 #endif /* !defined (ACE_WIN32) || defined (ACE_HAS_PHARLAP) */
 
 #if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
-
-#  if defined(ACE_HAS_WINCE)
-  ACE_UNUSED_ARG (addr);
-  if (ACE_BIT_ENABLED (flags, MAP_FIXED))     // not supported
-  {
-    errno = EINVAL;
-    return MAP_FAILED;
-  }
-#  else
   if (!ACE_BIT_ENABLED (flags, MAP_FIXED))
     addr = 0;
   else if (addr == 0)   // can not map to address 0
@@ -61,7 +52,6 @@ ACE_OS::mmap (void *addr,
     errno = EINVAL;
     return MAP_FAILED;
   }
-#  endif
 
   int nt_flags = 0;
   ACE_HANDLE local_handle = ACE_INVALID_HANDLE;
@@ -72,14 +62,8 @@ ACE_OS::mmap (void *addr,
 
   if (ACE_BIT_ENABLED (flags, MAP_PRIVATE))
     {
-#  if defined(ACE_HAS_WINCE)
-      // PAGE_WRITECOPY is not avaible on CE, but this should be the same
-      // as PAGE_READONLY according to MSDN
-      nt_flags = FILE_MAP_ALL_ACCESS;
-#  else
       prot = PAGE_WRITECOPY;
       nt_flags = FILE_MAP_COPY;
-#  endif  // ACE_HAS_WINCE
     }
   else if (ACE_BIT_ENABLED (flags, MAP_SHARED))
     {
@@ -124,20 +108,12 @@ ACE_OS::mmap (void *addr,
   DWORD low_off  = ACE_LOW_PART (off);
   DWORD high_off = ACE_HIGH_PART (off);
 
-#  if defined (ACE_HAS_WINCE)
-  void *addr_mapping = ::MapViewOfFile (*file_mapping,
-                                        nt_flags,
-                                        high_off,
-                                        low_off,
-                                        len);
-#  else
   void *addr_mapping = ::MapViewOfFileEx (*file_mapping,
                                           nt_flags,
                                           high_off,
                                           low_off,
                                           len,
                                           addr);
-#  endif /* ACE_HAS_WINCE */
 
   // Only close this down if we used the temporary.
   if (file_mapping == &local_handle)
diff --git a/ACE/ace/OS_NS_sys_resource.inl b/ACE/ace/OS_NS_sys_resource.inl
index dad59017602..ede0171928b 100644
--- a/ACE/ace/OS_NS_sys_resource.inl
+++ b/ACE/ace/OS_NS_sys_resource.inl
@@ -31,11 +31,6 @@ ACE_OS::getrusage (int who, struct rusage *ru)
 #if defined (ACE_HAS_GETRUSAGE)
 # if defined (ACE_WIN32)
   ACE_UNUSED_ARG (who);
-
-#  if defined (ACE_LACKS_GETPROCESSTIMES)
-  ACE_UNUSED_ARG (ru);
-  ACE_NOTSUP_RETURN (-1);
-#  else
   FILETIME dummy_1;
   FILETIME dummy_2;
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::GetProcessTimes (::GetCurrentProcess(),
@@ -45,7 +40,6 @@ ACE_OS::getrusage (int who, struct rusage *ru)
                                                              &ru->ru_utime),
                                           ace_result_),
                         int, -1);
-#  endif /* ACE_LACKS_WIN32_GETPROCESSTIMES */
 # else
 #   if defined (ACE_HAS_RUSAGE_WHO_ENUM)
   return ::getrusage ((ACE_HAS_RUSAGE_WHO_ENUM) who, ru);
diff --git a/ACE/ace/OS_NS_sys_socket.cpp b/ACE/ace/OS_NS_sys_socket.cpp
index e7a6a0647bb..0661b44b2b5 100644
--- a/ACE/ace/OS_NS_sys_socket.cpp
+++ b/ACE/ace/OS_NS_sys_socket.cpp
@@ -104,19 +104,12 @@ ACE_OS::socket_init (int version_high, int version_low)
       int error = WSAStartup (version_requested, &wsa_data);
 
       if (error != 0)
-#   if defined (ACE_HAS_WINCE)
         {
-          ACE_TCHAR fmt[] = ACE_TEXT ("%s failed, WSAGetLastError returned %d");
-          ACE_TCHAR buf[80];  // @@ Eliminate magic number.
-          ACE_OS::snprintf (buf, 80, fmt, ACE_TEXT ("WSAStartup %d"), error);
-          ::MessageBox (0, buf, ACE_TEXT ("WSAStartup failed!"), MB_OK);
+          ACE_OS::fprintf (stderr,
+                          "ACE_OS::socket_init; WSAStartup failed, "
+                            "WSAGetLastError returned %d\n",
+                          error);
         }
-#   else
-      ACE_OS::fprintf (stderr,
-                       "ACE_OS::socket_init; WSAStartup failed, "
-                         "WSAGetLastError returned %d\n",
-                       error);
-#   endif /* ACE_HAS_WINCE */
 
       ACE_OS::socket_initialized_ = 1;
     }
@@ -136,17 +129,10 @@ ACE_OS::socket_fini ()
       if (WSACleanup () != 0)
         {
           int error = ::WSAGetLastError ();
-#   if defined (ACE_HAS_WINCE)
-          ACE_TCHAR fmt[] = ACE_TEXT ("%s failed, WSAGetLastError returned %d");
-          ACE_TCHAR buf[80];  // @@ Eliminate magic number.
-          ACE_OS::snprintf (buf, 80, fmt, ACE_TEXT ("WSACleanup %d"), error);
-          ::MessageBox (0, buf , ACE_TEXT ("WSACleanup failed!"), MB_OK);
-#   else
           ACE_OS::fprintf (stderr,
                            "ACE_OS::socket_fini; WSACleanup failed, "
                              "WSAGetLastError returned %d\n",
                            error);
-#   endif /* ACE_HAS_WINCE */
         }
       ACE_OS::socket_initialized_ = 0;
     }
diff --git a/ACE/ace/OS_NS_sys_stat.h b/ACE/ace/OS_NS_sys_stat.h
index 77296ab106b..3891f716b26 100644
--- a/ACE/ace/OS_NS_sys_stat.h
+++ b/ACE/ace/OS_NS_sys_stat.h
@@ -37,7 +37,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef struct stati64 ACE_stat;
 #       define ACE_STAT_FUNC_NAME ::_stati64
 #       define ACE_WSTAT_FUNC_NAME ::_wstati64
-#   elif !defined (ACE_HAS_WINCE) && defined (_MSC_VER)
+#   elif defined (_MSC_VER)
 typedef struct _stat64 ACE_stat;
 #       define ACE_STAT_FUNC_NAME ::_stat64
 #       define ACE_WSTAT_FUNC_NAME ::_wstat64
@@ -52,7 +52,7 @@ typedef struct stat ACE_stat;
 #   endif  /**/
 # else
 //  Default file offset case.
-#   if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#   if defined (ACE_WIN32)
 typedef struct _stat ACE_stat;
 #     define ACE_STAT_FUNC_NAME ::_stat
 #     define ACE_WSTAT_FUNC_NAME ::_wstat
diff --git a/ACE/ace/OS_NS_sys_stat.inl b/ACE/ace/OS_NS_sys_stat.inl
index b8f7c9fc829..de6c16fcc76 100644
--- a/ACE/ace/OS_NS_sys_stat.inl
+++ b/ACE/ace/OS_NS_sys_stat.inl
@@ -153,12 +153,7 @@ namespace ACE_OS
   ACE_INLINE int
   mkdir (const char *path, mode_t mode)
   {
-#if defined (ACE_HAS_WINCE)
-    ACE_UNUSED_ARG (mode);
-    ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CreateDirectory (ACE_TEXT_CHAR_TO_TCHAR (path), 0),
-                                            ace_result_),
-                          int, -1);
-#elif defined (ACE_MKDIR_LACKS_MODE)
+#if defined (ACE_MKDIR_LACKS_MODE)
     ACE_UNUSED_ARG (mode);
 #  if defined (ACE_MKDIR_EQUIVALENT)
     return ACE_MKDIR_EQUIVALENT (path);
@@ -175,17 +170,12 @@ namespace ACE_OS
   ACE_INLINE int
   mkdir (const wchar_t *path, mode_t mode)
   {
-#if defined (ACE_HAS_WINCE)
-    ACE_UNUSED_ARG (mode);
-    ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (CreateDirectoryW (path, 0),
-                                            ace_result_),
-                          int, -1);
-#elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
+#if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
     ACE_UNUSED_ARG (mode);
     return ::_wmkdir (path);
 #else
     return ACE_OS::mkdir (ACE_Wide_To_Ascii (path).char_rep (), mode);
-#endif /* ACE_HAS_WINCE */
+#endif /* ACE_WIN32 && ACE_USES_WCHAR */
   }
 
 #endif /* ACE_HAS_WCHAR */
@@ -211,32 +201,6 @@ namespace ACE_OS
     return ::stat (const_cast <char *> (file), stp);
 #elif defined (ACE_LACKS_STAT)
     ACE_NOTSUP_RETURN (-1);
-#elif defined (ACE_HAS_WINCE)
-    ACE_TEXT_WIN32_FIND_DATA fdata;
-
-    int rc = 0;
-    HANDLE const fhandle = ::FindFirstFile (ACE_TEXT_CHAR_TO_TCHAR (file), &fdata);
-    if (fhandle == INVALID_HANDLE_VALUE)
-      {
-        ACE_OS::set_errno_to_last_error ();
-        return -1;
-      }
-    else if (fdata.nFileSizeHigh != 0)
-      {
-        errno = EINVAL;
-        rc = -1;
-      }
-    else
-      {
-        stp->st_mode = static_cast<mode_t>(fdata.dwFileAttributes);
-        stp->st_size = fdata.nFileSizeLow;
-        stp->st_atime = ACE_Time_Value (fdata.ftLastAccessTime).sec ();
-        stp->st_mtime = ACE_Time_Value (fdata.ftLastWriteTime).sec ();
-        stp->st_ctime = ACE_Time_Value (fdata.ftCreationTime).sec ();
-      }
-
-    ::FindClose (fhandle);
-    return rc;
 #elif defined (ACE_HAS_X86_STAT_MACROS)
     // Solaris for intel uses an macro for stat(), this macro is a
     // wrapper for _xstat().
@@ -253,40 +217,14 @@ namespace ACE_OS
   stat (const wchar_t *file, ACE_stat *stp)
   {
     ACE_OS_TRACE ("ACE_OS::stat");
-#if defined (ACE_HAS_WINCE)
-    WIN32_FIND_DATAW fdata;
-
-    int rc = 0;
-    HANDLE const fhandle = ::FindFirstFileW (file, &fdata);
-    if (fhandle == INVALID_HANDLE_VALUE)
-      {
-        ACE_OS::set_errno_to_last_error ();
-        return -1;
-      }
-    else if (fdata.nFileSizeHigh != 0)
-      {
-        errno = EINVAL;
-        rc = -1;
-      }
-    else
-      {
-        stp->st_mode = static_cast<mode_t>(fdata.dwFileAttributes);
-        stp->st_size = fdata.nFileSizeLow;
-        stp->st_atime = ACE_Time_Value (fdata.ftLastAccessTime).sec ();
-        stp->st_mtime = ACE_Time_Value (fdata.ftLastWriteTime).sec ();
-        stp->st_ctime = ACE_Time_Value (fdata.ftCreationTime).sec ();
-      }
-
-    ::FindClose (fhandle);
-    return rc;
-#elif defined (__BORLANDC__) \
-      || defined (_MSC_VER) \
-      || (defined (__MINGW32__) && !defined (__MINGW64_VERSION_MAJOR))
+#if defined (__BORLANDC__) \
+    || defined (_MSC_VER) \
+    || (defined (__MINGW32__) && !defined (__MINGW64_VERSION_MAJOR))
     return ACE_WSTAT_FUNC_NAME (file, stp);
-#else /* ACE_HAS_WINCE */
+#else
     ACE_Wide_To_Ascii nfile (file);
     return ACE_OS::stat (nfile.char_rep (), stp);
-#endif /* ACE_HAS_WINCE */
+#endif /* __BORLANDC__  */
   }
 #endif /* ACE_HAS_WCHAR */
 
diff --git a/ACE/ace/OS_NS_sys_time.inl b/ACE/ace/OS_NS_sys_time.inl
index ba9ec109a7b..2f7c6b59ac1 100644
--- a/ACE/ace/OS_NS_sys_time.inl
+++ b/ACE/ace/OS_NS_sys_time.inl
@@ -26,13 +26,6 @@ ACE_OS::gettimeofday ()
     }
 
   return ACE_Time_Value (ts);
-
-#elif defined (ACE_WIN32) && defined (ACE_LACKS_GETSYSTEMTIMEASFILETIME)
-  SYSTEMTIME tsys;
-  FILETIME   tfile;
-  ::GetSystemTime (&tsys);
-  ::SystemTimeToFileTime (&tsys, &tfile);
-  return ACE_Time_Value (tfile);
 #elif defined (ACE_WIN32)
   FILETIME   tfile;
   ::GetSystemTimeAsFileTime (&tfile);
diff --git a/ACE/ace/OS_NS_sys_utsname.cpp b/ACE/ace/OS_NS_sys_utsname.cpp
index b073a641a59..604947b5825 100644
--- a/ACE/ace/OS_NS_sys_utsname.cpp
+++ b/ACE/ace/OS_NS_sys_utsname.cpp
@@ -164,8 +164,6 @@ ACE_OS::uname (ACE_utsname *name)
 #     endif
         case PROCESSOR_ARCHITECTURE_UNKNOWN:
         default:
-          // @@ We could provide WinCE specific info here.  But let's
-          //    defer that to some later point.
           ACE_OS::strcpy (processor, "Unknown");
           break;
         }
diff --git a/ACE/ace/OS_NS_time.cpp b/ACE/ace/OS_NS_time.cpp
index 526507eeb1b..24afd54da5e 100644
--- a/ACE/ace/OS_NS_time.cpp
+++ b/ACE/ace/OS_NS_time.cpp
@@ -11,80 +11,8 @@
 #include "ace/OS_NS_Thread.h"
 #include "ace/Object_Manager_Base.h"
 
-#if defined (ACE_HAS_WINCE)
-#  include "ace/OS_NS_stdio.h"     /* Need ACE_OS::sprintf() */
-
-namespace
-{
-  ACE_TCHAR const * const ACE_OS_day_of_week_name[] =
-    {
-      ACE_TEXT ("Sun"),
-      ACE_TEXT ("Mon"),
-      ACE_TEXT ("Tue"),
-      ACE_TEXT ("Wed"),
-      ACE_TEXT ("Thu"),
-      ACE_TEXT ("Fri"),
-      ACE_TEXT ("Sat")
-    };
-
-  ACE_TCHAR const * const ACE_OS_month_name[] =
-    {
-      ACE_TEXT ("Jan"),
-      ACE_TEXT ("Feb"),
-      ACE_TEXT ("Mar"),
-      ACE_TEXT ("Apr"),
-      ACE_TEXT ("May"),
-      ACE_TEXT ("Jun"),
-      ACE_TEXT ("Jul"),
-      ACE_TEXT ("Aug"),
-      ACE_TEXT ("Sep"),
-      ACE_TEXT ("Oct"),
-      ACE_TEXT ("Nov"),
-      ACE_TEXT ("Dec")
-    };
-
-  static ACE_TCHAR const ACE_OS_CTIME_R_FMTSTR[] = ACE_TEXT ("%3s %3s %02d %02d:%02d:%02d %04d\n");
-} /* end blank namespace */
-#endif /* ACE_HAS_WINCE */
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-# if defined (ACE_HAS_WINCE)
-ACE_TCHAR *
-ACE_OS::ctime_r (const time_t *clock, ACE_TCHAR *buf, int buflen)
-{
-  // buflen must be at least 26 wchar_t long.
-  if (buflen < 26)              // Again, 26 is a magic number.
-    {
-      errno = ERANGE;
-      return 0;
-    }
-  // This is really stupid, converting FILETIME to timeval back and
-  // forth.  It assumes FILETIME and DWORDLONG are the same structure
-  // internally.
-  ULARGE_INTEGER _100ns;
-  _100ns.QuadPart = (DWORDLONG) *clock * 10000 * 1000
-                     + ACE_Time_Value::FILETIME_to_timval_skew;
-  FILETIME file_time;
-  file_time.dwLowDateTime = _100ns.LowPart;
-  file_time.dwHighDateTime = _100ns.HighPart;
-
-  FILETIME localtime;
-  SYSTEMTIME systime;
-  FileTimeToLocalFileTime (&file_time, &localtime);
-  FileTimeToSystemTime (&localtime, &systime);
-  ACE_OS::snprintf (buf, buflen, ACE_OS_CTIME_R_FMTSTR,
-                    ACE_OS_day_of_week_name[systime.wDayOfWeek],
-                    ACE_OS_month_name[systime.wMonth - 1],
-                    systime.wDay,
-                    systime.wHour,
-                    systime.wMinute,
-                    systime.wSecond,
-                    systime.wYear);
-  return buf;
-}
-# endif /* ACE_HAS_WINCE */
-
 # if defined (ACE_LACKS_DIFFTIME)
 double
 ACE_OS::difftime (time_t t1, time_t t0)
@@ -224,51 +152,6 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res)
 #if defined (ACE_HAS_TR24731_2005_CRT)
   ACE_SECURECRTCALL (localtime_s (res, t), struct tm *, 0, res);
   return res;
-#elif defined (ACE_HAS_WINCE)
-  // This is really stupid, converting FILETIME to timeval back and
-  // forth.  It assumes FILETIME and DWORDLONG are the same structure
-  // internally.
-
-  TIME_ZONE_INFORMATION pTz;
-
-  const unsigned short int __mon_yday[2][13] =
-  {
-    /* Normal years.  */
-    { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
-    /* Leap years.  */
-    { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
-  };
-
-  ULARGE_INTEGER _100ns;
-  ::GetTimeZoneInformation (&pTz);
-
-  _100ns.QuadPart = (DWORDLONG) *t * 10000 * 1000 + ACE_Time_Value::FILETIME_to_timval_skew;
-  FILETIME file_time;
-  file_time.dwLowDateTime = _100ns.LowPart;
-  file_time.dwHighDateTime = _100ns.HighPart;
-
-  FILETIME localtime;
-  SYSTEMTIME systime;
-  FileTimeToLocalFileTime (&file_time, &localtime);
-  FileTimeToSystemTime (&localtime, &systime);
-
-  res->tm_hour = systime.wHour;
-  res->tm_isdst = pTz.DaylightBias != 0;
-
-   int iLeap;
-   iLeap = (res->tm_year % 4 == 0 && (res->tm_year% 100 != 0 || res->tm_year % 400 == 0));
-   // based on leap select which group to use
-
-   res->tm_mday = systime.wDay;
-   res->tm_min = systime.wMinute;
-   res->tm_mon = systime.wMonth - 1;
-   res->tm_sec = systime.wSecond;
-   res->tm_wday = systime.wDayOfWeek;
-   res->tm_yday = __mon_yday[iLeap][systime.wMonth] + systime.wDay;
-   res->tm_year = systime.wYear;// this the correct year but bias the value to start at the 1900
-   res->tm_year = res->tm_year - 1900;
-
-   return res;
 #elif defined (ACE_LACKS_LOCALTIME_R)
   ACE_OS_GUARD
 
@@ -291,28 +174,11 @@ time_t
 ACE_OS::mktime (struct tm *t)
 {
   ACE_OS_TRACE ("ACE_OS::mktime");
-#   if defined (ACE_HAS_WINCE)
-  SYSTEMTIME t_sys;
-  FILETIME t_file;
-  t_sys.wSecond = t->tm_sec;
-  t_sys.wMinute = t->tm_min;
-  t_sys.wHour = t->tm_hour;
-  t_sys.wDay = t->tm_mday;
-  t_sys.wMonth = t->tm_mon + 1;  // SYSTEMTIME is 1-indexed, tm is 0-indexed
-  t_sys.wYear = t->tm_year + 1900; // SYSTEMTIME is real; tm is since 1900
-  t_sys.wDayOfWeek = t->tm_wday;  // Ignored in below function call.
-  t_sys.wMilliseconds = 0;
-  if (SystemTimeToFileTime (&t_sys, &t_file) == 0)
-    return -1;
-  ACE_Time_Value tv (t_file);
-  return tv.sec ();
-#   else
-#     if defined (ACE_HAS_THREADS)  &&  !defined (ACE_HAS_MT_SAFE_MKTIME)
+#if defined (ACE_HAS_THREADS)  &&  !defined (ACE_HAS_MT_SAFE_MKTIME)
   ACE_OS_GUARD
-#     endif /* ACE_HAS_THREADS  &&  ! ACE_HAS_MT_SAFE_MKTIME */
+#endif /* ACE_HAS_THREADS  &&  ! ACE_HAS_MT_SAFE_MKTIME */
 
   return std::mktime (t);
-#   endif /* ACE_HAS_WINCE */
 }
 
 #if defined (ACE_LACKS_STRPTIME)
diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h
index d155dc3636f..3834692fc42 100644
--- a/ACE/ace/OS_NS_time.h
+++ b/ACE/ace/OS_NS_time.h
@@ -117,16 +117,6 @@ inline struct tm *ace_localtime_r_helper (const time_t *clock, struct tm *res)
 #endif /* !ACE_LACKS_LOCALTIME_R */
 
 #if !defined (ACE_LACKS_DIFFTIME)
-# if defined (_WIN32_WCE) && ((_WIN32_WCE >= 0x600) && (_WIN32_WCE <= 0x700)) && !defined (_USE_32BIT_TIME_T) \
-    && defined (_MSC_VER)
-    // The WinCE 6.0/7.0 SDK ships with a diff_time that uses __time32_t as type
-    // not time_t. This resolves in compilation warnings because time_t
-    // can be 64bit. Disable at this moment the warning for just this method
-    // else we get two compile warnings on each source file that includes
-    // this file.
-#   pragma warning (push)
-#   pragma warning (disable: 4244)
-# endif
 /// Helper for the ACE_OS::difftime() function
 /**
  * We moved the difftime code that used to be in ACE_OS::difftime()
@@ -140,10 +130,6 @@ inline double ace_difftime(time_t t1, time_t t0)
 {
   return difftime (t1, t0);
 }
-# if defined (_WIN32_WCE) && ((_WIN32_WCE >= 0x600) && (_WIN32_WCE <= 0x700)) && !defined (_USE_32BIT_TIME_T) \
-    && defined (_MSC_VER)
-#   pragma warning (pop)
-# endif
 #endif /* !ACE_LACKS_DIFFTIME */
 
 # if defined (ACE_WIN32)
@@ -197,11 +183,7 @@ namespace ACE_OS
   ACE_NAMESPACE_INLINE_FUNCTION
   ACE_TCHAR *ctime (const time_t *t);
 
-#if defined (ACE_HAS_WINCE) && !defined (_DEBUG)
-  extern ACE_EXPORT_MACRO
-#else
   ACE_NAMESPACE_INLINE_FUNCTION
-#endif
   ACE_TCHAR *ctime_r (const time_t *clock, ACE_TCHAR *buf, int buflen);
 
 #if !defined (ACE_LACKS_DIFFTIME)
diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl
index 97be63ace24..1a334f65916 100644
--- a/ACE/ace/OS_NS_time.inl
+++ b/ACE/ace/OS_NS_time.inl
@@ -94,11 +94,6 @@ ACE_OS::ctime (const time_t *t)
 #if defined (ACE_LACKS_CTIME)
   ACE_UNUSED_ARG (t);
   ACE_NOTSUP_RETURN (0);
-#elif defined (ACE_HAS_WINCE)
-  static ACE_TCHAR buf [ctime_buf_size];
-  return ACE_OS::ctime_r (t,
-                          buf,
-                          ctime_buf_size);
 #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
   return ::_wctime (t);
 #else
@@ -119,10 +114,9 @@ ACE_OS::ctime (const time_t *t)
 #  else
   return ::ctime (t);
 #  endif /* ACE_USES_WCHAR */
-# endif /* ACE_HAS_WINCE */
+# endif /* ACE_LACKS_CTIME */
 }
 
-#if !defined (ACE_HAS_WINCE)  /* CE version in OS.cpp */
 ACE_INLINE ACE_TCHAR *
 ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen)
 {
@@ -198,7 +192,6 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen)
   return buf;
 #endif /* ACE_HAS_REENTRANT_FUNCTIONS */
 }
-#endif /* !ACE_HAS_WINCE */
 
 #if defined (ACE_USES_ULONG_FOR_STAT_TIME)
 ACE_INLINE ACE_TCHAR *
diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp
index edc64725a6f..4dfb181ecd0 100644
--- a/ACE/ace/OS_NS_unistd.cpp
+++ b/ACE/ace/OS_NS_unistd.cpp
@@ -52,10 +52,6 @@ ACE_OS::argv_to_string (int argc,
                         bool substitute_env_args,
                         bool quote_args)
 {
-#if defined (ACE_LACKS_STRENVDUP)
-  ACE_UNUSED_ARG (substitute_env_args);
-#endif /* ACE_LACKS_STRENVDUP */
-
   if (argc <= 0 || argv == 0 || argv[0] == 0)
     return 0;
 
@@ -67,7 +63,6 @@ ACE_OS::argv_to_string (int argc,
 
   for (int i = 0; i < argc; ++i)
     {
-#if !defined (ACE_LACKS_STRENVDUP)
       // Account for environment variables.
       if (substitute_env_args
           && ACE_OS::strchr (argv[i], ACE_TEXT ('$')) != 0)
@@ -98,7 +93,6 @@ ACE_OS::argv_to_string (int argc,
               return 0;
             }
         }
-#endif /* ACE_LACKS_STRENVDUP */
       // If must quote, we only do it if the arg contains spaces, or
       // is empty. Perhaps a check for other c | ord(c) <= 32 is in
       // order?
@@ -308,7 +302,6 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[])
   if (ACE_OS::argv_to_string (argv, buf) != -1)
     {
       PROCESS_INFORMATION process_info;
-#   if !defined (ACE_HAS_WINCE)
       ACE_TEXT_STARTUPINFO startup_info;
       ACE_OS::memset ((void *) &startup_info,
                       0,
@@ -325,18 +318,6 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[])
                                   0, // No current directory.
                                   &startup_info,
                                   &process_info))
-#   else
-      if (ACE_TEXT_CreateProcess (0,
-                                  buf,
-                                  0, // No process attributes.
-                                  0,  // No thread attributes.
-                                  FALSE, // Can's inherit handles on CE
-                                  0, // Don't create a new console window.
-                                  0, // No environment.
-                                  0, // No current directory.
-                                  0, // Can't use startup info on CE
-                                  &process_info))
-#   endif /* ! ACE_HAS_WINCE */
         {
           // Free resources allocated in kernel.
           ACE_OS::close (process_info.hThread);
@@ -792,10 +773,6 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf,
                         ACE_TCHAR **&argv,
                         bool substitute_env_args)
 {
-#if defined (ACE_LACKS_STRENVDUP)
-  ACE_UNUSED_ARG (substitute_env_args);
-#endif /* ACE_LACKS_STRENVDUP */
-
   // Reset the number of arguments
   argc = 0;
 
@@ -901,7 +878,6 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf,
 
       *cp = ACE_TEXT ('\0');
 
-#if !defined (ACE_LACKS_STRENVDUP)
       // Check for environment variable substitution here.
       if (substitute_env_args) {
           argv[i] = ACE_OS::strenvdup (argp);
@@ -919,7 +895,6 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf,
             }
       }
       else
-#endif /* ACE_LACKS_STRENVDUP */
         {
           argv[i] = ACE_OS::strdup (argp);
 
diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl
index 5c249d1fe59..7bca51f6aba 100644
--- a/ACE/ace/OS_NS_unistd.inl
+++ b/ACE/ace/OS_NS_unistd.inl
@@ -16,10 +16,6 @@
 #  include "ace/OS_NS_stdio.h"
 #endif /* ACE_LACKS_ACCESS */
 
-#if defined (ACE_HAS_ACCESS_EMULATION)
-#  include "ace/os_include/os_unistd.h"
-#endif /* ACE_HAS_ACCESS_EMULATION */
-
 #if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x690)
 #  if defined (__RTP__)
 #    include "ace/os_include/os_strings.h"
@@ -39,23 +35,9 @@ ACE_OS::access (const char *path, int amode)
 {
   ACE_OS_TRACE ("ACE_OS::access");
 #if defined (ACE_LACKS_ACCESS)
-#  if defined (ACE_HAS_ACCESS_EMULATION)
-  // @@ WINCE: There should be a Win32 API that can do this.
-  // Hard coded read access here.
-  ACE_UNUSED_ARG (amode);
-  FILE* handle = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(path),
-                                ACE_TEXT ("r"));
-  if (handle != 0)
-    {
-      ACE_OS::fclose (handle);
-      return 0;
-    }
-  return -1;
-#  else
     ACE_UNUSED_ARG (path);
     ACE_UNUSED_ARG (amode);
     ACE_NOTSUP_RETURN (-1);
-#  endif  /* ACE_HAS_ACCESS_EMULATION */
 #elif defined(ACE_WIN32)
   // Windows doesn't support checking X_OK(6)
 #  if defined (ACE_ACCESS_EQUIVALENT)
@@ -73,11 +55,11 @@ ACE_OS::access (const char *path, int amode)
 ACE_INLINE int
 ACE_OS::access (const wchar_t *path, int amode)
 {
-#if defined (ACE_WIN32) && !defined (ACE_LACKS__WACCESS)
+#if defined (ACE_WIN32)
   return ::_waccess (path, amode);
-#else /* ACE_WIN32 && !ACE_HAS_WINCE */
+#else /* ACE_WIN32 */
   return ACE_OS::access (ACE_Wide_To_Ascii (path).char_rep (), amode);
-#endif /* ACE_WIN32 && !ACE_LACKS__WACCESS */
+#endif /* ACE_WIN32 */
 }
 #endif /* ACE_HAS_WCHAR */
 
@@ -127,10 +109,7 @@ ACE_INLINE int
 ACE_OS::chdir (const char *path)
 {
   ACE_OS_TRACE ("ACE_OS::chdir");
-#if defined (ACE_LACKS_CHDIR)
-  ACE_UNUSED_ARG (path);
-  ACE_NOTSUP_RETURN (-1);
-#elif defined (ACE_HAS_NONCONST_CHDIR)
+#if defined (ACE_HAS_NONCONST_CHDIR)
   return ::chdir (const_cast<char *> (path));
 #elif defined (ACE_CHDIR_EQUIVALENT)
   return ACE_CHDIR_EQUIVALENT (path);
@@ -143,10 +122,7 @@ ACE_OS::chdir (const char *path)
 ACE_INLINE int
 ACE_OS::chdir (const wchar_t *path)
 {
-#if defined (ACE_LACKS_CHDIR)
-  ACE_UNUSED_ARG (path);
-  ACE_NOTSUP_RETURN (-1);
-#elif defined (ACE_WIN32)
+#if defined (ACE_WIN32)
   return ::_wchdir (path);
 #else /* ACE_WIN32 */
   return ACE_OS::chdir (ACE_Wide_To_Ascii (path).char_rep ());
@@ -157,11 +133,7 @@ ACE_OS::chdir (const wchar_t *path)
 ACE_INLINE int
 ACE_OS::rmdir (const char *path)
 {
-#if defined (ACE_HAS_WINCE)
-  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectory (ACE_TEXT_CHAR_TO_TCHAR(path)),
-                                          ace_result_),
-                        int, -1);
-#elif defined (ACE_RMDIR_EQUIVALENT)
+#if defined (ACE_RMDIR_EQUIVALENT)
   return ACE_RMDIR_EQUIVALENT (path);
 #else
   return ::rmdir (path);
@@ -172,16 +144,12 @@ ACE_OS::rmdir (const char *path)
 ACE_INLINE int
 ACE_OS::rmdir (const wchar_t *path)
 {
-#if defined (ACE_HAS_WINCE)
-  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectoryW (path),
-                                          ace_result_),
-                        int, -1);
-#elif defined (ACE_WIN32)
+#if defined (ACE_WIN32)
   return ::_wrmdir (path);
 #else
   ACE_Wide_To_Ascii n_path (path);
   return ACE_OS::rmdir (n_path.char_rep ());
-#endif /* ACE_HAS_WINCE */
+#endif /* ACE_WIN32 */
 }
 #endif /* ACE_HAS_WCHAR */
 
@@ -257,7 +225,7 @@ ACE_OS::dup(ACE_HANDLE handle, pid_t pid)
 #else
   ACE_UNUSED_ARG (pid);
   return ::dup(handle);
-#endif /*ACE_WIN32 &&  !ACE_HAS_WINCE*/
+#endif /* ACE_LACKS_DUP */
 }
 
 ACE_INLINE int
@@ -414,11 +382,7 @@ ACE_INLINE char *
 ACE_OS::getcwd (char *buf, size_t size)
 {
   ACE_OS_TRACE ("ACE_OS::getcwd");
-#if defined (ACE_LACKS_GETCWD)
-  ACE_UNUSED_ARG (buf);
-  ACE_UNUSED_ARG (size);
-  ACE_NOTSUP_RETURN (0);
-#elif defined (ACE_GETCWD_EQUIVALENT)
+#if defined (ACE_GETCWD_EQUIVALENT)
   return ACE_GETCWD_EQUIVALENT (buf, static_cast<int> (size));
 #elif defined (ACE_WIN32)
   return ::getcwd (buf, static_cast<int> (size));
@@ -431,11 +395,7 @@ ACE_OS::getcwd (char *buf, size_t size)
 ACE_INLINE wchar_t *
 ACE_OS::getcwd (wchar_t *buf, size_t size)
 {
-#  if defined (ACE_HAS_WINCE)
-  ACE_UNUSED_ARG (buf);
-  ACE_UNUSED_ARG (size);
-  ACE_NOTSUP_RETURN (0);
-#  elif defined (ACE_WIN32)
+#  if defined (ACE_WIN32)
   return ::_wgetcwd (buf, static_cast<int> (size));
 #  else
   char *narrow_buf = new char[size];
@@ -566,7 +526,7 @@ ACE_OS::hostname (char name[], size_t maxnamelen)
   ACE_UNUSED_ARG (maxnamelen);
   ACE_NOTSUP_RETURN (-1);
 #   endif /* ACE_HAS_PHARLAP_RT */
-#elif defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE)
+#elif defined (ACE_VXWORKS)
   return ::gethostname (name, maxnamelen);
 #elif defined (ACE_WIN32)
   if (::gethostname (name, ACE_Utils::truncate_cast<int> (maxnamelen)) == 0)
@@ -607,11 +567,11 @@ ACE_OS::hostname (char name[], size_t maxnamelen)
 ACE_INLINE int
 ACE_OS::hostname (wchar_t name[], size_t maxnamelen)
 {
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32)
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (GetComputerNameW (name,
                                                         LPDWORD (&maxnamelen)),
                                           ace_result_), int, -1);
-#else /* ACE_WIN32 && !ACE_HAS_WINCE */
+#else /* ACE_WIN32 */
   // Emulate using the char version
   char *char_name = 0;
 
@@ -622,7 +582,7 @@ ACE_OS::hostname (wchar_t name[], size_t maxnamelen)
 
   delete [] char_name;
   return result;
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE */
+#endif /* ACE_WIN32  */
 }
 #endif /* ACE_HAS_WCHAR */
 
@@ -1216,10 +1176,6 @@ ACE_OS::unlink (const char *path)
   ACE_OS_TRACE ("ACE_OS::unlink");
 # if defined (ACE_HAS_NONCONST_UNLINK)
   return ::unlink (const_cast<char *> (path));
-# elif defined (ACE_HAS_WINCE)
-  // @@ The problem is, DeleteFile is not actually equals to unlink. ;(
-  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::DeleteFile (ACE_TEXT_CHAR_TO_TCHAR (path)), ace_result_),
-                        int, -1);
 # elif defined (ACE_LACKS_UNLINK)
   ACE_UNUSED_ARG (path);
   ACE_NOTSUP_RETURN (-1);
@@ -1235,16 +1191,12 @@ ACE_INLINE int
 ACE_OS::unlink (const wchar_t *path)
 {
   ACE_OS_TRACE ("ACE_OS::unlink");
-# if defined (ACE_HAS_WINCE)
-  // @@ The problem is, DeleteFile is not actually equals to unlink. ;(
-  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::DeleteFileW (path), ace_result_),
-                        int, -1);
-# elif defined (ACE_WIN32)
+# if defined (ACE_WIN32)
   return ::_wunlink (path);
 # else
   ACE_Wide_To_Ascii npath (path);
   return ACE_OS::unlink (npath.char_rep ());
-# endif /* ACE_HAS_WINCE */
+# endif /* ACE_WIN32 */
 }
 #endif /* ACE_HAS_WCHAR */
 
diff --git a/ACE/ace/OS_main.cpp b/ACE/ace/OS_main.cpp
index 74b917da9f7..1fbacb1ba93 100644
--- a/ACE/ace/OS_main.cpp
+++ b/ACE/ace/OS_main.cpp
@@ -51,7 +51,7 @@ ace_os_main_i (int argc, char *argv[]) /* user's entry point, e.g., main */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#  elif !defined (ACE_HAS_WINCE)
+#  else
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -94,60 +94,9 @@ ace_os_main_i (ACE_Main_Base &mbase, int argc, char *argv[]) /* user's entry poi
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#  else /* ACE_HAS_WINCE */
+#  endif   /* !ACE_WIN32 */
 
-// CE only gets a command line string;  no argv. So we need to convert it
-// when the main entrypoint expects argc/argv. ACE_ARGV supports this.
-#    include "ace/OS_NS_string.h"
-#    include "ace/OS_NS_ctype.h"
-#    include "ace/ACE.h"
-#    include "ace/ARGV.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_Main_Base::~ACE_Main_Base ()
-{
-}
-
-int ACE_Main_Base::run (HINSTANCE,
-                        HINSTANCE,
-                        LPWSTR lpCmdLine,
-                        int)
-{
-  ACE_TCHAR cmdline[1024];
-  ACE_TCHAR msg_file [MAXPATHLEN];
-  if (ACE_TEXT_GetModuleFileName (0, msg_file, MAXPATHLEN))
-    {
-      bool quote = false;
-      for (size_t i(0); !quote && msg_file[i]; ++i)
-        {
-          if (ACE_OS::ace_isspace (msg_file[i])) quote = true;
-        }
-      ACE_TCHAR *cmd_iter = cmdline;
-      if (quote)
-        {
-          *cmd_iter++ = ACE_TEXT ('"');
-        }
-      ACE_OS::strcpy (cmd_iter, msg_file);
-      ACE_OS::strcat (cmd_iter, quote ? ACE_TEXT ("\" ") : ACE_TEXT (" "));
-    }
-  else
-    {
-      ACE_OS::strcpy (cmdline, ACE_TEXT ("program "));
-    }
-  ACE_OS::strcat (cmdline, ACE_TEXT_WCHAR_TO_TCHAR (lpCmdLine));
-  ACE_ARGV ce_argv (cmdline);
-  ACE::init ();
-  ACE_MAIN_OBJECT_MANAGER
-  int const i = this->run_i (ce_argv.argc (), ce_argv.argv ());
-  ACE::fini ();
-  return i;
-}
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#  endif   /* !ACE_HAS_WINCE */
-
-#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
+#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
 
 #endif /* ACE_DOESNT_DEFINE_MAIN */
 
diff --git a/ACE/ace/OS_main.h b/ACE/ace/OS_main.h
index 982875accbb..54726aa0265 100644
--- a/ACE/ace/OS_main.h
+++ b/ACE/ace/OS_main.h
@@ -151,7 +151,7 @@ ACE_MAIN (int argc, char *argv[])    /* user's entry point, e.g., main */ \
 ACE_Proper_Export_Flag int \
 ace_main_i
 
-#   elif !defined (ACE_HAS_WINCE)
+#   else
 
 #     if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
 
@@ -230,78 +230,8 @@ int \
 ace_main_i
 
 #     endif /* ACE_WIN32 && ACE_USES_WCHAR */
-
-#   else /* ACE_HAS_WINCE */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class ACE_Export ACE_Main_Base
-{
-public:
-  virtual ~ACE_Main_Base ();
-  int run (HINSTANCE, HINSTANCE, LPWSTR, int);
-  virtual int run_i (int, ACE_TCHAR *[]) = 0;
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#     if defined (ACE_TMAIN)  // Use WinMain on CE; others give warning/error.
-#       undef ACE_TMAIN
-#     endif  // ACE_TMAIN
-
-// Support for ACE_TMAIN, which is a recommended way. It would be nice if
-// CE had CommandLineToArgvW()... but it's only on NT3.5 and up.
-
-#     define ACE_TMAIN \
-ace_tmain_i (int, ACE_TCHAR *[]); \
-class ACE_Main : public ACE_Main_Base {int run_i (int argc, ACE_TCHAR *argv[]);}; \
-inline int ACE_Main::run_i (int argc, ACE_TCHAR *argv[])  \
-{ \
-  return ace_tmain_i (argc, argv); \
-} \
-int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) \
-{ \
-  ACE_Main m; \
-  return m.run (hInstance, hPrevInstance, lpCmdLine, nCmdShow); \
-} \
-int ace_tmain_i
-
-// Support for wchar_t but still can't fit to CE because of the command
-// line parameters.
-#     define wmain \
-ace_wmain_i (int, ACE_TCHAR *[]); \
-ACE_Export int ace_os_winwmain_i (ACE_Main_Base&, hInstance, hPrevInstance, lpCmdLine, nCmdShow);  /* forward declaration */ \
-class ACE_Main : public ACE_Main_Base {int run_i (int argc, ACE_TCHAR *argv[]);}; \
-inline int ACE_Main::run_i (int argc, ACE_TCHAR *argv[])  \
-{ \
-  return ace_wmain_i (argc, argv); \
-} \
-int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) \
-{ \
-  return ace_os_winwmain_i (hInstance, hPrevInstance, lpCmdLine, nCmdShow); \
-} \
-int ace_wmain_i
-
-// Supporting legacy 'main' is A LOT easier for users than changing existing
-// code on WinCE. Unfortunately, evc 3 can't grok a #include within the macro
-// expansion, so it needs to go out here.
-#     include "ace/Argv_Type_Converter.h"
-#     define main \
-ace_main_i (int, ACE_TCHAR *[]); \
-ACE_Export int ace_os_winmain_i (ACE_Main_Base&, hInstance, hPrevInstance, lpCmdLine, nCmdShow);  /* forward declaration */ \
-class ACE_Main : public ACE_Main_Base {int run_i (int argc, ACE_TCHAR *argv[]);}; \
-inline int ACE_Main::run_i (int argc, ACE_TCHAR *argv[])  \
-{ \
-  return ace_main_i (argc, argv); \
-} \
-int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) \
-{ \
-  return ace_os_winmain_i (hInstance, hPrevInstance, lpCmdLine, nCmdShow); \
-} \
-int ace_main_i
-
 #   endif
-# endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
+# endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
 
 #  ifdef ACE_MQX
 #    include <iar_dynamic_init.h>
diff --git a/ACE/ace/Object_Manager.cpp b/ACE/ace/Object_Manager.cpp
index 56edf6ec314..55701947175 100644
--- a/ACE/ace/Object_Manager.cpp
+++ b/ACE/ace/Object_Manager.cpp
@@ -28,7 +28,7 @@
 #include "ace/Null_Mutex.h"
 #include "ace/Mutex.h"
 #include "ace/RW_Thread_Mutex.h"
-#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS)
 # include "ace/OS_NS_stdlib.h"
 # include /**/ <crtdbg.h>
 #endif // ACE_DISABLE_WIN32_ERROR_WINDOWS
@@ -53,7 +53,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Note the following fix was derived from that proposed by Jochen Kalmbach
 // http://blog.kalmbachnet.de/?postid=75
-#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS)
 LPTOP_LEVEL_EXCEPTION_FILTER WINAPI ACEdisableSetUnhandledExceptionFilter (
   LPTOP_LEVEL_EXCEPTION_FILTER /*lpTopLevelExceptionFilter*/)
 {
@@ -257,7 +257,7 @@ ACE_Object_Manager::init ()
             }
 #     endif /* ACE_HAS_TSS_EMULATION */
 
-#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS)
 #if defined (_DEBUG) && (defined (_MSC_VER) || defined (__INTEL_COMPILER) || defined (__MINGW32__))
           _CrtSetReportMode( _CRT_ERROR, _CRTDBG_MODE_FILE );
           _CrtSetReportFile( _CRT_ERROR, _CRTDBG_FILE_STDERR );
diff --git a/ACE/ace/Object_Manager_Base.cpp b/ACE/ace/Object_Manager_Base.cpp
index 0a1c0767186..ecb44654087 100644
--- a/ACE/ace/Object_Manager_Base.cpp
+++ b/ACE/ace/Object_Manager_Base.cpp
@@ -216,9 +216,6 @@ ACE_OS_Object_Manager::init ()
       if (this == instance_)
         {
 # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-#   if defined (ACE_HAS_WINCE_BROKEN_ERRNO)
-          ACE_CE_Errno::init ();
-#   endif /* ACE_HAS_WINCE_BROKEN_ERRNO */
           ACE_OS_PREALLOCATE_OBJECT (ACE_thread_mutex_t, ACE_OS_MONITOR_LOCK)
           if (ACE_OS::thread_mutex_init
               // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor.
@@ -399,9 +396,6 @@ ACE_OS_Object_Manager::fini ()
                                          ACE_TSS_BASE_LOCK)
 #     endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
 #   endif /* ACE_HAS_TSS_EMULATION */
-#   if defined (ACE_HAS_WINCE_BROKEN_ERRNO)
-          ACE_CE_Errno::fini ();
-#   endif /* ACE_HAS_WINCE_BROKEN_ERRNO */
 # endif /* ACE_MT_SAFE */
 #endif /* ! ACE_HAS_STATIC_PREALLOCATION */
     }
@@ -443,39 +437,17 @@ ACE_OS_Object_Manager::print_error_message (unsigned int line_number,
                                             const ACE_TCHAR *message)
 {
   // To avoid duplication of these const strings in OS.o.
-#if !defined (ACE_HAS_WINCE)
-# ifndef ACE_LACKS_STDERR
+#ifndef ACE_LACKS_STDERR
   fprintf (stderr, "ace/Object_Manager_Base.cpp, line %u: %s ",
            line_number,
            ACE_TEXT_ALWAYS_CHAR (message));
-# else
-  ACE_UNUSED_ARG (line_number);
-  ACE_UNUSED_ARG (message);
-# endif
-# if !defined (ACE_LACKS_PERROR)
-  perror ("failed");
-# endif /* ACE_LACKS_PERROR */
 #else
-  // @@ Need to use the following information.
   ACE_UNUSED_ARG (line_number);
   ACE_UNUSED_ARG (message);
-
-  ACE_TCHAR *lpMsgBuf = 0;
-  ::FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                   FORMAT_MESSAGE_FROM_SYSTEM,
-                   0,
-                   ::GetLastError (),
-                   MAKELANGID (LANG_NEUTRAL,
-                               SUBLANG_DEFAULT),
-                   // Default language
-                   (ACE_TCHAR *) &lpMsgBuf,
-                   0,
-                   0);
-  ::MessageBox (0,
-                lpMsgBuf,
-                ACE_TEXT ("ACE_OS error"),
-                MB_OK);
 #endif
+#if !defined (ACE_LACKS_PERROR)
+  perror ("failed");
+#endif /* ACE_LACKS_PERROR */
 }
 
 int
diff --git a/ACE/ace/Pagefile_Memory_Pool.cpp b/ACE/ace/Pagefile_Memory_Pool.cpp
index 19516cea601..8af6e554b66 100644
--- a/ACE/ace/Pagefile_Memory_Pool.cpp
+++ b/ACE/ace/Pagefile_Memory_Pool.cpp
@@ -20,13 +20,8 @@
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1  */
 
 #if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
-#if !defined (ACE_HAS_WINCE)
-#define ACE_MAP_FILE(_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd)\
+#define ACE_MAP_FILE(_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd) \
   MapViewOfFileEx (_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd)
-#else //if !defined (ACE_HAS_WINCE)
-#define ACE_MAP_FILE(_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd)\
-  MapViewOfFile (_hnd, _access, _offHigh, _offLow, _nBytes)
-#endif /* !ACE_HAS_WINCE */
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -55,26 +50,22 @@ ACE_Pagefile_Memory_Pool::ACE_Pagefile_Memory_Pool (const ACE_TCHAR *backing_sto
     {
       this->local_cb_.req_base_ = options->base_addr_;
       this->local_cb_.mapped_base_ = 0;
-      this->local_cb_.sh_.max_size_ =
-        options->max_size_;
+      this->local_cb_.sh_.max_size_ = options->max_size_;
       this->local_cb_.sh_.mapped_size_ = 0;
-      this->local_cb_.sh_.free_offset_ =
-        this->local_cb_.sh_.mapped_size_;
+      this->local_cb_.sh_.free_offset_ = this->local_cb_.sh_.mapped_size_;
       this->local_cb_.sh_.free_size_ = 0;
     }
   else
     {
       this->local_cb_.req_base_ = 0;
       this->local_cb_.mapped_base_ = 0;
-      this->local_cb_.sh_.max_size_ =
-        this->round_to_chunk_size (page_size_) ;
+      this->local_cb_.sh_.max_size_ = this->round_to_chunk_size (page_size_) ;
       this->local_cb_.sh_.mapped_size_ = 0;
-      this->local_cb_.sh_.free_offset_ =
-        this->local_cb_.sh_.mapped_size_;
+      this->local_cb_.sh_.free_offset_ = this->local_cb_.sh_.mapped_size_;
       this->local_cb_.sh_.free_size_ = 0;
     }
 
-  int update_backing_store_name = backing_store_name == 0 ? 0 : 1;
+  int const update_backing_store_name = backing_store_name == 0 ? 0 : 1;
 
   if (backing_store_name == 0)
     // Only create a new unique filename for the backing store file if
diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp
index 3d4206e0010..f3230148e5c 100644
--- a/ACE/ace/Proactor.cpp
+++ b/ACE/ace/Proactor.cpp
@@ -9,9 +9,9 @@
 #include "ace/Object_Manager.h"
 #include "ace/Task_T.h"
 
-#if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_SVCCONF)
+#if !defined (ACE_LACKS_ACE_SVCCONF)
 #    include "ace/Service_Config.h"
-#endif /* !ACE_HAS_WINCE && !ACE_LACKS_ACE_SVCCONF */
+#endif /* !ACE_LACKS_ACE_SVCCONF */
 
 #include "ace/Task_T.h"
 #include "ace/Log_Category.h"
@@ -336,7 +336,7 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation,
 #      endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */
 #    endif /* !ACE_HAS_BROKEN_SIGEVENT_STRUCT */
 #  endif /* ACE_POSIX_AIOCB_PROACTOR */
-#elif (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#elif defined (ACE_WIN32)
       // WIN_Proactor.
       ACE_NEW (implementation,
                ACE_WIN32_Proactor);
@@ -437,13 +437,13 @@ ACE_Proactor::name ()
 int
 ACE_Proactor::check_reconfiguration (ACE_Proactor *)
 {
-#if !defined (ACE_HAS_WINCE)  &&  !defined (ACE_LACKS_ACE_SVCCONF)
+#if !defined (ACE_LACKS_ACE_SVCCONF)
   if (ACE_Service_Config::reconfig_occurred ())
     {
       ACE_Service_Config::reconfigure ();
       return 1;
     }
-#endif /* ! ACE_HAS_WINCE || ! ACE_LACKS_ACE_SVCCONF */
+#endif /* !ACE_LACKS_ACE_SVCCONF */
   return 0;
 }
 
diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp
index 3a52b8bb9a4..3386a348582 100644
--- a/ACE/ace/Process.cpp
+++ b/ACE/ace/Process.cpp
@@ -137,31 +137,7 @@ ACE_Process::spawn (ACE_Process_Options &options)
         }
     }
 
-#if defined (ACE_HAS_WINCE)
-  // Note that WinCE does not have process name included in the command line as argv[0]
-  // like other OS environment.  Therefore, it is user's whole responsibility to call
-  // 'ACE_Process_Options::process_name(const ACE_TCHAR *name)' to set the proper
-  // process name (the execution file name with path if needed).
-  BOOL fork_result =
-    ACE_TEXT_CreateProcess (options.process_name(),
-                            options.command_line_buf(),
-                            options.get_process_attributes(),  // must be NULL in CE
-                            options.get_thread_attributes(),   // must be NULL in CE
-                            options.handle_inheritance(),      // must be false in CE
-                            options.creation_flags(),          // must be NULL in CE
-                            options.env_buf(),                 // environment variables, must be NULL in CE
-                            options.working_directory(),       // must be NULL in CE
-                            options.startup_info(),            // must be NULL in CE
-                            &this->process_info_);
-
-  if (fork_result)
-    {
-      parent (this->getpid ());
-      return this->getpid ();
-    }
-  return ACE_INVALID_PID;
-
-#elif defined (ACE_WIN32)
+#if defined (ACE_WIN32)
   void* env_buf = options.env_buf ();
   DWORD flags = options.creation_flags ();
 # if defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR)
@@ -761,8 +737,7 @@ ACE_Process::close_passed_handles ()
 }
 
 #if defined (ACE_WIN32) && \
-    defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR) && \
-    !defined (ACE_HAS_WINCE)
+    defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR)
 wchar_t*
 ACE_Process::convert_env_buffer (const char* env) const
 {
@@ -818,12 +793,9 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment,
                                           size_t max_env_args,
                                           size_t max_cmdline_args)
   :
-#if !defined (ACE_HAS_WINCE)
     inherit_environment_ (inherit_environment),
-#endif /* ACE_HAS_WINCE */
     creation_flags_ (0),
     avoid_zombies_ (0),
-#if !defined (ACE_HAS_WINCE)
 #if defined (ACE_WIN32)
     environment_inherited_ (0),
     process_attributes_ (0),
@@ -847,7 +819,6 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment,
     environment_buf_len_ (env_buf_len),
     max_environment_args_ (max_env_args),
     max_environ_argv_index_ (max_env_args - 1),
-#endif /* !ACE_HAS_WINCE */
     command_line_argv_calculated_ (false),
     command_line_buf_ (0),
     command_line_copy_ (0),
@@ -867,13 +838,6 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment,
   command_line_buf_[0] = '\0';
   process_name_[0] = '\0';
 
-#if defined (ACE_HAS_WINCE)
-  ACE_UNUSED_ARG(inherit_environment);
-  ACE_UNUSED_ARG(env_buf_len);
-  ACE_UNUSED_ARG(max_env_args);
-#endif
-
-#if !defined (ACE_HAS_WINCE)
   working_directory_[0] = '\0';
 #if defined (ACE_HAS_ALLOC_HOOKS)
   ACE_ALLOCATOR (environment_buf_,
@@ -897,7 +861,6 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment,
                   sizeof this->startup_info_);
   this->startup_info_.cb = sizeof this->startup_info_;
 #endif /* ACE_WIN32 */
-#endif /* !ACE_HAS_WINCE */
 #if defined (ACE_HAS_ALLOC_HOOKS)
   ACE_ALLOCATOR (command_line_argv_,
                  static_cast<ACE_TCHAR**>(ACE_Allocator::instance()->malloc(sizeof(ACE_TCHAR*) * max_cmdline_args)));
@@ -907,7 +870,6 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment,
 #endif /* ACE_HAS_ALLOC_HOOKS */
 }
 
-#if !defined (ACE_HAS_WINCE)
 #if defined (ACE_WIN32)
 void
 ACE_Process_Options::inherit_environment ()
@@ -975,7 +937,6 @@ ACE_Process_Options::env_argv ()
 {
   return environment_argv_;
 }
-
 #endif /* ACE_WIN32 */
 
 int
@@ -1229,12 +1190,9 @@ ACE_Process_Options::release_handles ()
       set_handles_called_ = 0;
     }
 }
-#endif /* !ACE_HAS_WINCE */
-
 
 ACE_Process_Options::~ACE_Process_Options ()
 {
-#if !defined (ACE_HAS_WINCE)
   release_handles();
 #if defined (ACE_HAS_ALLOC_HOOKS)
   ACE_Allocator::instance()->free(environment_buf_);
@@ -1243,7 +1201,6 @@ ACE_Process_Options::~ACE_Process_Options ()
   delete [] environment_buf_;
   delete [] environment_argv_;
 #endif /* ACE_HAS_ALLOC_HOOKS */
-#endif /* !ACE_HAS_WINCE */
 #if defined (ACE_HAS_ALLOC_HOOKS)
   ACE_Allocator::instance()->free(command_line_buf_);
 #else
@@ -1326,11 +1283,7 @@ ACE_Process_Options::command_line (const ACE_TCHAR *format, ...)
   return 0;
 }
 
-#if defined (ACE_HAS_WCHAR) && !defined (ACE_HAS_WINCE)
-/**
- * @note Not available on Windows CE because it doesn't have a char version of
- * vsprintf.
- */
+#if defined (ACE_HAS_WCHAR)
 int
 ACE_Process_Options::command_line (const ACE_ANTI_TCHAR *format, ...)
 {
@@ -1357,20 +1310,16 @@ ACE_Process_Options::command_line (const ACE_ANTI_TCHAR *format, ...)
   command_line_argv_calculated_ = false;
   return 0;
 }
-#endif /* ACE_HAS_WCHAR && !ACE_HAS_WINCE */
+#endif /* ACE_HAS_WCHAR */
 #endif // ACE_LACKS_VA_FUNCTIONS
 
 ACE_TCHAR *
 ACE_Process_Options::env_buf ()
 {
-#if !defined (ACE_HAS_WINCE)
   if (environment_buf_[0] == '\0')
     return 0;
   else
     return environment_buf_;
-#else
-  return 0;
-#endif /* !ACE_HAS_WINCE */
 }
 
 ACE_TCHAR * const *
@@ -1411,12 +1360,8 @@ ACE_Process_Options::command_line_argv ()
 int
 ACE_Process_Options::pass_handle (ACE_HANDLE h)
 {
-#if defined (ACE_HAS_WINCE)
-  ACE_NOTSUP_RETURN (-1);
-#else
   this->handles_passed_.set_bit (h);
   return 0;
-#endif /* ACE_HAS_WINCE */
 }
 
 // Get a copy of the handles the ACE_Process_Options duplicated
diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h
index 7e00b3dc975..70aa7c2f0d3 100644
--- a/ACE/ace/Process.h
+++ b/ACE/ace/Process.h
@@ -35,11 +35,6 @@ class ACE_Time_Value;
  *
  * This class controls the options passed to <CreateProcess> (or <fork>
  * and <exec>).
- * Notice that on Windows CE, creating a process merely means
- * instantiating a new process.  You can't set the handles (since
- * there's no stdin, stdout and stderr,) specify process/thread
- * options, set environment,...  So, basically, this class only
- * set the command line and nothing else.
  * Notice that on UNIX platforms, if the <setenv> is used, the
  * <spawn> is using the <execve> system call. It means that the
  * <command_line> should include a full path to the program file
@@ -169,10 +164,10 @@ public:
 #endif /* !ACE_USES_WCHAR */
     ;
 
-#if defined (ACE_HAS_WCHAR) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WCHAR)
   /// Anti-TChar version of command_line ()
   int command_line (const ACE_ANTI_TCHAR *format, ...);
-#endif /* ACE_HAS_WCHAR && !ACE_HAS_WINCE */
+#endif /* ACE_HAS_WCHAR */
 #endif // ACE_LACKS_VA_FUNCTIONS
 
   /// Same as above in argv format.  @a argv must be null terminated.
@@ -365,7 +360,6 @@ public:
   void inherit_environment (bool nv);
 #endif /* ACE_WIN32 */
 protected:
-#if !defined (ACE_HAS_WINCE)
   /// Add @a assignment to environment_buf_ and adjust
   /// environment_argv_.  @a len is the strlen of @a assignment.
   int setenv_i (ACE_TCHAR *assignment, size_t len);
@@ -373,7 +367,6 @@ protected:
   /// Whether the child process inherits the current process
   /// environment.
   bool inherit_environment_;
-#endif /* !ACE_HAS_WINCE */
 
   /// Default 0.
   u_long creation_flags_;
@@ -381,7 +374,7 @@ protected:
   /// Avoid zombies for spawned processes.
   int avoid_zombies_;
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32)
   /// Helper function to grab win32 environment and stick it in
   /// environment_buf_ using this->setenv_i.
   void inherit_environment ();
@@ -424,7 +417,6 @@ protected:
   /// Default true.
   bool handle_inheritance_;
 
-#if !defined (ACE_HAS_WINCE)
   /// Is 1 if stdhandles was called.
   int set_handles_called_;
 
@@ -452,7 +444,6 @@ protected:
 
   /// The current working directory.
   ACE_TCHAR working_directory_[MAXPATHLEN + 1];
-#endif /* !ACE_HAS_WINCE */
 
   /// Ensures command_line_argv is only calculated once.
   bool command_line_argv_calculated_;
@@ -667,9 +658,7 @@ protected:
   ACE_Handle_Set dup_handles_;
 
 private:
-#if defined (ACE_WIN32) && \
-    defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR) && \
-    !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32) && defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR)
   wchar_t* convert_env_buffer (const char* env) const;
 #endif
 };
diff --git a/ACE/ace/Process.inl b/ACE/ace/Process.inl
index b982366b526..4b742af07e4 100644
--- a/ACE/ace/Process.inl
+++ b/ACE/ace/Process.inl
@@ -115,7 +115,7 @@ ACE_Process::exit_code (ACE_exitcode code)
 ACE_INLINE u_long
 ACE_Process_Options::creation_flags () const
 {
-#if defined (ACE_USES_WCHAR) && defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_USES_WCHAR) && defined (ACE_WIN32)
   return creation_flags_ | CREATE_UNICODE_ENVIRONMENT;
 #else
   return creation_flags_;
@@ -170,53 +170,33 @@ ACE_Process_Options::avoid_zombies (int avoid_zombies)
 ACE_INLINE ACE_TEXT_STARTUPINFO *
 ACE_Process_Options::startup_info ()
 {
-#if !defined (ACE_HAS_WINCE)
   return &startup_info_;
-#else
-  return 0;
-#endif /* !ACE_HAS_WINCE */
 }
 
 ACE_INLINE LPSECURITY_ATTRIBUTES
 ACE_Process_Options::get_process_attributes () const
 {
-#if !defined (ACE_HAS_WINCE)
   return process_attributes_;
-#else
-  return 0;
-#endif /* !ACE_HAS_WINCE */
 }
 
 ACE_INLINE LPSECURITY_ATTRIBUTES
 ACE_Process_Options::set_process_attributes ()
 {
-#if !defined (ACE_HAS_WINCE)
   process_attributes_ = &security_buf1_;
   return process_attributes_;
-#else
-  return 0;
-#endif /* !ACE_HAS_WINCE */
 }
 
 ACE_INLINE LPSECURITY_ATTRIBUTES
 ACE_Process_Options::get_thread_attributes () const
 {
-#if !defined (ACE_HAS_WINCE)
   return thread_attributes_;
-#else
-  return 0;
-#endif /* !ACE_HAS_WINCE */
 }
 
 ACE_INLINE LPSECURITY_ATTRIBUTES
 ACE_Process_Options::set_thread_attributes ()
 {
-#if !defined (ACE_HAS_WINCE)
   thread_attributes_ = &security_buf2_;
   return thread_attributes_;
-#else
-  return 0;
-#endif /* !ACE_HAS_WINCE */
 }
 
 ACE_INLINE HANDLE ACE_Process_Options::get_user_token () const
@@ -338,35 +318,23 @@ ACE_Process_Options::command_line_buf (size_t *max_lenp)
 ACE_INLINE ACE_TCHAR *
 ACE_Process_Options::working_directory ()
 {
-#if !defined (ACE_HAS_WINCE)
   if (working_directory_[0] == '\0')
     return 0;
   else
     return working_directory_;
-#else
-  return 0;
-#endif /* !ACE_HAS_WINCE */
 }
 
 ACE_INLINE void
 ACE_Process_Options::working_directory (const char *wd)
 {
-#if !defined(ACE_HAS_WINCE)
   ACE_OS::strcpy (working_directory_, ACE_TEXT_CHAR_TO_TCHAR (wd));
-#else
-  ACE_UNUSED_ARG (wd);
-#endif /* !ACE_HAS_WINCE */
 }
 
 #if defined (ACE_HAS_WCHAR)
 ACE_INLINE void
 ACE_Process_Options::working_directory (const wchar_t *wd)
 {
-#if !defined(ACE_HAS_WINCE)
   ACE_OS::strcpy (working_directory_, ACE_TEXT_WCHAR_TO_TCHAR (wd));
-#else
-  ACE_UNUSED_ARG (wd);
-#endif /* !ACE_HAS_WINCE */
 }
 #endif /* ACE_HAS_WCHAR */
 
@@ -385,38 +353,4 @@ ACE_Process_Options::process_name ()
   return this->process_name_;
 }
 
-#if defined (ACE_HAS_WINCE)
-// Here is a collection of inline functions which are defined only
-// under CE.  They are not empty on most other platforms.
-
-ACE_INLINE int
-ACE_Process_Options::setenv (ACE_TCHAR * /* envp */[])
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Process_Options::setenv (const ACE_TCHAR * /* format */, ...)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Process_Options::setenv (const ACE_TCHAR * /* variable_name */,
-                             const ACE_TCHAR * /* format */,
-                             ...)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Process_Options::set_handles (ACE_HANDLE /* std_in */,
-                                  ACE_HANDLE /* std_out */,
-                                  ACE_HANDLE /* std_err */)
-{
-  return -1;
-}
-
-#endif /* ACE_HAS_WINCE */
-
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/README b/ACE/ace/README
index d43ec628884..af8df013528 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -145,7 +145,6 @@ ACE_DEFAULT_LD_SEARCH_PATH              Specify the platform default search
                                         paths.  This macro should only be
                                         defined on platforms that don't
                                         support environment variables at all
-                                        (i.e., Windows CE.)
 ACE_THREADS_DONT_INHERIT_LOG_MSG        Specify this if you don't want
                                         threads to inherit parent
                                         thread's ACE_Log_Msg
diff --git a/ACE/ace/Reactor.cpp b/ACE/ace/Reactor.cpp
index e08c9b9d141..d969f84f277 100644
--- a/ACE/ace/Reactor.cpp
+++ b/ACE/ace/Reactor.cpp
@@ -169,13 +169,13 @@ ACE_Reactor::name ()
 int
 ACE_Reactor::check_reconfiguration (ACE_Reactor *)
 {
-#if !defined (ACE_HAS_WINCE)  &&  !defined (ACE_LACKS_ACE_SVCCONF)
+#if !defined (ACE_LACKS_ACE_SVCCONF)
   if (ACE_Service_Config::reconfig_occurred ())
     {
       ACE_Service_Config::reconfigure ();
       return 1;
     }
-#endif /* ! ACE_HAS_WINCE || ! ACE_LACKS_ACE_SVCCONF */
+#endif /* !ACE_LACKS_ACE_SVCCONF */
   return 0;
 }
 
diff --git a/ACE/ace/Read_Buffer.cpp b/ACE/ace/Read_Buffer.cpp
index e3667a66b07..ba174065181 100644
--- a/ACE/ace/Read_Buffer.cpp
+++ b/ACE/ace/Read_Buffer.cpp
@@ -41,7 +41,6 @@ ACE_Read_Buffer::ACE_Read_Buffer (FILE *fp,
     this->allocator_ = ACE_Allocator::instance ();
 }
 
-#if !defined (ACE_HAS_WINCE)
 ACE_Read_Buffer::ACE_Read_Buffer (ACE_HANDLE handle,
                                   bool close_on_delete,
                                   ACE_Allocator *alloc)
@@ -56,7 +55,6 @@ ACE_Read_Buffer::ACE_Read_Buffer (ACE_HANDLE handle,
   if (this->allocator_ == 0)
     this->allocator_ = ACE_Allocator::instance ();
 }
-#endif  // ACE_HAS_WINCE
 
 ACE_Read_Buffer::~ACE_Read_Buffer ()
 {
diff --git a/ACE/ace/Read_Buffer.h b/ACE/ace/Read_Buffer.h
index d91adb95f37..ee3a96133b0 100644
--- a/ACE/ace/Read_Buffer.h
+++ b/ACE/ace/Read_Buffer.h
@@ -49,14 +49,10 @@ public:
                    bool close_on_delete = false,
                    ACE_Allocator * = 0);
 
-#if !defined (ACE_HAS_WINCE)
-  // Note that ACE_HANDLE = FILE under CE.
-
   /// Read from an open HANDLE.
   ACE_Read_Buffer (ACE_HANDLE handle,
                    bool close_on_delete = false,
                    ACE_Allocator * = 0);
-#endif  // ACE_HAS_WINCE
 
   /// Closes the FILE *.
   ~ACE_Read_Buffer ();
diff --git a/ACE/ace/Recursive_Thread_Mutex.cpp b/ACE/ace/Recursive_Thread_Mutex.cpp
index 398f56bff1e..1f7b2dc8129 100644
--- a/ACE/ace/Recursive_Thread_Mutex.cpp
+++ b/ACE/ace/Recursive_Thread_Mutex.cpp
@@ -79,7 +79,7 @@ int
 ACE_Recursive_Thread_Mutex::get_nesting_level ()
 {
   // ACE_TRACE ("ACE_Recursive_Thread_Mutex::get_nesting_level");
-#if defined (ACE_HAS_VXTHREADS) || defined (ACE_HAS_PHARLAP) || defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_VXTHREADS) || defined (ACE_HAS_PHARLAP)
   ACE_NOTSUP_RETURN (-1);
 #elif defined (ACE_HAS_RECURSIVE_MUTEXES)
 # if defined (ACE_WIN32)
@@ -99,7 +99,7 @@ ACE_Recursive_Thread_Mutex::get_nesting_level ()
   nesting_level = this->lock_.nesting_level_;
   ACE_OS::mutex_unlock (&this->lock_.nesting_mutex_);
   return nesting_level;
-#endif /* !ACE_HAS_WINCE */
+#endif /* ACE_HAS_VXTHREADS || ACE_HAS_PHARLAP */
 }
 
 void
diff --git a/ACE/ace/Registry.cpp b/ACE/ace/Registry.cpp
index 4e7a2aa78e2..ddd8e77923e 100644
--- a/ACE/ace/Registry.cpp
+++ b/ACE/ace/Registry.cpp
@@ -1071,12 +1071,6 @@ ACE_Predefined_Naming_Contexts::connect (ACE_Registry::Naming_Context &naming_co
                                          HKEY predefined,
                                          const ACE_TCHAR *machine_name)
 {
-#if defined (ACE_HAS_WINCE)
-  ACE_UNUSED_ARG(naming_context);
-  ACE_UNUSED_ARG(predefined);
-  ACE_UNUSED_ARG(machine_name);
-  return -1;
-#else
   long result = -1;
 
   if (machine_name != 0 && ACE_OS::strcmp (ACE_TEXT ("localhost"), machine_name) == 0)
@@ -1101,10 +1095,9 @@ ACE_Predefined_Naming_Contexts::connect (ACE_Registry::Naming_Context &naming_co
     }
 
   ACE_REGISTRY_CALL_RETURN (result);
-#endif  // ACE_HAS_WINCE
 }
 
-// Check if <machine_name> is the local host
+/// Check if @a machine_name is the local host
 /* static */
 int
 ACE_Predefined_Naming_Contexts::is_local_host (const ACE_TCHAR *machine_name)
diff --git a/ACE/ace/SOCK_Acceptor.cpp b/ACE/ace/SOCK_Acceptor.cpp
index 19af145fa81..b0c62030d7e 100644
--- a/ACE/ace/SOCK_Acceptor.cpp
+++ b/ACE/ace/SOCK_Acceptor.cpp
@@ -13,9 +13,7 @@
 #include "ace/SOCK_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
-#if !defined (ACE_HAS_WINCE)
 #include "ace/OS_QoS.h"
-#endif  // ACE_HAS_WINCE
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -154,7 +152,6 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream,
                                      reset_new_handle);
 }
 
-#if !defined (ACE_HAS_WINCE)
 int
 ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream,
                            ACE_Accept_QoS_Params qos_params,
@@ -206,7 +203,6 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream,
                                      in_blocking_mode,
                                      reset_new_handle);
 }
-#endif  // ACE_HAS_WINCE
 
 void
 ACE_SOCK_Acceptor::dump () const
diff --git a/ACE/ace/SOCK_Acceptor.h b/ACE/ace/SOCK_Acceptor.h
index 1dc947fb9cf..a4035fcd92d 100644
--- a/ACE/ace/SOCK_Acceptor.h
+++ b/ACE/ace/SOCK_Acceptor.h
@@ -119,7 +119,6 @@ public:
               bool restart = true,
               bool reset_new_handle = false) const;
 
-#if !defined (ACE_HAS_WINCE)
   /**
    * Accept a new ACE_SOCK_Stream connection using the QoS
    * information in @a qos_params.  A @a timeout of 0 means block
@@ -136,7 +135,6 @@ public:
               ACE_Time_Value *timeout = 0,
               bool restart = true,
               bool reset_new_handle = false) const;
-#endif  // ACE_HAS_WINCE
 
   // = Meta-type info
   typedef ACE_INET_Addr PEER_ADDR;
diff --git a/ACE/ace/SOCK_Connector.cpp b/ACE/ace/SOCK_Connector.cpp
index cba9987fa0e..df7cb39adc4 100644
--- a/ACE/ace/SOCK_Connector.cpp
+++ b/ACE/ace/SOCK_Connector.cpp
@@ -8,9 +8,7 @@
 # include "ace/Malloc_Base.h"
 #endif /* ACE_HAS_ALLOC_HOOKS */
 
-#if !defined (ACE_HAS_WINCE)
 #include "ace/OS_QoS.h"
-#endif  // ACE_HAS_WINCE
 
 #if !defined (__ACE_INLINE__)
 #include "ace/SOCK_Connector.inl"
@@ -216,7 +214,6 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream,
   return this->shared_connect_finish (new_stream, timeout, result);
 }
 
-#if !defined (ACE_HAS_WINCE)
 int
 ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream,
                              const ACE_Addr &remote_sap,
@@ -264,10 +261,8 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream,
 
   return this->shared_connect_finish (new_stream, timeout, result);
 }
-#endif  // ACE_HAS_WINCE
 
 // Try to complete a non-blocking connection.
-
 int
 ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream,
                               ACE_Addr *remote_sap,
@@ -344,7 +339,6 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream,
                 ACE_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector")));
 }
 
-#if !defined (ACE_HAS_WINCE)
 ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream,
                                         const ACE_Addr &remote_sap,
                                         ACE_QoS_Params qos_params,
@@ -374,6 +368,5 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector")));
 }
-#endif  // ACE_HAS_WINCE
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/SOCK_Connector.h b/ACE/ace/SOCK_Connector.h
index 2a7dde20db4..ddf4e324434 100644
--- a/ACE/ace/SOCK_Connector.h
+++ b/ACE/ace/SOCK_Connector.h
@@ -90,7 +90,6 @@ public:
                       int perms = 0,
                       int protocol = 0);
 
-#if !defined (ACE_HAS_WINCE)
   /**
    * Actively connect to a peer, producing a connected @c ACE_SOCK_Stream
    * object if the connection succeeds.
@@ -139,7 +138,6 @@ public:
                       u_long flags = 0,
                       int reuse_addr = 0,
                       int perms = 0);
-#endif  // ACE_HAS_WINCE
 
   /**
    * Actively connect to a peer, producing a connected @c ACE_SOCK_Stream
@@ -191,7 +189,6 @@ public:
                int perms = 0,
                int protocol = 0);
 
-#if !defined (ACE_HAS_WINCE)
   /**
    * Actively connect to a peer, producing a connected @c ACE_SOCK_Stream
    * object if the connection succeeds.
@@ -244,7 +241,6 @@ public:
                u_long flags = 0,
                int reuse_addr = 0,
                int perms = 0);
-#endif  // ACE_HAS_WINCE
 
   /// Default destructor.
   ~ACE_SOCK_Connector ();
diff --git a/ACE/ace/SPIPE_Connector.cpp b/ACE/ace/SPIPE_Connector.cpp
index 2f8e4a96269..c507b47ee92 100644
--- a/ACE/ace/SPIPE_Connector.cpp
+++ b/ACE/ace/SPIPE_Connector.cpp
@@ -67,8 +67,7 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io,
   ACE_HANDLE handle;
 
   ACE_UNUSED_ARG (pipe_mode);
-#if defined (ACE_WIN32) && \
-   !defined (ACE_HAS_PHARLAP) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
   // We need to allow for more than one attempt to connect,
   // calculate the absolute time at which we give up.
   ACE_Time_Value absolute_time;
@@ -148,7 +147,7 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io,
   handle = ACE::handle_timed_open (timeout,
                                               remote_sap.get_path_name (),
                                               flags, perms, sa);
-#endif /* !ACE_WIN32 || ACE_HAS_PHARLAP || ACE_HAS_WINCE */
+#endif /* !ACE_WIN32 || ACE_HAS_PHARLAP */
 
   new_io.set_handle (handle);
   new_io.remote_addr_ = remote_sap; // class copy.
diff --git a/ACE/ace/SPIPE_Stream.inl b/ACE/ace/SPIPE_Stream.inl
index 08b9071b2fa..6f78a4fe5cd 100644
--- a/ACE/ace/SPIPE_Stream.inl
+++ b/ACE/ace/SPIPE_Stream.inl
@@ -102,9 +102,7 @@ ACE_SPIPE_Stream::send_handle (ACE_HANDLE handle) const
   ACE_TRACE ("ACE_SPIPE_Stream::send_handle");
 #if defined (ACE_HAS_STREAM_PIPES)
   return ACE_OS::ioctl (this->get_handle (), I_SENDFD, (void *) handle);
-#elif defined (ACE_WIN32) && \
-      (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) && \
-       !defined (ACE_HAS_WINCE)   /* CE4 has WS2 but not WSADuplicateSocket */
+#elif defined (ACE_WIN32) && (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
   DWORD procID;
   WSAPROTOCOL_INFO protInfo;
   ssize_t res = this->recv(&procID, sizeof(procID));
diff --git a/ACE/ace/SSL/SSL_Asynch_BIO.cpp b/ACE/ace/SSL/SSL_Asynch_BIO.cpp
index 64aa14c6ab9..0faa775fc0f 100644
--- a/ACE/ace/SSL/SSL_Asynch_BIO.cpp
+++ b/ACE/ace/SSL/SSL_Asynch_BIO.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 #include "SSL_Asynch_BIO.h"
 
-#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if OPENSSL_VERSION_NUMBER > 0x0090581fL && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS)))
 
 #include "SSL_Asynch_Stream.h"
 #include "ace/OS_NS_string.h"
diff --git a/ACE/ace/SSL/SSL_Asynch_BIO.h b/ACE/ace/SSL/SSL_Asynch_BIO.h
index 70b1a0fcc00..1d5aec2ff5d 100644
--- a/ACE/ace/SSL/SSL_Asynch_BIO.h
+++ b/ACE/ace/SSL/SSL_Asynch_BIO.h
@@ -25,7 +25,7 @@
 
 #include <openssl/bio.h>
 
-#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if OPENSSL_VERSION_NUMBER > 0x0090581fL && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS)))
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 extern BIO * ACE_SSL_make_BIO (void * ssl_asynch_stream);
diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.cpp b/ACE/ace/SSL/SSL_Asynch_Stream.cpp
index a673b6f371a..ed5a1e1f440 100644
--- a/ACE/ace/SSL/SSL_Asynch_Stream.cpp
+++ b/ACE/ace/SSL/SSL_Asynch_Stream.cpp
@@ -1,7 +1,7 @@
 #include "SSL_Asynch_Stream.h"
 
 // This only works on platforms with Asynchronous IO support.
-#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if OPENSSL_VERSION_NUMBER > 0x0090581fL && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS)))
 
 #if defined (ACE_WIN32)
 # include "ace/WIN32_Proactor.h"
diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.h b/ACE/ace/SSL/SSL_Asynch_Stream.h
index 39fb2bb46e2..db86bf1f9f8 100644
--- a/ACE/ace/SSL/SSL_Asynch_Stream.h
+++ b/ACE/ace/SSL/SSL_Asynch_Stream.h
@@ -18,7 +18,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if OPENSSL_VERSION_NUMBER > 0x0090581fL && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS)))
 
 #include "SSL_Asynch_BIO.h"
 
diff --git a/ACE/ace/Sched_Params.cpp b/ACE/ace/Sched_Params.cpp
index 8f63c093432..3c5b3eaa121 100644
--- a/ACE/ace/Sched_Params.cpp
+++ b/ACE/ace/Sched_Params.cpp
@@ -108,14 +108,10 @@ ACE_Sched_Params::priority_min (const Policy policy,
         }
     }
 
-#elif defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE)
+#elif defined (ACE_HAS_WTHREADS)
   ACE_UNUSED_ARG (policy);
   ACE_UNUSED_ARG (scope);
   return THREAD_PRIORITY_IDLE;
-#elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WINCE)
-  ACE_UNUSED_ARG (policy);
-  ACE_UNUSED_ARG (scope);
-  return 255;
 #elif defined (ACE_VXWORKS)
   ACE_UNUSED_ARG (policy);
   ACE_UNUSED_ARG (scope);
@@ -216,14 +212,10 @@ ACE_Sched_Params::priority_max (const Policy policy,
         }
     }
 
-#elif defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE)
+#elif defined (ACE_HAS_WTHREADS)
   ACE_UNUSED_ARG (policy);
   ACE_UNUSED_ARG (scope);
   return THREAD_PRIORITY_TIME_CRITICAL;
-#elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WINCE)
-  ACE_UNUSED_ARG (policy);
-  ACE_UNUSED_ARG (scope);
-  return 0;
 #elif defined (ACE_VXWORKS)
   ACE_UNUSED_ARG (policy);
   ACE_UNUSED_ARG (scope);
@@ -244,7 +236,7 @@ ACE_Sched_Params::next_priority (const Policy policy,
                                  const int priority,
                                  const int scope)
 {
-#if defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WTHREADS)
   ACE_UNUSED_ARG (policy);
   ACE_UNUSED_ARG (scope);
   switch (priority)
@@ -272,7 +264,7 @@ ACE_Sched_Params::next_priority (const Policy policy,
   // including STHREADS, and PTHREADS
   int const max = priority_max (policy, scope);
   return priority < max  ?  priority + 1  :  max;
-#elif defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE)
+#elif defined (ACE_VXWORKS)
   int const max = priority_max (policy, scope);
   return priority > max ?  priority - 1 :  max;
 #else
@@ -288,7 +280,7 @@ ACE_Sched_Params::previous_priority (const Policy policy,
                                      const int priority,
                                      const int scope)
 {
-#if defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WTHREADS)
   ACE_UNUSED_ARG (policy);
   ACE_UNUSED_ARG (scope);
   switch (priority)
@@ -316,7 +308,7 @@ ACE_Sched_Params::previous_priority (const Policy policy,
   // including STHREADS and PTHREADS
   int const min = priority_min (policy, scope);
   return priority > min ? priority - 1 : min;
-#elif defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE)
+#elif defined (ACE_VXWORKS)
   int const min = priority_min (policy, scope);
   return priority < min ?  priority + 1 :  min;
 #else
diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h
index d77fc253625..a3a785bad42 100644
--- a/ACE/ace/Service_Config.h
+++ b/ACE/ace/Service_Config.h
@@ -542,16 +542,6 @@ private:
   /// from the ACE_Reactor, and unlinking it if necessary.
   static int remove (const ACE_TCHAR svc_name[]);
 
-#if defined (ACE_HAS_WINCE) && defined (ACE_USES_WCHAR)
-  // We must provide these function to bridge the Svc_Conf parser
-  // with ACE.
-  static int initialize (const ACE_Service_Type *, ACE_ANTI_TCHAR []);
-  static int initialize (const char svc_name[], ACE_ANTI_TCHAR parameters[]);
-  static int resume (const ACE_ANTI_TCHAR svc_name[]);
-  static int suspend (const ACE_ANTI_TCHAR svc_name[]);
-  static int remove (const ACE_ANTI_TCHAR svc_name[]);
-#endif /* ACE_HAS_WINCE */
-
   /// Dump the state of an object.
   void dump () const;
 
diff --git a/ACE/ace/Service_Config.inl b/ACE/ace/Service_Config.inl
index 4f187015bcc..eeb2911af6f 100644
--- a/ACE/ace/Service_Config.inl
+++ b/ACE/ace/Service_Config.inl
@@ -166,40 +166,4 @@ ACE_Service_Config::process_directive (const ACE_Static_Svc_Descriptor &ssd,
   return ACE_Service_Config::current ()->process_directive (ssd, force_replace);
 }
 
-
-#if defined (ACE_HAS_WINCE) && defined (ACE_USES_WCHAR)
-// We must provide these function to bridge Svc_Conf parser with ACE.
-
-ACE_INLINE int
-ACE_Service_Config::initialize (const ACE_Service_Type *sp, ACE_ANTI_TCHAR parameters[])
-{
-  return ACE_Service_Config::initialize (sp, ACE_TEXT_ANTI_TO_TCHAR (parameters));
-}
-
-ACE_INLINE int
-ACE_Service_Config::initialize (const ACE_ANTI_TCHAR svc_name[], ACE_ANTI_TCHAR parameters[])
-{
-  return ACE_Service_Config::initialize (ACE_TEXT_ANTI_TO_TCHAR (svc_name),
-                                         ACE_TEXT_ANTI_TO_TCHAR (parameters));
-}
-
-ACE_INLINE int
-ACE_Service_Config::resume (const ACE_ANTI_TCHAR svc_name[])
-{
-  return ACE_Service_Config::resume (ACE_TEXT_ANTI_TO_TCHAR (svc_name));
-}
-
-ACE_INLINE int
-ACE_Service_Config::suspend (const ACE_ANTI_TCHAR svc_name[])
-{
-  return ACE_Service_Config::suspend (ACE_TEXT_ANTI_TO_TCHAR (svc_name));
-}
-
-ACE_INLINE int
-ACE_Service_Config::remove (const ACE_ANTI_TCHAR svc_name[])
-{
-  return ACE_Service_Config::remove (ACE_TEXT_ANTI_TO_TCHAR (svc_name));
-}
-#endif /* ACE_HAS_WINCE && !ACE_USES_WCHAR */
-
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp
index 6f19185c439..3bdfb53c03a 100644
--- a/ACE/ace/Sock_Connect.cpp
+++ b/ACE/ace/Sock_Connect.cpp
@@ -38,15 +38,6 @@ const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_IN
 const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT;
 #endif /* ACE_VXWORKS <= 0x670 && __RTP__ && ACE_HAS_IPV6 */
 
-#if defined (ACE_HAS_WINCE)
-#include /**/ <iphlpapi.h>
-# if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && (_WIN32_WCE < 0x600) && defined (ACE_HAS_IPV6)
-#  include /**/ <ws2tcpip.h>
-const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
-const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT;
-# endif
-#endif  // ACE_HAS_WINCE
-
 #if defined (ACE_WIN32) && defined (ACE_HAS_PHARLAP)
 # include "ace/OS_NS_stdio.h"
 #endif
@@ -468,105 +459,7 @@ static int
 get_ip_interfaces_win32 (size_t &count,
                          ACE_INET_Addr *&addrs)
 {
-# if defined (ACE_HAS_WINCE) && defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
-  // moved the ACE_HAS_WINCE impl ahaid of ACE_HAS_WINSOCK2 because
-  // WINCE in fact has winsock2, but doesn't properly support the
-  // WSAIoctl for obtaining IPv6 address info.
-  PIP_ADAPTER_ADDRESSES AdapterAddresses = 0;
-  ULONG OutBufferLength = 0;
-  ULONG RetVal = 0;
-  unsigned char *octet_buffer = 0;
-
-  RetVal =
-    GetAdaptersAddresses(AF_UNSPEC,
-                         0,
-                         0,
-                         AdapterAddresses,
-                         &OutBufferLength);
-
-  if (RetVal != ERROR_BUFFER_OVERFLOW)
-    {
-      return -1;
-    }
-
-  ACE_NEW_RETURN (octet_buffer, unsigned char[OutBufferLength],-1);
-  AdapterAddresses = (IP_ADAPTER_ADDRESSES *)octet_buffer;
-
-  RetVal =
-    GetAdaptersAddresses(AF_UNSPEC,
-                         0,
-                         0,
-                         AdapterAddresses,
-                         &OutBufferLength);
-
-  if (RetVal != NO_ERROR)
-    {
-      delete [] octet_buffer;
-      return -1;
-     }
-
-  // If successful, output some information from the data we received
-  PIP_ADAPTER_ADDRESSES AdapterList = AdapterAddresses;
-  while (AdapterList)
-    {
-      if (AdapterList->OperStatus == IfOperStatusUp)
-        {
-          if (AdapterList->IfIndex != 0)
-            ++count;
-          if (AdapterList->Ipv6IfIndex != 0)
-            ++count;
-        }
-      AdapterList = AdapterList->Next;
-    }
-
-  AdapterList = AdapterAddresses;
-
-  ACE_NEW_RETURN (addrs, ACE_INET_Addr[count],-1);
-  count = 0;
-  for (AdapterList =  AdapterAddresses;
-       AdapterList != 0;
-       AdapterList = AdapterList->Next)
-    {
-      if (AdapterList->OperStatus != IfOperStatusUp)
-        continue;
-
-      IP_ADAPTER_UNICAST_ADDRESS *uni = 0;
-      if (AdapterList->IfIndex != 0)
-        for (uni = AdapterList->FirstUnicastAddress;
-             uni != 0;
-             uni = uni->Next)
-          {
-            SOCKET_ADDRESS *sa_addr = &uni->Address;
-            if (sa_addr->lpSockaddr->sa_family == AF_INET)
-              {
-                sockaddr_in *sin = (sockaddr_in*)sa_addr->lpSockaddr;
-                addrs[count].set(sin,sa_addr->iSockaddrLength);
-                ++count;
-                break;
-              }
-          }
-      if (AdapterList->Ipv6IfIndex != 0)
-        {
-        for (uni = AdapterList->FirstUnicastAddress;
-             uni != 0;
-             uni = uni->Next)
-            {
-              SOCKET_ADDRESS *sa_addr = &uni->Address;
-              if (sa_addr->lpSockaddr->sa_family == AF_INET6)
-                {
-                  sockaddr_in *sin = (sockaddr_in*)sa_addr->lpSockaddr;
-                  addrs[count].set(sin,sa_addr->iSockaddrLength);
-                  ++count;
-                  break;
-                }
-            }
-        }
-    }
-
-  delete [] octet_buffer;
-  return 0;
-
-# elif defined (ACE_HAS_PHARLAP)
+# if defined (ACE_HAS_PHARLAP)
   // PharLap ETS has its own kernel routines to rummage through the device
   // configs and extract the interface info, but only for Pharlap RT.
 #   if !defined (ACE_HAS_PHARLAP_RT)
@@ -766,7 +659,7 @@ get_ip_interfaces_win32 (size_t &count,
 
   return 0;
 
-# endif /* ACE_HAS_WINCE */
+# endif /* ACE_HAS_PHARLAP */
 }
 
 #elif defined (ACE_HAS_GETIFADDRS)
diff --git a/ACE/ace/Stack_Trace.cpp b/ACE/ace/Stack_Trace.cpp
index 3cf26a354fd..dd1f0efa535 100644
--- a/ACE/ace/Stack_Trace.cpp
+++ b/ACE/ace/Stack_Trace.cpp
@@ -470,8 +470,7 @@ ACE_Stack_Trace::generate_trace (ssize_t, size_t)
     "ACE is built with _WIN32_WINNT set to 0x501 or above>");
 }
 
-#elif defined(ACE_WIN32) && !defined(ACE_HAS_WINCE) && !defined (__MINGW32__) \
-      && !defined(__BORLANDC__)
+#elif defined(ACE_WIN32) && !defined (__MINGW32__) && !defined(__BORLANDC__)
 #  include <windows.h>
 #  include <Dbghelp.h>
 
diff --git a/ACE/ace/Stack_Trace.h b/ACE/ace/Stack_Trace.h
index 14cdcc0126b..dce77355f45 100644
--- a/ACE/ace/Stack_Trace.h
+++ b/ACE/ace/Stack_Trace.h
@@ -53,7 +53,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  *          (this covers Linux and Mac) and gcc version >= 3.3.
  *        - VxWorks, both kernel and RTP
  *        - Solaris
- *        - Windows 32 and 64 bit (Visual C++, excluding WinCE/mobile)
+ *        - Windows 32 and 64 bit (Visual C++)
  *
  *  @note Since stack trace buffer size has limitation(@c ACE_STACK_TRACE_SYMBUFSIZ), you will not
  *        get a complete stack trace if @c ACE_STACK_TRACE_SYMBUFSIZ value is less than actual stack
diff --git a/ACE/ace/TSS_T.cpp b/ACE/ace/TSS_T.cpp
index 9d3444c0793..c483d468db3 100644
--- a/ACE/ace/TSS_T.cpp
+++ b/ACE/ace/TSS_T.cpp
@@ -156,15 +156,10 @@ ACE_TSS<TYPE>::ACE_TSS (TYPE *ts_obj)
           // Save/restore errno.
           ACE_Errno_Guard error (errno);
           // What should we do if this call fails?!
-#if defined (ACE_HAS_WINCE)
-          ::MessageBox (0,
-                        ACE_TEXT ("ACE_Thread::keycreate() failed!"),
-                        ACE_TEXT ("ACE_TSS::ACE_TSS"),
-                        MB_OK);
-#elif !defined (ACE_LACKS_VA_FUNCTIONS)
+#if !defined (ACE_LACKS_VA_FUNCTIONS)
           ACE_OS::fprintf (stderr,
                            "ACE_Thread::keycreate() failed!");
-#endif /* ACE_HAS_WINCE */
+#endif /* !ACE_LACKS_VA_FUNCTIONS */
           return;
         }
 
diff --git a/ACE/ace/Token.h b/ACE/ace/Token.h
index 9d024820b24..909c25c3cb5 100644
--- a/ACE/ace/Token.h
+++ b/ACE/ace/Token.h
@@ -27,7 +27,7 @@
 
 #include "ace/Thread_Mutex.h"
 
-#if (defined (ACE_WIN32) && !defined (ACE_USES_WINCE_SEMA_SIMULATION)) || defined (ACE_HAS_VXTHREADS)
+#if defined (ACE_WIN32) || defined (ACE_HAS_VXTHREADS)
 // If platforms support semaphores with timed wait, then we use semaphores instead of c.v.
 # define ACE_TOKEN_USES_SEMAPHORE
 #endif /* ACE_WIN32 || ACE_HAS_VXTHREADS */
diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp
index 30f664ba6ab..f5cd8859ebb 100644
--- a/ACE/ace/WFMO_Reactor.cpp
+++ b/ACE/ace/WFMO_Reactor.cpp
@@ -1758,48 +1758,7 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time,
   // will not be able to dispatch it
 
   // We need to wait for both the <lock_> and <ok_to_wait_> event.
-  // If not on WinCE, use WaitForMultipleObjects() to wait for both atomically.
-  // On WinCE, the waitAll arg to WFMO must be false, so wait for the
-  // ok_to_wait_ event first (since that's likely to take the longest) then
-  // grab the lock and recheck the ok_to_wait_ event. When we can get them
-  // both, or there's an error/timeout, return.
-#if defined (ACE_HAS_WINCE)
-  ACE_UNUSED_ARG (alertable);
-  ACE_Time_Value timeout;
-  if (max_wait_time != 0)
-    {
-      timeout = ACE_OS::gettimeofday ();
-      timeout += *max_wait_time;
-    }
-  while (1)
-    {
-      int status;
-      if (max_wait_time == 0)
-        status = this->ok_to_wait_.wait ();
-      else
-        status = this->ok_to_wait_.wait (&timeout);
-      if (status == -1)
-        return -1;
-      // The event is signaled, so it's ok to wait; grab the lock and
-      // recheck the event. If something has changed, restart the wait.
-      if (max_wait_time == 0)
-        status = this->lock_.acquire ();
-      else
-        {
-          status = this->lock_.acquire (timeout);
-        }
-      if (status == -1)
-        return -1;
-
-      // Have the lock_, now re-check the event. If it's not signaled,
-      // another thread changed something so go back and wait again.
-      if (this->ok_to_wait_.wait (&ACE_Time_Value::zero, 0) == 0)
-        break;
-      this->lock_.release ();
-    }
-  return 1;
-
-#else
+  // Use WaitForMultipleObjects() to wait for both atomically.
   int timeout = max_wait_time == 0 ? INFINITE : max_wait_time->msec ();
   DWORD result = 0;
   while (1)
@@ -1843,7 +1802,6 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time,
 
   // It is ok to enter ::WaitForMultipleObjects
   return 1;
-#endif /* ACE_HAS_WINCE */
 }
 
 DWORD
@@ -1854,7 +1812,7 @@ ACE_WFMO_Reactor::wait_for_multiple_events (int timeout,
   // If <alertable> is enabled allow asynchronous completion of
   // ReadFile and WriteFile operations.
 
-#if defined (ACE_HAS_PHARLAP) || defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_PHARLAP)
   // PharLap doesn't do async I/O and doesn't implement
   // WaitForMultipleObjectsEx, so use WaitForMultipleObjects.
   ACE_UNUSED_ARG (alertable);
@@ -1920,16 +1878,11 @@ ACE_WFMO_Reactor::dispatch (DWORD wait_status)
     case WAIT_FAILED: // Failure.
       ACE_OS::set_errno_to_last_error ();
       return -1;
-
     case WAIT_TIMEOUT: // Timeout.
       errno = ETIME;
       return handlers_dispatched;
-
-#ifndef ACE_HAS_WINCE
     case WAIT_IO_COMPLETION: // APC.
       return handlers_dispatched;
-#endif  // ACE_HAS_WINCE
-
     default:  // Dispatch.
       // We'll let dispatch worry about abandoned mutes.
       handlers_dispatched += this->dispatch_handles (wait_status);
diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc
index 59d06539cc8..6f7aab97019 100644
--- a/ACE/ace/ace.mpc
+++ b/ACE/ace/ace.mpc
@@ -402,7 +402,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
 
     ACE_export.h
     Bound_Ptr.h
-    CE_Screen_Output.h
     Codeset_Symbols.h
     CORBA_macros.h
     Codeset_Symbols.h
diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc
index 6fc36f53daf..723ed4c27b6 100644
--- a/ACE/ace/ace_for_tao.mpc
+++ b/ACE/ace/ace_for_tao.mpc
@@ -360,7 +360,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
     Version.h
     ace_wchar.h
     checked_iterator.h
-    config-WinCE.h
     config-all.h
     config-lite.h
     config-win32-borland.h
diff --git a/ACE/ace/ace_wchar.h b/ACE/ace/ace_wchar.h
index 980d03f0728..9897a6bd93e 100644
--- a/ACE/ace/ace_wchar.h
+++ b/ACE/ace/ace_wchar.h
@@ -38,8 +38,6 @@
 # elif defined (ACE_OPENVMS)
 #   include /**/ <wchar.h>
 #   include /**/ <wctype.h>
-# elif defined (ACE_HAS_WINCE)
-#   include /**/ <wtypes.h>
 # else
 #   include /**/ <cwchar>
 #   include /**/ <cwctype>
@@ -208,9 +206,9 @@ private:
 #endif /* ACE_HAS_ICONV */
 
   /// Disallow these operation.
-  ACE_Ascii_To_Wide ();
-  ACE_Ascii_To_Wide (ACE_Ascii_To_Wide &);
-  ACE_Ascii_To_Wide operator= (ACE_Ascii_To_Wide &);
+  ACE_Ascii_To_Wide () = delete;
+  ACE_Ascii_To_Wide (ACE_Ascii_To_Wide &) = delete;
+  ACE_Ascii_To_Wide operator= (ACE_Ascii_To_Wide &) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/ace_wchar.inl b/ACE/ace/ace_wchar.inl
index 752c177f680..b390b32fc1f 100644
--- a/ACE/ace/ace_wchar.inl
+++ b/ACE/ace/ace_wchar.inl
@@ -116,8 +116,8 @@ inline wchar_t *
 ACE_Ascii_To_Wide::convert (const char *str)
 {
   // Short circuit null pointer case
-  if (str == 0)
-    return 0;
+  if (!str)
+    return nullptr;
 
 # if defined (ACE_WIN32)
   UINT const cp = GetACP ();  // Codepage
diff --git a/ACE/ace/config-WinCE.h b/ACE/ace/config-WinCE.h
deleted file mode 100644
index 4435d96575c..00000000000
--- a/ACE/ace/config-WinCE.h
+++ /dev/null
@@ -1,216 +0,0 @@
-// Note: For WinCE build, simply use: #include "ace/config-win32.h"
-//       It is same as config.h for Windows NT/2k so that you can
-//       share same files and directories for both WinCE and NT/2k
-//       builds, unless you add additional definition(s) for each
-//       specific build or change the output directory.
-
-#ifndef ACE_CONFIG_WINCE_H
-#define ACE_CONFIG_WINCE_H
-
-#include /**/ "ace/pre.h"
-
-#ifndef ACE_CONFIG_WIN32_H
-# error Use config-win32.h in config.h instead of this header
-#endif  // ACE_CONFIG_WIN32_H
-
-#if !defined (_WIN32_WCE)
-# error Define _WIN32_WCE to version (i.e. 500 = 5.0)
-#endif  // _WIN32_WCE
-
-#if (_WIN32_WCE < 500)
-# error ACE requires Windows CE 5.0 and later.
-#endif  // _WIN32_WCE
-
-#if !defined (ACE_HAS_WINCE)
-# define ACE_HAS_WINCE 1
-#endif
-
-// We need these libraries to build:
-#if defined (_MSC_VER)
-#  pragma comment(lib,"corelibc.lib")
-#  pragma comment(linker, "/nodefaultlib:oldnames.lib")
-#endif
-
-// Only DLL version is supported on CE.
-//#if defined (ACE_HAS_DLL)
-//# undef ACE_HAS_DLL
-//#endif  // ACE_HAS_DLL
-//#define ACE_HAS_DLL 1
-
-// Need to define LD search path explicitly on CE because
-// CE doesn't have environment variables and we can't get
-// the information using getenv.
-#define ACE_DEFAULT_LD_SEARCH_PATH ACE_TEXT (".\\;\\windows")
-
-#define ACE_LACKS_ABORT
-#define ACE_LACKS_FCNTL_H
-#define ACE_LACKS_SYS_TYPES_H
-#define ACE_LACKS_GETCWD
-#define ACE_LACKS_ASCTIME
-#define ACE_LACKS_ASCTIME_R
-#define ACE_LACKS_GMTIME
-#define ACE_LACKS_GMTIME_R
-#define ACE_LACKS_LOCALTIME
-#define ACE_LACKS_STRTOK_R
-#define ACE_LACKS_PERROR
-#define ACE_LACKS_STRFTIME
-#define ACE_LACKS_WIN32_SETFILEPOINTEREX
-#define ACE_LACKS_WIN32_SERVICES
-#define ACE_LACKS_WIN32_SECURITY_DESCRIPTORS
-#define ACE_LACKS_GETPROCESSTIMES
-#define ACE_LACKS_PDH_H
-#define ACE_LACKS_PDHMSG_H
-#define ACE_LACKS_TIME
-#define ACE_LACKS_TZSET
-#define ACE_LACKS_RAISE
-#define ACE_LACKS_BSEARCH
-
-#define ACE_LACKS_MSG_WFMO
-#define ACE_LACKS_UMASK
-#define ACE_HAS_TYPES_H
-#define ACE_LACKS_DEV_T
-
-#define ACE_ISCTYPE_EQUIVALENT ::_isctype
-
-// WinCE only supports the UNICODE API
-#if !defined (ACE_USES_WCHAR)
-# define ACE_USES_WCHAR
-#endif /* ACE_USES_WCHAR */
-
-#if (_WIN32_WCE < 0x600)
-# define ACE_USES_WINCE_SEMA_SIMULATION
-# define ACE_LACKS_ERRNO_H
-# define ACE_LACKS_DUP
-# define ACE_LACKS_GETSYSTEMTIMEASFILETIME
-#endif /*  (_WIN32_WCE < 0x600) */
-
-#define ACE_LACKS_REGNOTIFYCHANGEKEYVALUE
-
-#define ACE_HAS_NONSTATIC_OBJECT_MANAGER 1
-
-#if ! defined(ACE_DEFAULT_THREAD_KEYS)
-# define ACE_DEFAULT_THREAD_KEYS TLS_MINIMUM_AVAILABLE
-#endif // ! defined(ACE_DEFAULT_THREAD_KEYS)
-
-// FILE stuff isn't always defined in CE
-#if !defined (_FILE_DEFINED)
-  typedef void FILE;
-# define _FILE_DEFINED
-#endif  /* !_FILE_DEFINED */
-
-// This was defined in previous versions of CE, but not 2.11
-#define EXCEPTION_ACCESS_VIOLATION STATUS_ACCESS_VIOLATION
-
-#define ACE_MAIN WINAPI WinMain
-
-// SH3 cross-compiler can't handle inline functions correctly
-// (along with other bugs.)
-#if defined (SH3)
-# define ACE_LACKS_INLINE_FUNCTIONS
-#endif  // SH3 && _DEBUG
-
-#ifndef ACE_DEFAULT_SERVER_HOST
-# define ACE_DEFAULT_SERVER_HOST ACE_TEXT("localhost")
-#endif  // ACE_DEFAULT_SERVER_HOST
-
-// @@ Need to remap every function that uses any of these flags to
-//    Win32 API.  These are for ANSI styled function and are not
-//    available on WinCE.
-
-#define _O_RDONLY       0x0000  // open for reading only
-#define _O_WRONLY       0x0001  // open for writing only
-#define _O_RDWR         0x0002  // open for reading and writing
-#define _O_APPEND       0x0008  // writes done at eof
-
-#define _O_CREAT        0x0100  // create and open file
-#define _O_TRUNC        0x0200  // open and truncate
-#define _O_EXCL         0x0400  // open only if file doesn't already exist
-
-// O_TEXT files have <cr><lf> sequences translated to <lf> on read()'s,
-// and <lf> sequences translated to <cr><lf> on write()'s
-#define _O_TEXT         0x4000  // file mode is text (translated)
-#define _O_BINARY       0x8000  // file mode is binary (untranslated)
-
-// Temporary file bit - file is deleted when last handle is closed
-#define _O_TEMPORARY    0x0040  // temporary file bit
-
-// Non-ANSI names
-#define O_RDONLY        _O_RDONLY
-#define O_WRONLY        _O_WRONLY
-#define O_RDWR          _O_RDWR
-#define O_APPEND        _O_APPEND
-#define O_CREAT         _O_CREAT
-#define O_TRUNC         _O_TRUNC
-#define O_EXCL          _O_EXCL
-#define O_TEXT          _O_TEXT
-#define O_BINARY        _O_BINARY
-#define O_TEMPORARY     _O_TEMPORARY
-
-// @@ NSIG value.  This is definitely not correct.
-#define NSIG 23
-
-#if !defined (FILE_MAP_COPY)
-#define FILE_MAP_COPY 0
-#endif
-
-#define ACE_HAS_INTERLOCKED_EXCHANGEADD
-#define ACE_LACKS_ACCESS
-#define ACE_LACKS__WACCESS
-#define ACE_HAS_ACCESS_EMULATION
-#define ACE_LACKS_EXEC
-#define ACE_LACKS_MKTEMP
-#define ACE_LACKS_ISATTY
-#define ACE_LACKS_STRERROR
-#define ACE_LACKS_SYSTEM
-#define ACE_LACKS_PIPE
-
-#define ACE_LACKS_CHDIR
-#define ACE_LACKS_GETENV
-#define ACE_LACKS_SETENV
-#define ACE_LACKS_UNSETENV
-#define ACE_LACKS_PUTENV
-#define ACE_LACKS_GETENVSTRINGS
-#define ACE_LACKS_STRENVDUP
-#define ACE_LACKS_REALPATH
-#define ACE_LACKS_SWAB
-#define ACE_LACKS_TEMPNAM
-
-#if defined (_WIN32_WCE_EMULATION)
-// @@ For some reason, qsort isn't defined correctly (_stdcall vs _cdecl)
-// under emulation.  So for right now, exclude it.
-# define ACE_LACKS_QSORT
-#endif  // _WIN32_WCE_EMULATION
-
-#if !defined (BUFSIZ)
-# define BUFSIZ 1024
-#endif
-
-#define ACE_HAS_WINCE_BROKEN_ERRNO
-
-#define ACE_HAS_STRDUP_EMULATION
-
-#if !defined (MAXSYMLINKS)
-# define MAXSYMLINKS 0
-#endif
-
-// WinCE can't do fixed addresses for memory-mapped files.
-#if defined (ACE_DEFAULT_BASE_ADDR)
-# undef ACE_DEFAULT_BASE_ADDR
-#endif
-#define ACE_DEFAULT_BASE_ADDR 0
-
-#if (_WIN32_WCE < 0x600)
-# define ACE_HAS_TSS_EMULATION
-#endif  // WinCE version < 6.0
-
-// CE doesn't support FILE_SHARE_DELETE like regular windows
-#if !defined (ACE_DEFAULT_FILE_PERMS)
-# define ACE_DEFAULT_FILE_PERMS (FILE_SHARE_READ | FILE_SHARE_WRITE)
-#endif
-
-#define ACE_LACKS_SIGNAL_H
-#define ACE_LACKS_SYS_STAT_H
-
-#include /**/ "ace/post.h"
-
-#endif  // ACE_CONFIG_WINCE_H
diff --git a/ACE/ace/config-face-safety.h b/ACE/ace/config-face-safety.h
index b06fed1e5b0..4ea75367230 100644
--- a/ACE/ace/config-face-safety.h
+++ b/ACE/ace/config-face-safety.h
@@ -216,8 +216,8 @@
 
 #ifdef ACE_FACE_SAFETY_EXTENDED
 
-# if defined ACE_WIN32 || defined ACE_HAS_WINCE
-#  error "FACE Safety profile not compatible with win32 or winCE"
+# if defined ACE_WIN32
+#  error "FACE Safety profile not compatible with win32"
 # endif
 
 # ifndef ACE_EMULATE_POSIX_DEVCTL
diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h
index 0ea1e2dc3ad..57e91329998 100644
--- a/ACE/ace/config-macros.h
+++ b/ACE/ace/config-macros.h
@@ -101,8 +101,7 @@
 
 # if !defined (ACE_HAS_PROCESS_SPAWN)
 #   if !defined (ACE_LACKS_FORK) || \
-       (defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)) || \
-       defined (ACE_WINCE) || defined (ACE_OPENVMS)
+       (defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)) || defined (ACE_OPENVMS)
 #     define ACE_HAS_PROCESS_SPAWN 1
 #   endif
 # endif /* ACE_HAS_PROCESS_SPAWN */
diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h
index a22eb51989a..bca5a046873 100644
--- a/ACE/ace/config-win32-common.h
+++ b/ACE/ace/config-win32-common.h
@@ -8,13 +8,6 @@
 #error Use config-win32.h in config.h instead of this header
 #endif /* ACE_CONFIG_WIN32_H */
 
-// Windows Mobile (CE) stuff is primarily further restrictions to what's
-// in the rest of this file. Also, it defined ACE_HAS_WINCE, which is used
-// in this file.
-#if defined (_WIN32_WCE)
-#  include "ace/config-WinCE.h"
-#endif /* _WIN32_WCE */
-
 #if defined(__MINGW32__)
 // When using the --std=c++0x option with MinGW the compiler omits defining
 // the following required macros (at least with the GCC 4.6.2 version)
@@ -31,7 +24,7 @@
 #endif
 
 // Complain if WIN32 is not already defined.
-#if !defined (WIN32) && !defined (ACE_HAS_WINCE)
+#if !defined (WIN32)
 # error Please define WIN32 in your project settings.
 #endif
 
@@ -106,8 +99,6 @@
 # define ACE_MT_SAFE 1
 #endif
 
-// On winCE these classes do not exist. If they are
-// introduced in the future, no changes need to be made
 #if defined (ABOVE_NORMAL_PRIORITY_CLASS) && \
   defined (BELOW_NORMAL_PRIORITY_CLASS) && \
   defined (HIGH_PRIORITY_CLASS) && \
@@ -210,18 +201,14 @@
 # define ACE_IOV_MAX 64
 #endif /* ACE_IOV_MAX */
 
-#if !defined (ACE_HAS_WINCE)
 // Platform supports pread() and pwrite()
-# define ACE_HAS_WTOF
-#endif /* ! ACE_HAS_WINCE */
+#define ACE_HAS_WTOF
 
 #define ACE_HAS_P_READ_WRITE
 
-#if !defined (ACE_HAS_WINCE)
-# define ACE_HAS_DIRECT_H
-# define ACE_HAS_PROCESS_H
-# define ACE_HAS_IO_H
-#endif /* ! ACE_HAS_WINCE */
+#define ACE_HAS_DIRECT_H
+#define ACE_HAS_PROCESS_H
+#define ACE_HAS_IO_H
 
 #define ACE_DEFAULT_THREAD_PRIORITY 0
 
@@ -417,8 +404,6 @@
 #  include /**/ <afxwin.h>   /* He is doing MFC */
 // Windows.h will be included via afxwin.h->afx.h->afx_ver_.h->afxv_w32.h
 // #define      _INC_WINDOWS  // Prevent winsock.h from including windows.h
-#elif defined (ACE_HAS_WINCE)
-#  include /**/ <windows.h>
 #endif
 
 #if !defined (_INC_WINDOWS)     /* Already include windows.h ? */
@@ -448,68 +433,22 @@
 # if !defined (_WINSOCK2API_)
 // will also include windows.h, if not present
 #  include /**/ <winsock2.h>
-// WinCE 4 doesn't define the Exxx values without the WSA prefix, so do that
-// here. This is all lifted from the #if 0'd out part of winsock2.h.
-#  if defined (_WIN32_WCE) && (_WIN32_WCE < 0x600)
-#    define EWOULDBLOCK             WSAEWOULDBLOCK
-#    define EINPROGRESS             WSAEINPROGRESS
-#    define EALREADY                WSAEALREADY
-#    define ENOTSOCK                WSAENOTSOCK
-#    define EDESTADDRREQ            WSAEDESTADDRREQ
-#    define EMSGSIZE                WSAEMSGSIZE
-#    define EPROTOTYPE              WSAEPROTOTYPE
-#    define ENOPROTOOPT             WSAENOPROTOOPT
-#    define EPROTONOSUPPORT         WSAEPROTONOSUPPORT
-#    define ESOCKTNOSUPPORT         WSAESOCKTNOSUPPORT
-#    define EOPNOTSUPP              WSAEOPNOTSUPP
-#    define EPFNOSUPPORT            WSAEPFNOSUPPORT
-#    define EAFNOSUPPORT            WSAEAFNOSUPPORT
-#    define EADDRINUSE              WSAEADDRINUSE
-#    define EADDRNOTAVAIL           WSAEADDRNOTAVAIL
-#    define ENETDOWN                WSAENETDOWN
-#    define ENETUNREACH             WSAENETUNREACH
-#    define ENETRESET               WSAENETRESET
-#    define ECONNABORTED            WSAECONNABORTED
-#    define ECONNRESET              WSAECONNRESET
-#    define ENOBUFS                 WSAENOBUFS
-#    define EISCONN                 WSAEISCONN
-#    define ENOTCONN                WSAENOTCONN
-#    define ESHUTDOWN               WSAESHUTDOWN
-#    define ETOOMANYREFS            WSAETOOMANYREFS
-#    define ETIMEDOUT               WSAETIMEDOUT
-#    define ECONNREFUSED            WSAECONNREFUSED
-#    define ELOOP                   WSAELOOP
-#    define ENAMETOOLONG            WSAENAMETOOLONG
-#    define EHOSTDOWN               WSAEHOSTDOWN
-#    define EHOSTUNREACH            WSAEHOSTUNREACH
-#    define ENOTEMPTY               WSAENOTEMPTY
-#    define EPROCLIM                WSAEPROCLIM
-#    define EUSERS                  WSAEUSERS
-#    define EDQUOT                  WSAEDQUOT
-#    define ESTALE                  WSAESTALE
-#    define EREMOTE                 WSAEREMOTE
-#  endif /* (_WIN32_WCE) && (_WIN32_WCE < 0x600) */
 # endif /* _WINSOCK2API */
 
 # if defined (ACE_HAS_FORE_ATM_WS2)
 #  include /**/ <ws2atm.h>
 # endif /*ACE_HAS_FORE_ATM_WS2 */
 
-// CE doesn't have Microsoft Winsock 2 extensions
-# if !defined _MSWSOCK_ && !defined (ACE_HAS_WINCE)
+# if !defined _MSWSOCK_
 #  include /**/ <mswsock.h>
 # endif /* _MSWSOCK_ */
 
 # if defined (_MSC_VER)
-#  if defined (ACE_HAS_WINCE)
-#    pragma comment(lib, "ws2.lib")
-#  else
-#    pragma comment(lib, "ws2_32.lib")
-#    pragma comment(lib, "mswsock.lib")
-#    if defined (ACE_HAS_IPV6)
-#      pragma comment(lib, "iphlpapi.lib")
-#    endif
-#  endif /* ACE_HAS_WINCE */
+#  pragma comment(lib, "ws2_32.lib")
+#  pragma comment(lib, "mswsock.lib")
+#  if defined (ACE_HAS_IPV6)
+#   pragma comment(lib, "iphlpapi.lib")
+#  endif
 # endif /* _MSC_VER */
 
 # define ACE_WSOCK_VERSION 2, 0
@@ -521,7 +460,7 @@
 
 // PharLap ETS has its own winsock lib, so don't grab the one
 // supplied with the OS.
-# if defined (_MSC_VER) && !defined (_WIN32_WCE) && !defined (ACE_HAS_PHARLAP)
+# if defined (_MSC_VER) && !defined (ACE_HAS_PHARLAP)
 #  pragma comment(lib, "wsock32.lib")
 # endif /* _MSC_VER */
 
@@ -549,11 +488,9 @@
 # define ACE_HAS_IP_MULTICAST
 #endif /* ACE_HAS_WINSOCK2 */
 
-#if !defined (ACE_HAS_WINCE)
-# define ACE_HAS_INTERLOCKED_EXCHANGEADD
-#endif
+#define ACE_HAS_INTERLOCKED_EXCHANGEADD
 
-#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP)
+#if !defined (ACE_HAS_PHARLAP)
 
 # if _WIN32_WINNT >= 0x400
 #  define ACE_HAS_SIGNAL_OBJECT_AND_WAIT
@@ -563,7 +500,7 @@
 # define ACE_HAS_CANCEL_IO
 # define ACE_HAS_WIN32_OVERLAPPED_IO
 # define ACE_HAS_WIN32_NAMED_PIPES
-#endif /* !defined (ACE_HAS_WINCE) && !ACE_HAS_PHARLAP */
+#endif /* !ACE_HAS_PHARLAP */
 
 #if !defined (ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION)
 # define ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION EXCEPTION_CONTINUE_SEARCH
@@ -610,23 +547,17 @@
 # define ACE_DISABLES_THREAD_LIBRARY_CALLS 0
 #endif /* ACE_DISABLES_THREAD_LIBRARY_CALLS */
 
-#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP)
+#if !defined (ACE_HAS_PHARLAP)
 #  define ACE_HAS_LOG_MSG_NT_EVENT_LOG
-#endif /* !ACE_HAS_WINCE && !ACE_HAS_PHARLAP */
+#endif /* !ACE_HAS_PHARLAP */
 
-#if !defined (ACE_HAS_WINCE)
-# define ACE_HAS_LLSEEK
-#endif /* !ACE_HAS_WINCE */
+#define ACE_HAS_LLSEEK
 
 // Needed for obtaining the MAC address
-// I dont believe this will work under CE, notice the
-// check for ACE_HAS_WINCE.
-# if !defined (ACE_HAS_WINCE)
-# include <nb30.h>
-#  if defined (_MSC_VER)
-#   pragma comment(lib, "netapi32.lib") // needed for obtaing MACaddress
-#  endif
-# endif /* !ACE_HAS_WINCE */
+#include <nb30.h>
+#if defined (_MSC_VER)
+# pragma comment(lib, "netapi32.lib") // needed for obtaing MACaddress
+#endif
 
 #if !defined (WINVER)
 # define WINVER 0x0400 // pretend it's at least WinNT 4.0
diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h
index 866c45f6dd2..b3978f03544 100644
--- a/ACE/ace/config-win32-msvc-14.h
+++ b/ACE/ace/config-win32-msvc-14.h
@@ -37,28 +37,16 @@
 #define ACE_STRCASECMP_EQUIVALENT ::_stricmp
 #define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp
 #define ACE_WCSDUP_EQUIVALENT ::_wcsdup
-#if defined (ACE_HAS_WINCE)
-# define ACE_FILENO_EQUIVALENT ::_fileno
-#else
-# define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X)))
-#endif
+#define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X)))
 
-// Windows Mobile 6 doesn't do sig_atomic_t, but maybe future versions will.
-#  if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x601)
-#    define ACE_HAS_SIG_ATOMIC_T
-#  endif /* !Win CE 6.0 or less */
+#define ACE_HAS_SIG_ATOMIC_T
 
 #define ACE_LACKS_STRPTIME
 
-// Evaluate this with a WinCE build; maybe things have improved since VC8.
-//#if !defined (ACE_HAS_WINCE)
-# define ACE_HAS_INTRIN_H
-# define ACE_HAS_INTRINSIC_INTERLOCKED
-//#endif
+#define ACE_HAS_INTRIN_H
+#define ACE_HAS_INTRINSIC_INTERLOCKED
 
-#if !defined (_WIN32_WCE) || (_WIN32_WCE >= 0x501)
-#  define ACE_HAS_INTRINSIC_BYTESWAP
-#endif
+#define ACE_HAS_INTRINSIC_BYTESWAP
 
 #define ACE_LACKS_STRRECVFD
 
@@ -85,17 +73,10 @@
 // 'class1' : inherits 'class2::member' via dominance
 #pragma warning(disable:4250)
 
-// CE (at least thru Windows Mobile 5) doesn't have the new, secure CRT.
-#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_TR24731_2005_CRT)
+#if !defined (ACE_HAS_TR24731_2005_CRT)
 #  define ACE_HAS_TR24731_2005_CRT
 #endif
 
-// On CE w/o MFC config-WinCE.h needs to declare a placement new. This
-// triggers a warning that there's no placement delete, which can be ignored.
-#if defined (ACE_HAS_WINCE) && !defined (ACE_HAS_MFC)
-#  pragma warning(disable:4291)
-#endif
-
 // A template can not be exported. Only an instantiation may be exported.
 #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
 
diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h
index c1cdeb85277..1e1b063d420 100644
--- a/ACE/ace/config-win32-msvc.h
+++ b/ACE/ace/config-win32-msvc.h
@@ -30,12 +30,7 @@
   #define ACE_LACKS_NATIVE_WCHAR_T
 #endif
 
-// Win Mobile still does thread exits differently than PC Windows.
-#if defined (_WIN32_WCE)
-#  define ACE_ENDTHREADEX(STATUS) ExitThread ((DWORD) STATUS)
-#else
 #  define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS)
-#endif /* _WIN32_WCE */
 
 //FUZZ: disable check_for_msc_ver
 #if (_MSC_VER >= 1930)
@@ -54,13 +49,13 @@
 #if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
 // must have _MT defined to include multithreading
 // features from win32 headers
-# if !defined(_MT) && !defined (ACE_HAS_WINCE)
+# if !defined(_MT)
 // *** DO NOT *** defeat this error message by defining _MT yourself.
 // On MSVC, this is changed by selecting the Multithreaded
 // DLL or Debug Multithreaded DLL in the Project Settings
 // under C++ Code Generation.
 #  error You must link against multi-threaded libraries when using ACE (check your project settings)
-# endif /* !_MT && !ACE_HAS_WINCE */
+# endif /* !_MT */
 #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
 
 #include <malloc.h>
diff --git a/ACE/ace/os_include/os_errno.h b/ACE/ace/os_include/os_errno.h
index d132d73882c..dac78b9bf8f 100644
--- a/ACE/ace/os_include/os_errno.h
+++ b/ACE/ace/os_include/os_errno.h
@@ -22,9 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (ACE_LACKS_ERRNO_H)
-# include /**/ <errno.h>
-#endif /* !ACE_LACKS_ERRNO_H */
+#include /**/ <errno.h>
 
 #if defined (ACE_VXWORKS)
 // Needed for VxWorks to pickup errnoSet()
@@ -285,7 +283,7 @@ extern "C"
 void herror (const char *str);
 #endif /* ACE_HAS_H_ERRNO */
 
-#if defined (ACE_LACKS_ERRNO_H) || defined (ACE_DEFINE_MISSING_ERRNOS)
+#if defined (ACE_DEFINE_MISSING_ERRNOS)
 # if !defined (EPERM)
 #   define EPERM           1
 # endif /* EPERM */
diff --git a/ACE/ace/os_include/os_signal.h b/ACE/ace/os_include/os_signal.h
index 6ab5f76fbe2..574cc6cbff6 100644
--- a/ACE/ace/os_include/os_signal.h
+++ b/ACE/ace/os_include/os_signal.h
@@ -24,11 +24,9 @@
 
 #include "ace/os_include/sys/os_types.h"
 
-#if !defined (ACE_LACKS_SIGNAL_H)
-   extern "C" {
+extern "C" {
 #  include /**/ <signal.h>
-   }
-#endif /* !ACE_LACKS_SIGNAL_H */
+}
 
 #if defined (ACE_HAS_SIGINFO_T)
 #  if !defined (ACE_LACKS_SIGINFO_H)
@@ -145,10 +143,6 @@ extern "C"
 #  define ACE_NSIG NSIG
 #endif /* ACE_VXWORKS */
 
-#if defined (ACE_HAS_WINCE)
-  typedef void (__cdecl * __sighandler_t)(int);
-#endif
-
 #if defined (ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES)
   // Prototypes for both signal() and struct sigaction are consistent..
   using ACE_SignalHandler = void (*)(int);
diff --git a/ACE/ace/os_include/os_unistd.h b/ACE/ace/os_include/os_unistd.h
index db6275d0026..50db68f0abd 100644
--- a/ACE/ace/os_include/os_unistd.h
+++ b/ACE/ace/os_include/os_unistd.h
@@ -72,15 +72,9 @@ extern "C"
 #if defined (ACE_WIN32)
 // The following are #defines and #includes that are specific to
 // WIN32.
-#  if defined (ACE_HAS_WINCE)
-#    define ACE_STDIN _fileno (stdin)
-#    define ACE_STDOUT _fileno (stdout)
-#    define ACE_STDERR _fileno (stderr)
-#  else
 #    define ACE_STDIN GetStdHandle (STD_INPUT_HANDLE)
 #    define ACE_STDOUT GetStdHandle (STD_OUTPUT_HANDLE)
 #    define ACE_STDERR GetStdHandle (STD_ERROR_HANDLE)
-#  endif  // ACE_HAS_WINCE
 // The following are #defines and #includes that are specific to UNIX.
 #else /* !ACE_WIN32 */
 #  if defined (STDIN_FILENO)
diff --git a/ACE/ace/os_include/sys/os_stat.h b/ACE/ace/os_include/sys/os_stat.h
index d179d5f95c0..7e6db7b9cae 100644
--- a/ACE/ace/os_include/sys/os_stat.h
+++ b/ACE/ace/os_include/sys/os_stat.h
@@ -82,12 +82,9 @@ extern "C"
 #  if !defined (S_IXOTH)
 #    define S_IXOTH 00001
 #  endif /* S_IXOTH */
-
-// WinCE's S_IFLNK is defined with the other bits, below.
-#if !defined (S_IFLNK) && !defined (ACE_HAS_WINCE)
-#define S_IFLNK 0200000
-#endif /* S_IFLNK && !ACE_HAS_WINCE */
-
+#  if !defined (S_IFLNK)
+#    define S_IFLNK 0200000
+#  endif /* S_IFLNK */
 #endif /* ACE_LACKS_MODE_MASKS */
 
 // Some systems (VxWorks) don't define S_ISLNK
@@ -104,55 +101,6 @@ extern "C"
 # define S_ISDIR(mode)   ((mode&S_IFMT) == S_IFDIR)
 #endif
 
-#if defined (ACE_HAS_WINCE)
-
-// Translate the WinCE bits into names expected by our callers.
-// The dwFileAttributes parameter doesn't have protection info, so
-// S_IFMT is the whole thing. Since there are no symbolic links, S_IFLNK is 0.
-#  define S_IFMT 0xFFFF
-#  define S_IFDIR FILE_ATTRIBUTE_DIRECTORY
-#  define S_IFREG FILE_ATTRIBUTE_NORMAL
-#  define S_IFLNK 0
-#  define S_IFCHR 0
-
-#  if !defined (__MINGW32__)
-   // Since CE does not have _stat by default as NT/2000 does, the 'stat'
-   // struct defined here will be used.  Also note that CE file system
-   // struct is only for the CE 3.0 or later.
-   // Refer to the WCHAR.H from Visual C++ and WIBASE.H from eVC 3.0.
-   struct stat
-   {
-      /// always 0 on Windows platforms
-      dev_t st_dev;
-
-      /// always 0 on Windows platforms
-      dev_t st_rdev;
-
-      /// file attribute
-      mode_t st_mode;
-
-      /// number of hard links
-      nlink_t st_nlink;
-
-      /// time of last access
-      time_t st_atime;
-
-      /// time of last data modification
-      time_t st_mtime;
-
-      /// time of creation
-      time_t st_ctime;
-
-      /// file size, in bytes
-      ACE_OFF_T st_size;
-
-      // Following members do not have direct conversion in Window platforms.
-      //u_long st_blksize;        // optimal blocksize for I/O
-      //u_long st_flags;          // user defined flags for file
-   };
-   #endif
-#endif /* ACE_HAS_WINCE */
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ACE/ace/os_include/sys/os_types.h b/ACE/ace/os_include/sys/os_types.h
index 822c8a93d97..261cce91cc8 100644
--- a/ACE/ace/os_include/sys/os_types.h
+++ b/ACE/ace/os_include/sys/os_types.h
@@ -28,10 +28,6 @@
 #  include /**/ <sys/types.h>
 #endif /* !ACE_LACKS_SYS_TYPES_H */
 
-#if defined (ACE_HAS_TYPES_H)
-#  include /**/ <types.h>
-#endif /* ACE_HAS_TYPES_H */
-
 # if defined (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB) && \
              (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB != 0)
 using std::time_t;
@@ -49,14 +45,6 @@ typedef double ACE_timer_t;
    typedef int clockid_t;
 #endif /* ACE_LACKS_CLOCKID_T */
 
-#if defined (ACE_LACKS_DEV_T)
-   typedef unsigned int dev_t;
-#endif /* ACE_LACKS_DEV_T */
-
-#if defined (ACE_HAS_WINCE)
-  typedef long off_t;
-#endif
-
 #if defined(ACE_WIN32) && defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS==64)
   typedef __int64 ACE_OFF_T;
 #else
diff --git a/ACE/bin/MakeProjectCreator/config/ace_mc.mpb b/ACE/bin/MakeProjectCreator/config/ace_mc.mpb
index 7be197f05a0..1146452ceeb 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_mc.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_mc.mpb
@@ -2,7 +2,6 @@
 project : ace_etcl_parser {
   after += Monitor_Control
   libs += ACE_Monitor_Control
-  avoids += wince
 
   specific (prop:microsoft) {
     lit_libs += pdh
diff --git a/ACE/bin/MakeProjectCreator/config/inet.mpb b/ACE/bin/MakeProjectCreator/config/inet.mpb
index dd5094fe901..1915c061c30 100644
--- a/ACE/bin/MakeProjectCreator/config/inet.mpb
+++ b/ACE/bin/MakeProjectCreator/config/inet.mpb
@@ -1,6 +1,5 @@
 // -*- MPC -*-
 project : acelib {
-  avoids   += wince
   avoids   += old_stdstream
   avoids   += exclude_inet
   avoids   += ace_for_tao
@@ -9,4 +8,4 @@ project : acelib {
   libs     += ACE_INet
   includes += $(ACE_ROOT)/protocols
 }
- 
+
diff --git a/ACE/contrib/FaCE/ACE.ico b/ACE/contrib/FaCE/ACE.ico
deleted file mode 100644
index 3efedc9021b..00000000000
--- a/ACE/contrib/FaCE/ACE.ico
+++ /dev/null
diff --git a/ACE/contrib/FaCE/ACE_Racer.bmp b/ACE/contrib/FaCE/ACE_Racer.bmp
deleted file mode 100644
index a487f63f81c..00000000000
--- a/ACE/contrib/FaCE/ACE_Racer.bmp
+++ /dev/null
diff --git a/ACE/contrib/FaCE/CE_ARGV.cpp b/ACE/contrib/FaCE/CE_ARGV.cpp
deleted file mode 100644
index 463ed1e41c8..00000000000
--- a/ACE/contrib/FaCE/CE_ARGV.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-#include "CE_ARGV.h"
-
-CE_ARGV::CE_ARGV(wchar_t* cmdLine)
-: ce_argv_(0)
-, ce_argc_(0)
-{
-    const wchar_t* dummyArgv = L"root";  // dummy for the first argv
-    const wchar_t* separator = L" ";     // blank space is a separator
-
-    int formattedCmdLineLength = wcslen(dummyArgv) +
-                                 wcslen(separator) +
-                                 1;  // 1 is for the NULL at the end
-
-    if (wcslen(cmdLine) > 0) {
-        formattedCmdLineLength += wcslen(cmdLine);
-        formattedCmdLineLength += wcslen(separator);
-    }
-
-    // formattedCmdLine will have dummyArgv and a separator at the beginning of cmdLine
-    // and a separator at the end to generalize format and reduce the amount of code
-    wchar_t* formattedCmdLine = 0;
-    formattedCmdLine = new wchar_t[formattedCmdLineLength];
-
-    wcscpy(formattedCmdLine, dummyArgv);
-    wcscat(formattedCmdLine, separator);
-
-    int max_possible_argc = 1;  // start with 1 because of the dummyArgv at the beginning
-
-    if (wcslen(cmdLine) > 0) {
-        int formattedPos  = wcslen(formattedCmdLine);
-        int cmdLineLength = wcslen(cmdLine);
-
-        // Inside of this for loop, it does same thing as strcat except it
-        // checks and puts only one single white space between two argv entries.
-        for (int i = 0; i < cmdLineLength; ++i) {
-            if (iswspace(cmdLine[i]) != 0) {
-                ++max_possible_argc;  // counting the number of white spaces
-            }
-
-            formattedCmdLine[formattedPos++] = cmdLine[i];
-
-            if (iswspace(cmdLine[i]) != 0) {
-                // make sure there is only one white space between two argv entries.
-                while ((i < cmdLineLength) && (iswspace(cmdLine[i + 1]) != 0)) {
-                    ++i;
-                }
-            }
-        }
-
-        formattedCmdLine[formattedPos] = 0;
-        wcscat(formattedCmdLine, separator);  // make sure formattedCmdLine ends with a blank
-    }
-
-    int formattedCmdLength = wcslen(formattedCmdLine);
-
-    bool insideQuotation = false;
-    int* argv_strlen = 0;
-    int entry_size = 0;
-    argv_strlen = new int[max_possible_argc];
-
-    // determine argc
-    for (int i = 0; i < formattedCmdLength; ++i) {
-        if (formattedCmdLine[i] == '\\') {
-            ++i; // ignore the following character
-            ++entry_size;
-        }
-        else if (formattedCmdLine[i] == '"') {
-            insideQuotation = !insideQuotation;
-        }
-        else if ((!insideQuotation) && (iswspace(formattedCmdLine[i]) != 0)) {
-            // new argv entry end found
-            argv_strlen[ce_argc_++] = entry_size;  // cache the size of this entry
-            entry_size = 0;
-        }
-        else {
-            ++entry_size;
-        }
-    }
-
-    ce_argv_ = new wchar_t*[ce_argc_ + 1];
-    ce_argv_[ce_argc_] = 0;  // Last command line entry is a NULL.
-
-    for (int j = 0, cmdLinePos = 0; j < ce_argc_; ++j, ++cmdLinePos) {
-        int length = argv_strlen[j];
-
-        ce_argv_[j] = new wchar_t[length + 1];
-        ce_argv_[j][length] = 0;  // string termination null
-
-        if (iswspace(formattedCmdLine[cmdLinePos]) != 0) {
-            // This is where prior argv has trailing '"' at the end.
-            ++cmdLinePos;
-        }
-
-        for (int n = 0; n < length; ++n, ++cmdLinePos) {
-            if ((formattedCmdLine[cmdLinePos] == '\\') || (formattedCmdLine[cmdLinePos] == '"')) {
-                ++cmdLinePos;
-            }
-
-            ce_argv_[j][n] = formattedCmdLine[cmdLinePos];
-        }
-    }
-
-    delete [] argv_strlen;
-    delete [] formattedCmdLine;
-}
-
-
-CE_ARGV::~CE_ARGV()
-{
-    for (int i = 0; i < ce_argc_; ++i) {
-        delete [] ce_argv_[i];
-    }
-
-    delete [] ce_argv_;
-}
diff --git a/ACE/contrib/FaCE/CE_ARGV.h b/ACE/contrib/FaCE/CE_ARGV.h
deleted file mode 100644
index 083432bb313..00000000000
--- a/ACE/contrib/FaCE/CE_ARGV.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file    CE_ARGV.h
- *
- *  @author Si Mong Park <spark@ociweb.com>
- */
-//=============================================================================
-
-#ifndef CE_ARGV_H
-#define CE_ARGV_H
-
-#include <windows.h>
-#include <ctype.h>
-
-
-/**
- * @class CE_ARGV
- *
- * @brief This class is to hash input parameters, argc and argv, for WinCE platform.
- *
- * Since WinCE only supports wchar_t as an input from OS, some implementation detail,
- * especially for CORBA spec, will not support wchar_t (wchar_t) type parameter.
- * Moreover, WinCE's input parameter type is totally different than any other OS;
- * all command line parameters will be stored in a single wide-character string with
- * each unit parameter divided by blank space, and it does not provide the name of
- * executable (generally known as argv[0]).
- * This class is to convert CE's command line parameters and simulate as in the same
- * manner as other general platforms, adding 'root' as a first argc, which is for the
- * name of executable in other OS.
- */
-class CE_ARGV
-{
-public:
-    /**
-     * Ctor accepts CE command line as a parameter.
-     */
-    CE_ARGV(wchar_t* cmdLine);
-
-    /**
-     * Default Dtor that deletes any memory allocated for the converted string.
-     */
-    ~CE_ARGV();
-
-    /**
-     * Returns the number of command line parameters, same as argc on Unix.
-     */
-    int argc();
-
-    /**
-     * Returns the 'char**' that contains the converted command line parameters.
-     */
-    wchar_t** argv();
-
-private:
-    /**
-     * Copy Ctor is not allowed.
-     */
-    CE_ARGV();
-
-    /**
-     * Copy Ctor is not allowed.
-     */
-    CE_ARGV(CE_ARGV&);
-
-    /**
-     * Pointer of converted command line parameters.
-     */
-    wchar_t** ce_argv_;
-
-    /**
-     * Integer that is same as argc on other OS's.
-     */
-    int ce_argc_;
-};
-
-
-inline int CE_ARGV::argc()
-{
-    return ce_argc_;
-}
-
-
-inline wchar_t** CE_ARGV::argv()
-{
-    return ce_argv_;
-}
-
-#endif  // CE_ARGV_H
diff --git a/ACE/contrib/FaCE/CE_Screen_Output.cpp b/ACE/contrib/FaCE/CE_Screen_Output.cpp
deleted file mode 100644
index f0d0caf6b02..00000000000
--- a/ACE/contrib/FaCE/CE_Screen_Output.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-#include "CE_Screen_Output.h"
-#include <string.h>
-
-// This utility does not use ACE, and shouldn't.
-//FUZZ: disable check_for_lack_ACE_OS
-
-HWND CE_Screen_Output::handler_ = 0;
-
-
-CE_Screen_Output::CE_Screen_Output()
-: pFile_(0)
-{
-}
-
-
-CE_Screen_Output::~CE_Screen_Output()
-{
-    if (pFile_ != 0) {
-        fclose(pFile_);
-    }
-}
-
-
-void CE_Screen_Output::SetOutputWindow(HWND hEdit)
-{
-    handler_ = hEdit;
-}
-
-
-void CE_Screen_Output::clear()
-{
-    SetWindowText(handler_, 0);
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (wchar_t* output)
-{
-    int length = GetWindowTextLength(handler_);
-    SendMessage(handler_, EM_SETSEL, length, length);
-    SendMessage(handler_, EM_REPLACESEL, 0, (LPARAM)output);
-
-    if (pFile_ != 0)
-    {
-        fwprintf(pFile_, L"%s", output);
-    }
-
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (const wchar_t* output)
-{
-    wchar_t* buffer = _wcsdup(output);
-    if (buffer != 0)
-    {
-        *this << buffer;
-        delete buffer;
-    }
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (char* output)
-{
-    int len = MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, 0, 0);
-    wchar_t* w_output = new wchar_t[len];
-
-    MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, w_output, len);
-    *this << w_output;
-
-    delete w_output;
-
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (const char* output)
-{
-    int len = MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, 0, 0);
-    wchar_t* w_output = new wchar_t[len];
-
-    MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, w_output, len);
-    *this << w_output;
-
-    delete [] w_output;
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (char output)
-{
-    *this << (int)output;
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (unsigned char output)
-{
-    *this << (int)output;
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (unsigned short output)
-{
-  wchar_t buffer[20];
-  wsprintf(buffer, L"%u", output);
-  *this << buffer;
-  return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (int output)
-{
-    wchar_t buffer[20];
-    wsprintf(buffer, L"%d", output);
-    *this << buffer;
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (unsigned int output)
-{
-    wchar_t buffer[20];
-    wsprintf(buffer, L"%du", output);
-    *this << buffer;
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (float output)
-{
-    wchar_t buffer[20];
-    swprintf(buffer, L"%f", output);
-    *this << buffer;
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (long output)
-{
-    wchar_t buffer[20];
-    wsprintf(buffer, L"%l", output);
-    *this << buffer;
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (unsigned long output)
-{
-    wchar_t buffer[20];
-    wsprintf(buffer, L"%lu", output);
-    *this << buffer;
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (FILE* pFile)
-{
-    pFile_ = pFile;
-    return *this;
-}
-
-//FUZZ: enable check_for_lack_ACE_OS
diff --git a/ACE/contrib/FaCE/CE_Screen_Output.h b/ACE/contrib/FaCE/CE_Screen_Output.h
deleted file mode 100644
index 63746e21a0c..00000000000
--- a/ACE/contrib/FaCE/CE_Screen_Output.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- *  @file    CE_Screen_Output.h
- *
- *  @author Si Mong Park  <spark@ociweb.com>
- */
-//=============================================================================
-
-#ifndef CE_Screen_Output_h
-#define CE_Screen_Output_h
-
-#include <windows.h>
-#include <stdio.h>
-
-const wchar_t endl[] = L"\r\n";
-const wchar_t tab[]  = L"\t";
-
-/**
- * @class CE_Screen_Output
- *
- * @brief Replacement of text output for Windows CE.
- *
- * This class allows standard text output to be displayed on
- * text window for Windows CE.  Generally, all ACE output will
- * go through under CE if and only if user uses WindozeCE
- * implementation by using main_ce instead of main.
- * Also, for the easier debugging purpose, object pointer of
- * this class can be gotten from ACE_Log_Msg::msg_callback()
- * and then can be used directly by user just like cout stream.
- */
-class CE_Screen_Output
-{
-public:
-    /**
-     * Default Ctor
-     */
-    CE_Screen_Output();
-
-    /**
-     * Default Dtor
-     */
-    virtual ~CE_Screen_Output();
-
-    /**
-     * Interface to specify active window handle.
-     */
-    void SetOutputWindow(HWND hWnd);
-
-    /**
-     * Clears text screen.
-     */
-    void clear();
-
-    /**
-     * << operator that performs actual print out.
-     *
-     * Note: This is the only one operator that performs
-     *       output.  All other perators convert the type and
-     *       use this operator underneath.
-     */
-    CE_Screen_Output& operator << (wchar_t*);
-    CE_Screen_Output& operator << (const wchar_t*);
-
-    CE_Screen_Output& operator << (char* output);
-    CE_Screen_Output& operator << (const char* output);
-
-    CE_Screen_Output& operator << (char output);
-    CE_Screen_Output& operator << (unsigned char output);
-
-    CE_Screen_Output& operator << (unsigned short output);
-
-    CE_Screen_Output& operator << (int output);
-    CE_Screen_Output& operator << (unsigned int output);
-
-    CE_Screen_Output& operator << (float output);
-
-    CE_Screen_Output& operator << (long output);
-    CE_Screen_Output& operator << (unsigned long output);
-
-    CE_Screen_Output& operator << (FILE* pFile);
-
-private:
-    /**
-     * Copy Ctor
-     */
-    CE_Screen_Output(CE_Screen_Output&);
-
-    static HWND handler_;
-
-    /**
-     * File pointer that used to save output to file.
-     * This class does not own the file handler pointer.
-     */
-    FILE* pFile_;
-};
-
-#endif  // CE_Screen_Output_h
diff --git a/ACE/contrib/FaCE/FACE.ico b/ACE/contrib/FaCE/FACE.ico
deleted file mode 100644
index 8a91925b128..00000000000
--- a/ACE/contrib/FaCE/FACE.ico
+++ /dev/null
diff --git a/ACE/contrib/FaCE/FaCE.cpp b/ACE/contrib/FaCE/FaCE.cpp
deleted file mode 100644
index 265e21cbeee..00000000000
--- a/ACE/contrib/FaCE/FaCE.cpp
+++ /dev/null
@@ -1,652 +0,0 @@
-#include "FaCE.h"
-
-#ifdef NO_ACE
-
-#include "CE_ARGV.h"
-
-#else
-
-#include <ace/ACE.h>
-#include <ace/ARGV.h>
-#include <ace/Log_Msg.h>
-
-#endif  // NO_ACE
-
-#include <commctrl.h>
-#include <aygshell.h>
-#include <sipapi.h>
-
-// This utility does not use ACE, and shouldn't.
-//FUZZ: disable check_for_lack_ACE_OS
-
-const ACE_TCHAR* g_ParameterFileName = ACE_TEXT("Parameters.txt");
-
-/**
- * This simple and small class manages user-input command line
- * parameters and parameter history file.
- *
- * @author Si Mong Park (spark@ociweb.com)
- */
-class ParameterList
-{
-public:
-    /**
-     * Default Ctor.
-     */
-    ParameterList() : next_(0), param_(0) {};
-
-    /**
-     * Dtor: deletes all sub-PameterList objects as well as
-     *       memory block allocated for the param_ by _wcsdup().
-     */
-    ~ParameterList() { free(param_); delete next_; };
-
-    /**
-     * Add a new parameter to the list.
-     */
-    void addParameter(char*);
-
-    /**
-     * Add a new parameter to the list.
-     */
-    void addParameter(ACE_TCHAR*);
-
-    /**
-     * Save all parameters stored in the list to the
-     * file.
-     * Note that 'outputFile' is only for the internal use
-     * and user must call this function without any parameter.
-     */
-    void saveParameter(FILE* outputFile = 0);
-
-    /**
-     * Send out windows message to load/update parameters.
-     */
-    void sendParameterMSG(HWND, UINT);
-
-private:
-    /**
-     * A pointer to the next ParameterList object.
-     * This attribute is totally hidden from user.
-     */
-    ParameterList* next_;
-
-    /**
-     * User-specified command line parameter.
-     * This attribute is totally hidden from user.
-     */
-    ACE_TCHAR* param_;
-};
-
-
-void ParameterList::addParameter(char* newParameter)
-{
-#ifdef NO_ACE
-    int len = MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, newParameter, -1, 0, 0);
-    wchar_t* w_output = new wchar_t[len];
-
-    MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, newParameter, -1, w_output, len);
-    this->addParameter(w_output);
-
-    delete [] w_output;
-#else
-    this->addParameter(ACE_TEXT_CHAR_TO_TCHAR(newParameter));
-#endif  // NO_ACE
-}
-
-
-void ParameterList::addParameter(ACE_TCHAR* newParameter)
-{
-    if (this->param_ == 0) {
-        this->param_ = _wcsdup(newParameter);
-        this->next_ = new ParameterList();  // create and add a new ParameterList object
-    }
-    else {
-        if (wcscmp(this->param_, newParameter) != 0) {
-            this->next_->addParameter(newParameter);
-        }
-    }
-}
-
-
-void ParameterList::saveParameter(FILE* outputFile)
-{
-    if ( (outputFile == 0) && (this->param_ != 0) ) {
-        outputFile = _wfopen(g_ParameterFileName, ACE_TEXT("w+"));
-    }
-
-    if (outputFile != 0) {
-        if (this->param_ != 0) {
-            fwprintf(outputFile, ACE_TEXT("%s\n"), this->param_);
-            this->next_->saveParameter(outputFile);
-        }
-        else {
-            fclose(outputFile);
-        }
-    }
-}
-
-
-void ParameterList::sendParameterMSG(HWND hDlg, UINT message)
-{
-    if (param_ != 0) {
-        SendDlgItemMessage(hDlg, IDC_CMDEDIT, message, 0, (LPARAM)this->param_);
-        this->next_->sendParameterMSG(hDlg, message);
-    }
-}
-
-
-// Global Variables:
-HINSTANCE g_hInst;          // The current instance
-HWND      g_hwndCB;         // The command bar handle
-HWND      hWndEdit;         // Read only edit box for output display
-FILE*     g_OutputFile;     // File handler for output save
-
-ParameterList g_Parameter;  // command line parameter list
-
-ACE_CE_Screen_Output cout;  // Replacement of std::cout
-
-ACE_TCHAR g_CommandLine[MAX_COMMAND_LINE]; // User-specified command line parameter
-ACE_TCHAR g_SaveFileName[MAX_LOADSTRING];      // Name of the output file
-
-static SHACTIVATEINFO s_sai;
-
-// Forward declarations of functions included in this code module:
-ATOM                MyRegisterClass (HINSTANCE, ACE_TCHAR*);
-BOOL                InitInstance    (HINSTANCE, int);
-LRESULT CALLBACK    WndProc         (HWND, UINT, WPARAM, LPARAM);
-LRESULT CALLBACK    About           (HWND, UINT, WPARAM, LPARAM);
-LRESULT CALLBACK    CommandLine     (HWND, UINT, WPARAM, LPARAM);
-LRESULT CALLBACK    SaveFileName    (HWND, UINT, WPARAM, LPARAM);
-LRESULT CALLBACK    FileError       (HWND, UINT, WPARAM, LPARAM);
-LRESULT CALLBACK    FileExist       (HWND, UINT, WPARAM, LPARAM);
-HWND                CreateRpCommandBar(HWND);
-
-
-void InitSetup()
-{
-    g_OutputFile    = 0;
-    memset(g_CommandLine,  0, MAX_COMMAND_LINE * sizeof(ACE_TCHAR));
-    memset(g_SaveFileName, 0, MAX_LOADSTRING   * sizeof(ACE_TCHAR));
-}
-
-
-void LoadParameterHistory()
-{
-    FILE* parameterFile = _wfopen(g_ParameterFileName, ACE_TEXT("r"));
-
-    if (parameterFile != 0) {
-        while (feof(parameterFile) == 0) {
-            // Note: Remember that fwprintf takes wide-character format specifier but
-            // save string as ASCII.  Thus, history must be read as ASCII then converted
-            // to wide-character (Unicode on WinCE).
-            char singleParameter[MAX_COMMAND_LINE];
-            int size = 0;
-            fread(&singleParameter[size], sizeof(char), 1, parameterFile);
-
-            // WinCE does not have function that reads upto the end of line.
-            while (singleParameter[size] != '\n') {
-                fread(&singleParameter[++size], sizeof(char), 1, parameterFile);
-            }
-
-            if (size > 0) {
-                singleParameter[size] = 0;  // NULL terminator
-                g_Parameter.addParameter(singleParameter);
-            }
-        }
-        fclose(parameterFile);
-    }
-}
-
-
-//
-//  FUNCTION: MyRegisterClass()
-//
-//  PURPOSE: Registers the window class.
-//
-//  COMMENTS:
-//
-//    It is important to call this function so that the application
-//    will get 'well formed' small icons associated with it.
-//
-ATOM MyRegisterClass(HINSTANCE hInstance, ACE_TCHAR* szWindowClass)
-{
-    WNDCLASS    wc;
-
-    wc.style            = CS_HREDRAW | CS_VREDRAW;
-    wc.lpfnWndProc      = (WNDPROC) WndProc;
-    wc.cbClsExtra       = 0;
-    wc.cbWndExtra       = 0;
-    wc.hInstance        = hInstance;
-    wc.hIcon            = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_FACE));
-    wc.hCursor          = 0;
-    wc.hbrBackground    = (HBRUSH) GetStockObject(WHITE_BRUSH);
-    wc.lpszMenuName     = 0;
-    wc.lpszClassName    = szWindowClass;
-
-    return RegisterClass(&wc);
-}
-
-//
-//  FUNCTION: InitInstance(HANDLE, int)
-//
-//  PURPOSE: Saves instance handle and creates main window
-//
-//  COMMENTS:
-//
-//    In this function, we save the instance handle in a global variable and
-//    create and display the main program window.
-//
-BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
-{
-    HWND hWnd = 0;
-
-    ACE_TCHAR szTitle[MAX_LOADSTRING];            // The title bar text
-    ACE_TCHAR szWindowClass[MAX_LOADSTRING];      // The window class name
-
-    g_hInst = hInstance;        // Store instance handle in our global variable
-    // Initialize global strings
-    LoadString(hInstance, IDC_FACE, szWindowClass, MAX_LOADSTRING);
-    LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);
-
-    //If it is already running, then focus on the window
-    hWnd = FindWindow(szWindowClass, szTitle);
-    if (hWnd)
-    {
-        // set focus to foremost child window
-        // The "| 0x01" is used to bring any owned windows to the foreground and
-        // activate them.
-        SetForegroundWindow((HWND)((ULONG) hWnd | 0x00000001));
-        return 0;
-    }
-
-    MyRegisterClass(hInstance, szWindowClass);
-
-    RECT    rect;
-    GetClientRect(hWnd, &rect);
-
-    hWnd = CreateWindow(szWindowClass, szTitle, WS_VISIBLE,
-        CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, hInstance, 0);
-
-    if (!hWnd)
-    {
-        int error = 0;
-        error = GetLastError();
-        return FALSE;
-    }
-    //When the main window is created using CW_USEDEFAULT the height of the menubar (if one
-    // is created is not taken into account). So we resize the window after creating it
-    // if a menubar is present
-    {
-        RECT rc;
-        GetWindowRect(hWnd, &rc);
-        rc.bottom -= MENU_HEIGHT;
-        if (g_hwndCB)
-            MoveWindow(hWnd, rc.left, rc.top, rc.right, rc.bottom, FALSE);
-    }
-
-    ShowWindow(hWnd, nCmdShow);
-    UpdateWindow(hWnd);
-
-    return TRUE;
-}
-
-//
-//  FUNCTION: WndProc(HWND, unsigned, WORD, LONG)
-//
-//  PURPOSE:  Processes messages for the main window.
-//
-//  WM_COMMAND  - process the application menu
-//  WM_PAINT    - Paint the main window
-//  WM_DESTROY  - post a quit message and return
-//
-LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    HDC hdc;
-    int wmId, wmEvent, nCmdHt;
-    PAINTSTRUCT ps;
-    RECT textRect;
-
-    switch (message)
-    {
-        case WM_COMMAND:
-            wmId    = LOWORD(wParam);
-            wmEvent = HIWORD(wParam);
-            // Parse the menu selections:
-            switch (wmId)
-            {
-                case IDM_HELP_ABOUT:
-                    DialogBox(g_hInst, (const ACE_TCHAR*)IDD_ABOUTBOX, hWnd, (DLGPROC)About);
-                    break;
-
-                case IDOK:
-                    SendMessage(hWnd, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, 0), (LPARAM)hWnd);
-                    SendMessage(hWnd, WM_CLOSE, 0, 0);
-                    break;
-
-                case ID_SETTING_RUN:
-                    {
-#ifdef NO_ACE
-                        cout << ACE_TEXT("START with command line: ") << g_CommandLine << endl;
-                        CE_ARGV ce_argv(g_CommandLine);
-                        main_i(ce_argv.argc(), ce_argv.argv());
-                        cout << ACE_TEXT("END") << endl << endl;
-#else
-                        cout << ACE_TEXT("START with command line: ") << g_CommandLine << endl;
-                        ACE_ARGV ce_argv(g_CommandLine);
-                        ACE::init();
-                        ACE_LOG_MSG->msg_callback(&cout);  // register call back
-                        ACE_LOG_MSG->set_flags(ACE_Log_Msg::MSG_CALLBACK);  // set call back flag
-                        ace_main_i(ce_argv.argc(), ce_argv.argv());
-                        ACE::fini();
-                        cout << ACE_TEXT("END") << endl << endl;
-#endif  // NO_ACE
-                    }
-                    break;
-
-                case ID_SETTING_EXIT:
-                    SendMessage(hWnd, WM_DESTROY, 0, 0);
-                    break;
-
-                case ID_TOOLS_SAVETOFILE:
-                    // create a dialog box to get the file name
-                    DialogBox(g_hInst, (const ACE_TCHAR*)IDD_OUTFILE, hWnd, (DLGPROC)SaveFileName);
-                    break;
-
-                case ID_SETTING_COMMANDLINE:
-                    // create a dialog box to get the command line
-                    DialogBox(g_hInst, (const ACE_TCHAR*)IDD_CMDLINE, hWnd, (DLGPROC)CommandLine);
-                    break;
-
-                default:
-                   return DefWindowProc(hWnd, message, wParam, lParam);
-            }
-            break;
-
-        case WM_CREATE:
-            SHMENUBARINFO mbi;
-
-            memset(&mbi, 0, sizeof(SHMENUBARINFO));
-            mbi.cbSize     = sizeof(SHMENUBARINFO);
-            mbi.hwndParent = hWnd;
-            mbi.nToolBarId = IDM_MENU;
-            mbi.hInstRes   = g_hInst;
-            mbi.nBmpId     = 0;
-            mbi.cBmpImages = 0;
-
-            if (!SHCreateMenuBar(&mbi))
-                return 0;
-
-            g_hwndCB = mbi.hwndMB;
-
-            // Initialize the shell activate info structure
-            memset (&s_sai, 0, sizeof (s_sai));
-            s_sai.cbSize = sizeof (s_sai);
-
-            GetClientRect(hWnd, &textRect);
-            nCmdHt = CommandBar_Height(mbi.hwndMB);
-
-            hWndEdit = CreateWindow(ACE_TEXT("EDIT"),
-                                    0,
-                                    WS_CHILD | WS_VISIBLE | ES_READONLY | ES_MULTILINE | WS_VSCROLL | WS_HSCROLL,
-                                    0,
-                                    0,
-                                    textRect.right,
-                                    textRect.bottom - MENU_HEIGHT,
-                                    hWnd,
-                                    0,
-                                    g_hInst,
-                                    0);
-            cout.SetOutputWindow(hWndEdit);
-            LoadParameterHistory();
-            break;
-
-        case WM_PAINT:
-            RECT rt;
-            hdc = BeginPaint(hWnd, &ps);
-            GetClientRect(hWnd, &rt);
-            EndPaint(hWnd, &ps);
-            break;
-
-        case WM_ACTIVATE:
-            // Notify shell of our activate message
-            SHHandleWMActivate(hWnd, wParam, lParam, &s_sai, FALSE);
-            break;
-
-        case WM_SETTINGCHANGE:
-            SHHandleWMSettingChange(hWnd, wParam, lParam, &s_sai);
-            break;
-
-        case WM_HIBERNATE:  // low power
-        case WM_CLOSE:
-        case WM_DESTROY:
-            g_Parameter.saveParameter();  // save parameters to history file
-            CommandBar_Destroy(g_hwndCB);
-            PostQuitMessage(0);
-            break;
-
-        default:
-            return DefWindowProc(hWnd, message, wParam, lParam);
-   }
-   return 0;
-}
-
-
-HWND CreateRpCommandBar(HWND hwnd)
-{
-    SHMENUBARINFO mbi;
-
-    memset(&mbi, 0, sizeof(SHMENUBARINFO));
-    mbi.cbSize     = sizeof(SHMENUBARINFO);
-    mbi.hwndParent = hwnd;
-    mbi.nToolBarId = IDM_MENU;
-    mbi.hInstRes   = g_hInst;
-    mbi.nBmpId     = 0;
-    mbi.cBmpImages = 0;
-
-    if (!SHCreateMenuBar(&mbi))
-        return 0;
-
-    return mbi.hwndMB;
-}
-
-// Mesage handler for the About box.
-LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM)
-{
-    SHINITDLGINFO shidi;
-
-    const ACE_TCHAR* copyrightNote =
-ACE_TEXT("ACE and TAO are copyrighted by Dr. Douglas C. Schmidt and Center for Distributed Object") \
-ACE_TEXT("Computing at Washington University, 1993-2002, all rights reserved.")  \
-ACE_TEXT("FaCE is copyrighted by Object Computing, Inc., 2002,\n all rights reserved.\n") \
-ACE_TEXT("See License.txt for more information.");
-
-    switch (message)
-    {
-        case WM_INITDIALOG:
-            // Create a Done button and size it.
-            shidi.dwMask = SHIDIM_FLAGS;
-            shidi.dwFlags = SHIDIF_DONEBUTTON | SHIDIF_SIPDOWN | SHIDIF_SIZEDLGFULLSCREEN;
-            shidi.hDlg = hDlg;
-            SHInitDialog(&shidi);
-            SetDlgItemText(hDlg, IDC_COPYRIGHT, copyrightNote);
-            return TRUE;
-
-        case WM_COMMAND:
-            if (LOWORD(wParam) == IDOK)
-            {
-                EndDialog(hDlg, LOWORD(wParam));
-                return TRUE;
-            }
-            break;
-    }
-    return FALSE;
-}
-
-
-LRESULT CALLBACK CommandLine(HWND hDlg, UINT message, WPARAM wParam, LPARAM)
-{
-    int wmId;
-    int wmEvent;
-
-    switch (message)
-    {
-    case WM_INITDIALOG:
-        g_Parameter.sendParameterMSG(hDlg, CB_INSERTSTRING);
-        SetDlgItemText(hDlg, IDC_CMDEDIT, g_CommandLine);  // pass existing command line for display
-        return TRUE;
-
-    case WM_COMMAND:
-        wmId    = LOWORD(wParam);
-        wmEvent = HIWORD(wParam);
-        // Parse the menu selections:
-        switch (wmId)
-        {
-        case IDOK:
-            // new command line accepted
-            GetDlgItemText(hDlg, IDC_CMDEDIT, g_CommandLine, MAX_COMMAND_LINE - 1);
-            EndDialog(hDlg, wmId);
-            g_Parameter.addParameter(g_CommandLine);
-            return TRUE;
-
-        case IDCANCEL:
-            EndDialog(hDlg, wmId);
-            return TRUE;
-
-        default:
-            return FALSE;
-        }
-        break;
-        default:
-            return FALSE;
-    }
-
-    return FALSE;
-}
-
-
-LRESULT CALLBACK SaveFileName(HWND hDlg, UINT message, WPARAM wParam, LPARAM)
-{
-    int wmId;
-    int wmEvent;
-
-    ACE_TCHAR tempBuffer[MAX_LOADSTRING];
-    ACE_TCHAR fileMode[3] = { 0, '+', 0 };  // mode will either be "a+" or "w+"
-    FILE* tempFile;
-
-    switch (message)
-    {
-    case WM_INITDIALOG:
-        SetDlgItemText(hDlg, IDC_SAVEFILE, g_SaveFileName);
-        return TRUE;
-
-    case WM_COMMAND:
-        wmId    = LOWORD(wParam);
-        wmEvent = HIWORD(wParam);
-        // Parse the menu selections:
-        switch (wmId)
-        {
-        case IDOK:
-            GetDlgItemText(hDlg, IDC_SAVEFILE, tempBuffer, MAX_LOADSTRING - 1);
-            EndDialog(hDlg, wmId);
-
-            tempFile = _wfopen(tempBuffer, ACE_TEXT("r"));
-
-            if (tempFile != 0)  // if file exists
-            {
-                fclose(tempFile);  // close temp handler
-                int choice = DialogBox(g_hInst, (const ACE_TCHAR*)IDD_FILEEXIST, hDlg, (DLGPROC)FileExist);
-                switch (choice)
-                {
-                case IDOVERWRITE:  // overwrite existing file
-                    fileMode[0] = 'w';
-                    break;
-
-                case IDC_APPEND:  // append to existing file
-                    fileMode[0] = 'a';
-                    break;
-
-                case IDCANCEL:  // cancel operation without changing g_OutputFile
-                    return TRUE;
-                }
-            }
-            else  // if file does not exist
-            {
-                fileMode[0] = 'w';
-            }
-
-            tempFile = _wfopen(tempBuffer, fileMode);
-
-            if (tempFile == 0)
-            {
-                DialogBox(g_hInst, (const ACE_TCHAR*)IDD_ERRFILE, hDlg, (DLGPROC)FileError);
-            }
-            else
-            {
-                wcscpy(g_SaveFileName, tempBuffer);
-
-                if (g_OutputFile != 0)
-                {
-                    fclose(g_OutputFile);  // close any open file
-                }
-
-                g_OutputFile = tempFile;
-
-                cout << g_OutputFile;  // update FILE* for the CE_Screen_Output class object.
-            }
-
-            return TRUE;
-
-        case IDCANCEL:
-            EndDialog(hDlg, wmId);
-            return TRUE;
-
-        default:
-            return FALSE;
-        }
-        break;
-        default:
-            return FALSE;
-    }
-
-    return FALSE;
-}
-
-
-LRESULT CALLBACK FileError(HWND hDlg, UINT message, WPARAM wParam, LPARAM)
-{
-    switch (message)
-    {
-        case WM_INITDIALOG:
-            return TRUE;
-
-        case WM_COMMAND:
-            if (LOWORD(wParam) == IDOK)
-            {
-                EndDialog(hDlg, LOWORD(wParam));
-                return TRUE;
-            }
-            break;
-    }
-
-    return FALSE;
-}
-
-
-LRESULT CALLBACK FileExist(HWND hDlg, UINT message, WPARAM wParam, LPARAM)
-{
-    switch (message)
-    {
-    case WM_INITDIALOG:
-        return TRUE;
-    case WM_COMMAND:
-        EndDialog(hDlg, LOWORD(wParam));
-        return TRUE;
-    default:
-        return FALSE;
-    }
-
-    return FALSE;
-}
-
-//FUZZ: enable check_for_lack_ACE_OS
diff --git a/ACE/contrib/FaCE/FaCE.h b/ACE/contrib/FaCE/FaCE.h
deleted file mode 100644
index f8dc293aa1a..00000000000
--- a/ACE/contrib/FaCE/FaCE.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file    FaCE.h
- *
- *  @author Si Mong Park <spark@ociweb.com>
- */
-//=============================================================================
-
-#if !defined(AFX_FACE_H__1043241E_A6A9_4246_A9E4_7A774E19EE73__INCLUDED_)
-#define AFX_FACE_H__1043241E_A6A9_4246_A9E4_7A774E19EE73__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#if (_WIN32_WCE <= 211)
-#error This project can not be built for H/PC Pro 2.11 or earlier platforms.
-#endif
-
-#define WIN32_LEAN_AND_MEAN     // Exclude rarely-used stuff from Windows headers
-
-//////
-// BEGIN FaCE specific preprocessor
-#ifdef NO_ACE
-
-#include <windows.h>
-#include "CE_Screen_Output.h"
-
-#define ACE_TCHAR wchar_t
-#define ACE_TEXT(STRING) L##STRING
-#define ACE_CE_Screen_Output CE_Screen_Output
-
-int main_i(int, wchar_t**);
-
-#else
-
-#include <ace/CE_Screen_Output.h>
-
-int ace_main_i(int, ACE_TCHAR**);
-
-#endif  // NO_ACE
-// END FaCE specific
-//////
-
-#include "resource.h"
-
-#define MENU_HEIGHT 26
-#define MAX_LOADSTRING    101
-#define MAX_COMMAND_LINE 1001  // Max number of characters + 1 (null at the end) for user-input argv
-
-extern ACE_CE_Screen_Output cout;  // Replacement of std::cout
-
-#endif // !defined(AFX_FACE_H__1043241E_A6A9_4246_A9E4_7A774E19EE73__INCLUDED_)
diff --git a/ACE/contrib/FaCE/FaCE.mpc b/ACE/contrib/FaCE/FaCE.mpc
deleted file mode 100644
index a107075b12d..00000000000
--- a/ACE/contrib/FaCE/FaCE.mpc
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- MPC -*-
-project: aceexe {
-  exename   = FaCE
-  // This is just a dummy_label to prevent the example from being compiled
-  // in MPC builds
-  requires += dummy_label
-  requires += wince
-  lit_libs += aygshell commctrl
-
-  Source_Files {
-    FaCE.cpp
-    Main.cpp
-  }
-}
diff --git a/ACE/contrib/FaCE/FaCE.rc b/ACE/contrib/FaCE/FaCE.rc
deleted file mode 100644
index 1d1b40df81e..00000000000
--- a/ACE/contrib/FaCE/FaCE.rc
+++ /dev/null
@@ -1,268 +0,0 @@
-//Microsoft Developer Studio generated resource script.

-//

-#include "resource.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "newres.h"

-

-/////////////////////////////////////////////////////////////////////////////

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// English (U.S.) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif //_WIN32

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-IDI_FACE                ICON    DISCARDABLE     "FACE.ico"

-

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE DISCARDABLE 

-BEGIN

-    "resource.h\0"

-END

-

-2 TEXTINCLUDE DISCARDABLE 

-BEGIN

-    "#include ""newres.h""\r\n"

-    "\0"

-END

-

-3 TEXTINCLUDE DISCARDABLE 

-BEGIN

-    "\r\n"

-    "\0"

-END

-

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Data

-//

-

-IDM_MENU SHMENUBAR MOVEABLE PURE 

-BEGIN

-    IDM_MENU, 2,

-    I_IMAGENONE, ID_SETTING, TBSTATE_ENABLED, 

-    TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_SETTING, 0, 0,

-    I_IMAGENONE, IDM_MAIN_COMMAND1, TBSTATE_ENABLED, 

-    TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_HELP, 0, 1,

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Menubar

-//

-

-IDM_MENU MENU DISCARDABLE 

-BEGIN

-    POPUP "Setting"

-    BEGIN

-        MENUITEM "Command Line",                ID_SETTING_COMMANDLINE

-        MENUITEM "Run",                         ID_SETTING_RUN

-        MENUITEM SEPARATOR

-        MENUITEM "Exit",                        ID_SETTING_EXIT

-    END

-    POPUP "Tools"

-    BEGIN

-        MENUITEM "About",                       IDM_HELP_ABOUT

-        MENUITEM "Save To File",                ID_TOOLS_SAVETOFILE

-    END

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Dialog

-//

-

-IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 148, 161

-STYLE WS_POPUP | WS_CAPTION

-EXSTYLE 0x80000000L

-CAPTION "About FACE"

-FONT 8, "System"

-BEGIN

-    CONTROL         113,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,33,6,

-                    69,52

-    CTEXT           "Static",IDC_COPYRIGHT,7,86,128,68

-    CONTROL         114,IDC_TAO,"Static",SS_BITMAP,7,61,134,22

-END

-

-IDD_CMDLINE DIALOG DISCARDABLE  0, 0, 125, 50

-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

-CAPTION "Command Line"

-FONT 8, "System"

-BEGIN

-    DEFPUSHBUTTON   "OK",IDOK,7,29,50,14

-    PUSHBUTTON      "Cancel",IDCANCEL,68,29,50,14

-    COMBOBOX        IDC_CMDEDIT,7,7,111,80,CBS_DROPDOWN | CBS_AUTOHSCROLL | 

-                    CBS_OEMCONVERT | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | 

-                    WS_TABSTOP

-END

-

-IDD_OUTFILE DIALOG DISCARDABLE  0, 0, 127, 49

-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

-CAPTION "Output File Name"

-FONT 8, "System"

-BEGIN

-    DEFPUSHBUTTON   "OK",IDOK,7,28,50,14

-    PUSHBUTTON      "Cancel",IDCANCEL,70,28,50,14

-    EDITTEXT        IDC_SAVEFILE,7,7,113,14,ES_AUTOHSCROLL

-END

-

-IDD_ERRFILE DIALOG DISCARDABLE  0, 0, 124, 49

-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

-CAPTION "ERROR"

-FONT 8, "System"

-BEGIN

-    DEFPUSHBUTTON   "OK",IDOK,37,28,50,14

-    CTEXT           "File Creation Error!",IDC_ERRFILE,13,7,98,17,

-                    SS_CENTERIMAGE

-END

-

-IDD_FILEEXIST DIALOG DISCARDABLE  0, 0, 114, 90

-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

-CAPTION "File Exists"

-FONT 8, "System"

-BEGIN

-    DEFPUSHBUTTON   "Overwrite",IDOVERWRITE,32,32,50,14

-    PUSHBUTTON      "Cancel",IDCANCEL,32,68,50,14

-    PUSHBUTTON      "Append",IDC_APPEND,32,50,50,14

-    CTEXT           "File already exists!",IDC_STATIC,7,15,100,11

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Accelerator

-//

-

-IDC_FACE ACCELERATORS DISCARDABLE 

-BEGIN

-    "A",            IDM_HELP_ABOUT,         VIRTKEY, CONTROL, NOINVERT

-    "Q",            IDOK,                   VIRTKEY, CONTROL, NOINVERT

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// DESIGNINFO

-//

-

-#ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO DISCARDABLE 

-BEGIN

-    IDD_ABOUTBOX, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 141

-        TOPMARGIN, 6

-        BOTTOMMARGIN, 154

-    END

-

-    IDD_CMDLINE, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 118

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 43

-    END

-

-    IDD_OUTFILE, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 120

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 42

-    END

-

-    IDD_ERRFILE, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 117

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 42

-    END

-

-    IDD_FILEEXIST, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 107

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 82

-    END

-END

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Bitmap

-//

-

-IDB_ACERACER            BITMAP  DISCARDABLE     "ACE_Racer.bmp"

-IDB_TAO                 BITMAP  DISCARDABLE     "TAO.bmp"

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// String Table

-//

-

-STRINGTABLE DISCARDABLE 

-BEGIN

-    IDS_APP_TITLE           "FaCE"

-    IDC_FACE                "FaCE"

-END

-

-STRINGTABLE DISCARDABLE 

-BEGIN

-    IDS_HELP                "Tools"

-END

-

-STRINGTABLE DISCARDABLE 

-BEGIN

-    IDS_COMMAND1            "Done "

-END

-

-STRINGTABLE DISCARDABLE 

-BEGIN

-    IDS_CAP_SETTING         "Setting"

-END

-

-#endif    // English (U.S.) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-

-#ifndef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-

-

-/////////////////////////////////////////////////////////////////////////////

-#endif    // not APSTUDIO_INVOKED

-

diff --git a/ACE/contrib/FaCE/FaCENOACE.mpc b/ACE/contrib/FaCE/FaCENOACE.mpc
deleted file mode 100644
index cc91b9a048d..00000000000
--- a/ACE/contrib/FaCE/FaCENOACE.mpc
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- MPC -*-
-project: vc_warnings {
-  exename   = FaCENOACE
-  requires += wince
-  macros   += NO_ACE
-  lit_libs += aygshell commctrl
-
-  Source_Files {
-    FaCE.cpp
-    Main.cpp
-    CE_ARGV.cpp
-    CE_Screen_Output.cpp
-  }
-}
diff --git a/ACE/contrib/FaCE/FaCE_OS.h b/ACE/contrib/FaCE/FaCE_OS.h
deleted file mode 100644
index 4043068af52..00000000000
--- a/ACE/contrib/FaCE/FaCE_OS.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    FaCE_OS.h
- *
- *  @author Si Mong Park <spark@ociweb.com>
- */
-//=============================================================================
-
-#ifndef FaCE_OS_h
-#define FaCE_OS_h
-
-// This definition is for the "int FaCE_MAIN(int, wchar_t**)" using FaCE.
-#     define FaCE_MAIN \
-ace_main_i (int, ACE_TCHAR**); \
-extern BOOL InitInstance (HINSTANCE, int); \
-extern void InitSetup(); \
-int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, ACE_TCHAR* lpCmdLine, int nCmdShow) \
-{ \
-    MSG msg; \
-    HACCEL hAccelTable; \
-    if (!InitInstance (hInstance, nCmdShow)) return FALSE; \
-    hAccelTable = LoadAccelerators(hInstance, (const ACE_TCHAR*)IDC_FACE); \
-    InitSetup(); \
-    while (GetMessage(&msg, 0, 0, 0)) { \
-        if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) { \
-            TranslateMessage(&msg); \
-            DispatchMessage(&msg); \
-        } \
-    } \
-    return msg.wParam; \
-} \
-int ace_main_i
-
-#endif  // FaCE_OS_h
diff --git a/ACE/contrib/FaCE/License.txt b/ACE/contrib/FaCE/License.txt
deleted file mode 100644
index 1c58219c67a..00000000000
--- a/ACE/contrib/FaCE/License.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-==
-== Copyright and Licensing Information
-==
-==
-
-ACE(tm) and TAO(tm) are copyrighted by Dr. Douglas C. Schmidt and the Center for Distributed
-Object Computing ('DOC' group) at Washington University, Copyright (C) 1993 - 2002, all rights
-reserved.  Since ACE and TAO are open source, free software, you are free to use, modify, and
-distribute the ACE and TAO source code and object code produced from the source, as long as
-you include this copyright statement along with code built using ACE and TAO.  Please refer to
-ACE and TAO documentations for detailed copyright and license information on ACE and TAO.
-
-FaCE is an additional front-end shell package designed for ACE and TAO testing work for Pocket
-PC 2002 platform, created and released by Object Computing, Inc. (OCI) and distributed with ACE
-and TAO under the same licensing terms. You can modify and change the source of FaCE for your
-own use as long as you provide attribution to OCI by including its copyright statement in your
-distributions of source and object code. OCI welcomes submissions of improvements to the FaCE
-code base.
-
-FaCE is copyrighted by Object Computing, Inc., St. Louis Missouri, Copyright (C) 2002,
-all rights reserved.
-
-
-==
-== Warranty Information
-==
-
-FaCE is provided 'as is' without warranties of any kind.
diff --git a/ACE/contrib/FaCE/Main.cpp b/ACE/contrib/FaCE/Main.cpp
deleted file mode 100644
index dd927c27203..00000000000
--- a/ACE/contrib/FaCE/Main.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// ************************************************
-// ** This file is NOT to be used for framework. **
-// ************************************************
-
-// This file defines the entry point for Windows CE, which is defined in OS.h for real applications.
-
-
-#include "FaCE.h"
-
-extern BOOL InitInstance (HINSTANCE, int);
-extern void InitSetup();
-
-
-int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, ACE_TCHAR*, int nCmdShow)
-{
-    MSG msg;
-    HACCEL hAccelTable;
-    if (!InitInstance (hInstance, nCmdShow)) return FALSE;
-    hAccelTable = LoadAccelerators(hInstance, (const ACE_TCHAR*)IDC_FACE);
-    InitSetup();
-    while (GetMessage(&msg, 0, 0, 0)) {
-        if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) {
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
-        }
-    }
-    return msg.wParam;
-}
-
-
-#ifdef NO_ACE
-
-int main_i(int, ACE_TCHAR**)
-{
-    // this function will be replaced by user's main_ce function
-    return 0;
-}
-
-#else
-
-int ace_main_i(int, ACE_TCHAR**)
-{
-    // this function will be replaced by user's main_ce function
-    return 0;
-}
-
-#endif  // NO_ACE
diff --git a/ACE/contrib/FaCE/README b/ACE/contrib/FaCE/README
deleted file mode 100644
index f81650500ce..00000000000
--- a/ACE/contrib/FaCE/README
+++ /dev/null
@@ -1,283 +0,0 @@
-===
-=== FaCE (Front-end for ACE CE)
-===
-=== Object Computing, Inc.  <http://www.ociweb.com>
-=== St. Louis, Missouri
-=== Copyright (C) 2002.  All rights reserved.
-===
-=== V1.01, March 30th, 2002
-===
-
-== What's FaCE?
-
-FaCE is a simple front-end framework for testing and debugging non-Windows
-CE applications on the Pocket PC 2002 platform.  Originally, FaCE was
-developed to test ACE and TAO components internally in Object Computing, Inc.
-However, since it has shown dramatic increase of productivity in a lot
-shorter amount of time, it has been prepared as a package for all programmers
-who want to test and run existing codes (non-WinCE native codes) on Pocket PC
-2002 and WinCE 3.0.
-
-The features of FaCE are:
-
-  1. command line parameter support
-  2. command line history support (never type in same command line again)
-  3. output displayed on the windows screen
-  4. output to file (with append and overwrite support)
-  5. does not use MFC
-  6. almost no modification to existing user code
-  7. easy to enable and disable after install
-
-* Default project files only contain Pocket PC 2002 platform configuration.
-  A new configuration can be added for other WinCE 3.0 platform from eVC.
-
-
-== Package Contents
-
-Files contained in FaCE package are:
-
- Main Framework Files for both ACE users and non-ACE users
-  - ACE_Racer.bmp
-  - FaCE.h & cpp
-  - FaCE.ico
-  - FaCE.rc
-  - newres.h
-  - resource.h
-  - TAO.bmp
-
- ACE entry point definition file
-  - FaCE_OS.h
-
- Additional Framework files for non-ACE users
-  - CE_ARGV.h & cpp
-  - CE_Screen_Output.h & cpp
-
- Files for loading skeleton FaCE from eVC
-  - FaCE.vcp & vcw      : FaCE Project files for ACE users
-  - FaCENOACE.vcp & vcw : FaCE Project files for non-ACE users
-  - Main.cpp            : almost empty entry point function
-
- Misc. Files
-  - ACE.ico         : a bonus icon of ACE logo
-  - License.txt     : license and warranty information
-  - ReadMe.txt      : this document
-
-
-== Requirement
-
- - Microsoft(C) eMbedded Visual Studio/C++ (eVC) 3.0
- - Pocket PC 2002 SDK
-
- ** For ACE-users only:
- - ACE+TAO installed and configured for WinCE build only for ACE-users
- - ace and ace_os libraries built for WinCE and loaded on machine
-
-
-== Important Note
-
-It has been reported that certain Pocket PC 2002 machines with ARM processor
-can be totally dead and will not even respond to the hard reset.  While the
-real cause of this problem is unknown, HP has released a patch for this
-problem.  We have tested it, and it seems working fine on our machine (HP
-Jornada 568), which is our 5th machine that has been running fine for the
-longest time.
-
-As this has been identified by hardware manufacturer and can be fixed as HP
-did, Object Computing, Inc. (OCI) or any member of ACE+TAO community cannot
-be responsible for this problem.  If this problem happens during debugging,
-contact your hardware manufacturer for fix or replacement.  It has found
-that almost all Pocket PC 2002 machines regardless of manufacturers have same
-problem.
-
-Also, Phil Mesnier at OCI has found that virtual function calls under certain
-situation can cause a problem that randomly changes parameter and pointer
-values over function calls.  This is due to the incorrect instructions
-generated by eVC for ARM processor.  So far, no solution or patch has been
-released by compiler vendor, although vendor is aware of this problem.
-
-Since Pocket PC 2002 is based on WinCE 3.0, ACE+TAO as well as FaCE should
-be able to run on any WinCE 3.0 platform by adding a new configuration with
-minimal change.
-
-
-== Installation & Setup
-
-1. Create a subdirectory named 'FaCE' (or anything in your taste) under
-   your current project directory.
-
-2. Copy FaCE_OS.h to the ACE_ROOT/ace directory, and add following line at
-   the end of your ACE_ROOT/ace/config.h file:
-
-   #include "FaCE_OS.h"
-
-3. Copy main framework files listed above and add them into "your" project
-   (NOT FaCE.vcw/vcp).  For non-ACE users, copy additional framework files
-   for non-ACE users in addition to the main framework files.
-   It would be a good idea to create a new folder in your project and put
-   all FaCE files into it.  This way, it will be easy to disable FaCE by
-   setting the folder excluded from the build on the folder property option.
-
-   ** IMPORTANT! **
-   FaCE does NOT use MFC.  Thus, if your project is already set for
-   'Not using MFC', then do not change the setting.
-
-   * Note: Make sure those files are not shared by multiple executables.
-           Each project must have its own copy of those files.
-           It is a good idea to create a separate folder on your project
-           and put FaCE related files into that folder.  In that case,
-           if you want to disable FaCE and run by using normal 'main',
-           then you can simply set the whole FaCE folder excluded from
-           build in the project setting menu.
-
-4. Change your 'main()' function part similar to the following example.
-
-   #ifdef ACE_HAS_WINCE
-   #include "FaCE/FaCE.h"   // use the name of subdirectory you created
-   int FaCE_MAIN (int argc, ACE_TCHAR *argv[])
-   #else
-   int ACE_TMAIN (int argc, ACE_TCHAR *argv[])  // ACE normal entry point
-   #endif
-
-   Change the directory name for "FaCE/FaCE.h" if necessary.
-   For non-ACE users, use 'UNDER_CE' instead of 'ACE_HAS_WINCE'.
-
-   == Possible Additional Change
-
-   Above change will be the only change if your program compiles and links
-   fine under eVC.  It does not mean that your program is WinCE-ready but
-   just means that your program does not include the libraries that are not
-   supported by WinCE, such as iostream.
-
-   For ACE users, good examples will be the ACE test programs under
-   $ACE_ROOT/test.
-
-   For non-ACE users, I highly recommend to create a project for WinCE first
-   if it has not already been done and write your code using wmain.
-   Try compile and link your program without FaCE to check your program does
-   not include any libraries not supported by WinCE.  FaCE supports text output
-   by aliasing 'cout' in FaCE.h; however, it is NOT a real iostream but an alias
-   for CE_Screen_Output class.  You may need to use '#ifdef UNDER_CE' for your
-   iostream includes, if you want to share the code among different platforms.
-
-   Also, it is important to match the parameter types for 'wmain' function.
-   For WinCE, it MUST be in the format of:
-
-     int FaCE_MAIN (int, wchar_t**)
-
-   and you can leave your original wmain type as it was for non-CE platform
-   definition.
-
-5. Go to 'ResourceView' or double-click on the 'FaCE.rc'.  Open 'String Table ->
-   String Table' from the resource browse view, and change the string value (caption)
-   defined for 'IDS_APP_TITLE' from 'FaCE' to your program name.  This will
-   help identifying multiple FaCE-fied applications when you browse them
-   through system memory -> running programs in case of crash.
-
-6. That's it!
-
-** Optionally, you can personalize the icons defined for FaCE for your own.
-   To do this easily, load "FaCE.vcw" (requires ACE library) or "FaCENOACE.vcw"
-   from eVC.  Also, FaCENOACE.vcw can be used as 'hello world'-type starting
-   frame-work for non-WinCE programmers.
-
-** Non-ACE users may see the warning messages saying, "Could not find the file xxx",
-   for ace.h, Log_Msg.h, OS.h, and CE_Screen_Output.h.  This is due to the eVC's
-   not-so-perfect precompilation file checking and totally harmless.
-
-** Later if you don't want to use FaCE anymore, simply restore your original
-   main function and remove FaCE files from your project (or exclude FaCE files
-   from build).  ACE library does not have to be rebuilt as FaCE_OS.h only
-   contains macro.
-
-== Running FaCE
-
-1. Command line option
-
-User can specify the command line option for the program by using 'Settings ->
-Command Line' from the FaCE menu.  FaCE will automatically save all user-entered
-command line parameters as a ASCII format file named 'Parameters.txt' in the
-root directory of WinCE device/emulator.  User can edit and change by opening
-this file from any text editor and save as a ASCII text file with DOS standard
-CR/LF combo.  This will greatly save time especially when you are working on the
-Pocket PC machine that does not have keyboard.  Remember NOT to convert file
-format to Unicode; it must be standard DOS ASCII text file.
-
-2. Output Saving
-
-You can save output to file by selecting 'Tools -> Save To File'.  By default,
-FaCE will not create/save any file.  Also, any output received before setting
-up this feature will not be saved.
-
-If the file with specified name exists, FaCE will ask whether you want to
-append to the end of file or erase and overwrite.  All output files will be
-saved in the root directory of the system.
-
-3. Running Your Program
-
-'Setting -> Run' will execute your program.  Two tags, 'START' and 'END'
-indicate the beginning and end of your code.
-
-For ACE users, any log message sent to ACE message log (ACE_DEBUG, for example)
-will be displayed on the screen.  Also, if you have setup to save to file,
-the same contents will be saved to the file as well.  Note that the output will
-NOT have ACE internal tags (i.e. Dec 04 14:51:12.000 2001@LM_DEBUG@) because
-FaCE uses callback message function, and ACE does not pass those tags along
-with the output message.
-
-For non-ACE users, you can declare your own local copy of CE_Screen_Output
-object.  For example, you can declare CE_Screen_Output object in your cpp file
-like:
-
-  CE_Screen_Output cout;
-
-and use it like,
-
-  int a = 100;
-  wchar_t* strTemp = L"Hello, world!";
-  cout << L"String : " << strTemp << L"a = " << a << endl;
-
-Remember, CE_Screen_Output is just a simple text output function and does not
-have the full capabilities of iostream, which is not available for WinCE 3.0.
-
-4. In case of crash
-
-If you have started your code, but the code crashes, which can be easily
-identified by looking for the 'END' tag, then you can use Windows CE's memory
-program to kill the process (Start -> Settings -> System tag -> Memory ->
-Running Programs tag).  If you have changed IDS_APP_TITLE in the resource
-viewer, then you will see the name you have specified; otherwise, FaCE will be
-listed.  You can select the name and stop the process by clicking 'Stop' button.
-Sometimes, you may need to reset the machine if you cannot access memory program.
-
-
-== Note
-
-- This FaCE framework does not use any MFC; it only uses general Win32
-  API, thus, your project setting does not have to be changed.
-
-- FaCE is for the 'legacy' Unix/DOS style console applications that
-  do not use any Win32 and MFC for Windows OS.  Programs that are already
-  using native Windows/WinCE API's will not need FaCE framework.
-
-- If you run your application from FaCE (Settings -> Run), 'START' and
-  'END' will appear at the beginning and end of output messages from your
-  application.  If you see 'END' lable after execution, you can run your
-  program again without exit and start up FaCE again.
-
-- Make sure to terminate FaCE by selecting 'Settings -> Exit'.  It will
-  completely terminate FaCE session; Clicking on the 'X' button
-  at the top-left corner of the screen will not, just like most WinCE programs.
-
-- FaCE_MAIN is only for the WinCE port of ACE, ensuring proper windows system
-  message filtering along with proper registraion so that user can see the
-  process from memory setting and task switcher applications.
-
-- ACE and FaCE do not overrides native WinMain.  If you are developing for
-  Windows OS only, your WinMain should be just safe from any overrides.
-  In this case, of course, you don't need to use FaCE package.
-
-
-== Question or Comment
-
-If you have question and/or comment specific to the FaCE, please contact
-Si Park at spark@ociweb.com or Justin Michel at michel_j@ociweb.com.
diff --git a/ACE/contrib/FaCE/TAO.bmp b/ACE/contrib/FaCE/TAO.bmp
deleted file mode 100644
index 1492f789509..00000000000
--- a/ACE/contrib/FaCE/TAO.bmp
+++ /dev/null
diff --git a/ACE/contrib/FaCE/newres.h b/ACE/contrib/FaCE/newres.h
deleted file mode 100644
index c0fcf13874f..00000000000
--- a/ACE/contrib/FaCE/newres.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef __NEWRES_H__
-#define __NEWRES_H__
-
-#if !defined(UNDER_CE)
-#define UNDER_CE _WIN32_WCE
-#endif
-
-#if defined(_WIN32_WCE)
-    #if !defined(WCEOLE_ENABLE_DIALOGEX)
-        #define DIALOGEX DIALOG DISCARDABLE
-    #endif
-    #include <commctrl.h>
-    #define  SHMENUBAR RCDATA
-    #if defined(WIN32_PLATFORM_PSPC) && (_WIN32_WCE >= 300)
-        #include <aygshell.h>
-        #define AFXCE_IDR_SCRATCH_SHMENU  28700
-    #else
-        #define I_IMAGENONE     (-2)
-        #define NOMENU          0xFFFF
-        #define IDS_SHNEW       1
-
-        #define IDM_SHAREDNEW        10
-        #define IDM_SHAREDNEWDEFAULT 11
-    #endif // _WIN32_WCE_PSPC
-    #define AFXCE_IDD_SAVEMODIFIEDDLG 28701
-#endif // _WIN32_WCE
-
-#ifdef RC_INVOKED
-#ifndef _INC_WINDOWS
-#define _INC_WINDOWS
-    #include "winuser.h"           // extract from windows header
-    #include "winver.h"
-    #include "windows.h"
-#endif
-#endif
-
-#ifdef IDC_STATIC
-#undef IDC_STATIC
-#endif
-#define IDC_STATIC      (-1)
-
-#endif //__NEWRES_H__
diff --git a/ACE/contrib/FaCE/resource.h b/ACE/contrib/FaCE/resource.h
deleted file mode 100644
index 385039fa6ac..00000000000
--- a/ACE/contrib/FaCE/resource.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by FaCE.rc
-//
-#define IDS_APP_TITLE                   1
-#define IDC_FACE                        3
-#define IDI_FACE                        101
-#define IDM_MENU                        102
-#define IDD_ABOUTBOX                    103
-#define IDS_HELP                        104
-#define IDD_CMDLINE                     104
-#define IDD_OUTFILE                     105
-#define IDD_ERRFILE                     107
-#define IDD_FILEEXIST                   109
-#define IDB_ACERACER                    113
-#define IDB_TAO                         114
-#define IDS_COMMAND1                    301
-#define IDC_CMDEDIT                     1001
-#define IDC_SAVEFILE                    1002
-#define IDC_ERRFILE                     1003
-#define IDOVERWRITE                     1004
-#define IDC_APPEND                      1005
-#define IDC_COPYRIGHT                   1007
-#define IDC_TAO                         1008
-#define IDM_MAIN_COMMAND1               40001
-#define IDM_HELP_ABOUT                  40003
-#define ID_SETTING                      40004
-#define IDS_CAP_SETTING                 40006
-#define ID_SETTING_COMMANDLINE          40007
-#define ID_SETTING_RUN                  40008
-#define ID_SETTING_EXIT                 40011
-#define ID_TOOLS_SAVETOFILE             40012
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        116
-#define _APS_NEXT_COMMAND_VALUE         40013
-#define _APS_NEXT_CONTROL_VALUE         1009
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/ACE/docs/ACE-porting.html b/ACE/docs/ACE-porting.html
index ead06da4ffe..c111a8a778c 100644
--- a/ACE/docs/ACE-porting.html
+++ b/ACE/docs/ACE-porting.html
@@ -86,7 +86,7 @@ thread APIs: <P>
     called draft 10) [MIT, Linux, and Solaris]. <P>
 
 <LI> <B>Win32 Threads</B> (<CODE>ACE_HAS_WTHREADS</CODE>) - Windows
-    NT, Windows '95/98, and Windows CE <P>
+    NT, Windows '95/98<P>
 
 <LI> <B>VxWorks Tasks</B> (<CODE>ACE_VXWORKS</CODE>) - VxWorks <P>
 </UL>
diff --git a/ACE/docs/CE-status.txt b/ACE/docs/CE-status.txt
deleted file mode 100644
index 963549092f8..00000000000
--- a/ACE/docs/CE-status.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-
-/**
-
-@page wince ACE on Windows CE status
-
-Last updated Friday 14-November-2008 by Johnny Willemsen
-<jwillemsen@remedy.nl>
-
-@subsection ce_status Status
-
-As of ACE 5.6, Remedy IT supports ACE and TAO on Windows CE building with
-Microsoft Visual Studio 2005 and targeting the Windows Mobile 5 and 6. OCI
-supports TAO 1.3 on at least Windows CE 3 with the PocketPC 2002 SDK. Contact
-the individual support provider for complete information regarding these
-platforms as well as the supported hardware targets.
-
-@subsection ce_evc eMbedded Visual C++ Projects
-
-Whereas previous ACE versions had separate ACE and ACE_OS eMbedded Visual C++
-project files, the project and workspace arrangement is now the same as
-for other Windows versions. The project and workspace files themselves are
-generated using the MakeProjectCreator tool when the ACE kit is prepared.
-Both EVC3 and EVC4 use the same project and workspace files.
-
-Developers working with sources checked out from CVS must generate the
-project and workspace files locally using MPC. The autobuild system's
-generate_makefile and generate_workspace commands can be used for this.
-
-@subsection ce_vc8 Visual Studio 2005 Projects
-
-The ACE release process generates the needed Visual Studio 2005 solution and
-project files with "_WinCE" appended to the name (e.g. ACE_WinCE.vcproj) to
-distinguish them from both Win32-targeted VC8 projects (ACE_vc8.vcproj) and
-Visual Studio 2003 projects (ACE_vc71.vcproj). The files are generated with
-the "Pocket PC 2003 SDK (ARMV4)", "Windows Mobile 5.0 Pocket PC SDK
-(ARMV4I)", and "Windows Mobile 6 SDK (ARMV4I)" platforms defined. To add
-additional platforms, the files must be regenerated using MPC.
-
-@subsection ce_wchar Unicode/WChar
-
-ACE on WindowsCE automatically has ACE_HAS_WCHAR and ACE_USES_WCHAR turned
-on. Thus ACE_TCHAR and ACE_TEXT() are the wide char versions.
-
-@subsection ce_tests Running the Test Suite on Windows CE
-
-The ACE test suite in ACE_wrappers/tests is used on Windows CE as well as
-on dekstop Windows. The test suite tools are extended to run remotely
-on the device using the telnet server.
-
-*/
diff --git a/ACE/docs/index.html b/ACE/docs/index.html
index 929c5856ea8..459d5506084 100644
--- a/ACE/docs/index.html
+++ b/ACE/docs/index.html
@@ -87,7 +87,6 @@ ask. <P>
   <li><a href="ACE-SSL.html">ACE+SSL</a> - What is ACE+SSL and how to get it.
   <li><a href="Symbol_Versioning.html">Symbol versioning</a> - How to do symbol versioning
       with ACE+TAO.
-  <li><a href="CE-status.txt">CE-status.txt</a> - The status of ACE on Windows CE.
   <li><a href="ACE-monotonic-timer.html">ACE-monotonic-timer.html</a> - How to use the ACE monotonic timer support.
   <li><a href="../ACEXML/docs/readme.txt">ACEXML</a> - A SAX2-based XML parser ACE uses and provides.
 </ul>
diff --git a/ACE/docs/wchar.txt b/ACE/docs/wchar.txt
index d8b88ad8042..517b89d56b0 100644
--- a/ACE/docs/wchar.txt
+++ b/ACE/docs/wchar.txt
@@ -35,7 +35,7 @@ Like Regular Support, both char and wchar_t versions of some methods are
 available, but unlike Regular Support, other methods that have char arguments
 or return values may have wchar_t arguments or return values.
 
-This has been tested on Windows and Linux, and is the default for Windows CE.
+This has been tested on Windows and Linux.
 
 @subsection wchar_othermacros Other Important Macros
 
diff --git a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
index 3122d0a87da..054aa03f0d2 100644
--- a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
+++ b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
@@ -4,7 +4,7 @@
 
 #include "ace/config-all.h"
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
+#if defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS))
 
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_sys_socket.h"
@@ -351,7 +351,7 @@ int AIO_Client_Logging_Daemon::fini () {
   return 0;
 }
 
-#endif /* (ACE_WIN32 && !ACE_HAS_WINCE) || ACE_HAS_AIO_CALLS */
+#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */
 
 ACE_FACTORY_DEFINE (AIO_CLD, AIO_Client_Logging_Daemon)
 
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc b/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc
index b8fc1278152..56eedf33423 100644
--- a/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc
@@ -7,7 +7,6 @@ project(*C_inclient) : aceexe {
 }
 
 project(*C_inserver) : aceexe {
-  avoids += wince
   exename = C-inserver
   Source_Files {
     C-inserver.cpp
diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc
index 43b42f64429..ba8c411b325 100644
--- a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc
+++ b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 project : aceexe, ace_mfc {
-  avoids += wince
   exename = Log_Msg_MFC
-  Source_Files { 
+  Source_Files {
     Log_Msg_MFC.cpp
     Log_Msg_MFCDlg.cpp
     MFC_Log.cpp
diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp
index c05addf6cc7..1e476e4bb89 100644
--- a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp
+++ b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp
@@ -103,7 +103,6 @@ BOOL CLog_Msg_MFCDlg::OnInitDialog()
     ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX);
     ASSERT(IDM_ABOUTBOX < 0xF000);
 
-#if !defined (_WIN32_WCE)
     CMenu* pSysMenu = GetSystemMenu(FALSE);
     if (pSysMenu != 0)
     {
@@ -115,7 +114,6 @@ BOOL CLog_Msg_MFCDlg::OnInitDialog()
             pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu);
         }
     }
-#endif /* !_WIN32_WCE */
 
     // Set the icon for this dialog.  The framework does this automatically
     //  when the application's main window is not a dialog
diff --git a/ACE/examples/NT_Service/NT_Service.mpc b/ACE/examples/NT_Service/NT_Service.mpc
index 76522621847..756d0562548 100644
--- a/ACE/examples/NT_Service/NT_Service.mpc
+++ b/ACE/examples/NT_Service/NT_Service.mpc
@@ -1,5 +1,4 @@
 // -*- MPC -*-
 project : aceexe, winregistry {
-  avoids += wince
   exename = main
 }
diff --git a/ACE/examples/OS/Process/OS_Process.mpc b/ACE/examples/OS/Process/OS_Process.mpc
index a6cffe93337..3b23928c3ad 100644
--- a/ACE/examples/OS/Process/OS_Process.mpc
+++ b/ACE/examples/OS/Process/OS_Process.mpc
@@ -6,7 +6,6 @@ project(*imore) : aceexe, avoids_ace_for_tao {
   }
 }
 project(*process) : aceexe {
-  avoids += wince
   exename = process
   Source_Files {
     process.cpp
diff --git a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp
index 49775b0ef68..00d21aa59c5 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp
@@ -12,7 +12,7 @@
 
 #include "ace/OS_main.h"
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && _WIN32_WINNT >= 0x400
+#if defined (ACE_WIN32) && _WIN32_WINNT >= 0x400
 
 #include "ace/Reactor.h"
 #include "ace/Auto_Event.h"
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp
index 78035c00323..9a2a4840559 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp
@@ -209,7 +209,7 @@ create_reactor ()
 
   if (opt_wfmo_reactor)
     {
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32)
       ACE_NEW_RETURN (impl,
                       ACE_WFMO_Reactor,
                       0);
diff --git a/ACE/examples/Service_Configurator/Misc/README b/ACE/examples/Service_Configurator/Misc/README
index d9a9568fbd4..d02bf5fed62 100644
--- a/ACE/examples/Service_Configurator/Misc/README
+++ b/ACE/examples/Service_Configurator/Misc/README
@@ -1,25 +1,6 @@
-
-
 This directory contains an example that illustrates how the ACE
 Service Configurator can configure static and dynamic services, both
 from the command-line and from a svc.config file.  We define several
 instances, i.e., Timer_Service_1 and Timer_Service_2 of the SAME
 service just to exercise different configuration options.  A "real"
 application would usually define different services.
-
-Windows CE:
------------
-
-When using Windows CE (WCE) emulator, make sure that you use the
-following command to copy the svc.conf files into the top-level
-directory in CE emulator.
-
-  empfile -c svc.conf1 wce:\svc.conf1
-  empfile -c svc.conf2 wce:\svc.conf2
-
-The command "empfile" moves the files to emulator's root directory and
-resigters the files with CE emulator's object store.
-
-Also make sure you type in at least one argument (which is argv[0],)
-when the program dialog box requests you to key in the program
-arguments.  Otherwise, the program won't run at all.
diff --git a/ACE/examples/Web_Crawler/main.cpp b/ACE/examples/Web_Crawler/main.cpp
index 7a2091ee52d..832548aba8a 100644
--- a/ACE/examples/Web_Crawler/main.cpp
+++ b/ACE/examples/Web_Crawler/main.cpp
@@ -27,9 +27,7 @@ void sig_handler (int)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-#if !defined (ACE_HAS_WINCE)
   ACE_Sig_Action sa ((ACE_SignalHandler) sig_handler, SIGFPE);
-#endif
   Web_Crawler crawler;
 
   if (crawler.open (argc, argv) == -1)
diff --git a/ACE/protocols/ace/INet/inet.mpc b/ACE/protocols/ace/INet/inet.mpc
index 3d7d8c815ca..e0c77ec0bc7 100644
--- a/ACE/protocols/ace/INet/inet.mpc
+++ b/ACE/protocols/ace/INet/inet.mpc
@@ -3,7 +3,6 @@ project(INet) : acelib, ace_output, install {
   sharedname   = ACE_INet
   dynamicflags += ACE_INET_BUILD_DLL
   includes += $(ACE_ROOT)/protocols
-  avoids += wince
   avoids += old_stdstream
   avoids += exclude_inet
   avoids += ace_for_tao
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h
index 6f3c476fb71..b14823f17b0 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h
+++ b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h
@@ -39,13 +39,7 @@
 // The second #undef protects against being reset in a config.h file.
 #undef ACE_NDEBUG
 
-#if defined (ACE_HAS_WINCE)
-// Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'.
-// PPC 2002 only accepts '\log' as a valid directory name, while 'log\' works under WinCE 3.0.
-# define ACE_LOG_DIRECTORY_FOR_MKDIR ACE_TEXT ("\\log")
-# define ACE_LOG_DIRECTORY           ACE_TEXT ("\\log\\")
-# define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X)
-#elif defined (ACE_WIN32)
+#if defined (ACE_WIN32)
 # define ACE_LOG_DIRECTORY ACE_TEXT ("log\\")
 # define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X)
 #else
@@ -53,17 +47,13 @@
 # define MAKE_PIPE_NAME(X) ACE_TEXT (X)
 #endif /* ACE_WIN32 */
 
-#if defined (ACE_HAS_WINCE)
-#define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".txt")
-#else
 #define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".log")
-#endif /* ACE_HAS_WINCE */
 
-#if defined (ACE_HAS_WINCE) || defined (ACE_HAS_PHARLAP)
+#if defined (ACE_HAS_PHARLAP)
 const size_t ACE_MAX_CLIENTS = 4;
 #else
 const size_t ACE_MAX_CLIENTS = 30;
-#endif /* ACE_HAS_WINCE */
+#endif /* ACE_HAS_PHARLAP */
 
 const size_t ACE_NS_MAX_ENTRIES = 1000;
 const size_t ACE_DEFAULT_USECS = 1000;
@@ -205,11 +195,9 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   // Ignore the error value since the directory may already exist.
   const ACE_TCHAR *test_dir {};
 
-#if !defined (ACE_HAS_WINCE)
   test_dir = ACE_OS::getenv (ACE_TEXT ("ACE_TEST_DIR"));
 
   if (test_dir == 0)
-#endif /* ACE_HAS_WINCE */
     test_dir = ACE_TEXT ("");
 
   ACE_OS::sprintf (temp,
@@ -234,14 +222,10 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 # else /* ! VXWORKS */
   // This doesn't seem to work on VxWorks if the directory doesn't
   // exist: it creates a plain file instead of a directory.  If the
-  // directory does exist, it causes a wierd console error message
+  // directory does exist, it causes a weird console error message
   // about "cat: input error on standard input: Is a directory".  So,
   // VxWorks users must create the directory manually.
-#   if defined (ACE_HAS_WINCE)
-  ACE_OS::mkdir (ACE_LOG_DIRECTORY_FOR_MKDIR);
-#   else
   ACE_OS::mkdir (ACE_LOG_DIRECTORY);
-#   endif  // ACE_HAS_WINCE
 # endif /* ! VXWORKS */
 
 # if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
diff --git a/ACE/tests/Bug_3505_Regression_Test.cpp b/ACE/tests/Bug_3505_Regression_Test.cpp
index 0609ec07ed7..291fd895f66 100644
--- a/ACE/tests/Bug_3505_Regression_Test.cpp
+++ b/ACE/tests/Bug_3505_Regression_Test.cpp
@@ -14,7 +14,6 @@
 #include "ace/Service_Gestalt.h"
 #include "test_config.h"
 
-
 int
 run_main (int, ACE_TCHAR *[])
 {
diff --git a/ACE/tests/Bug_3541_Regression_Test.cpp b/ACE/tests/Bug_3541_Regression_Test.cpp
index 8fb700a7d34..302ade29a3b 100644
--- a/ACE/tests/Bug_3541_Regression_Test.cpp
+++ b/ACE/tests/Bug_3541_Regression_Test.cpp
@@ -21,7 +21,7 @@ run_main (int, ACE_TCHAR *[])
 
   int ret = 0;
 
-#if defined(ACE_WIN32) && !defined (ACE_USES_WINCE_SEMA_SIMULATION)
+#if defined(ACE_WIN32)
   int lastError;
 
   // ACE_OS::event_init()
diff --git a/ACE/tests/Bug_3911_Regression_Test.cpp b/ACE/tests/Bug_3911_Regression_Test.cpp
index 7eb5463d201..47b9aafaacd 100644
--- a/ACE/tests/Bug_3911_Regression_Test.cpp
+++ b/ACE/tests/Bug_3911_Regression_Test.cpp
@@ -20,14 +20,14 @@ init_test ()
 {
   // Cleanup the MMAP file so we won't trip over the leftover mmap
   // file from the previous crash.
-#if defined (ACE_HAS_WINCE) || defined (ACE_OPENVMS)
-  // WinCE cannot do fixed base, ever.
+#if defined (ACE_OPENVMS)
+  // OpenVMS cannot do fixed base, ever.
   ACE_MMAP_Memory_Pool_Options options
     (0,
      ACE_MMAP_Memory_Pool_Options::NEVER_FIXED);
 #else
   ACE_MMAP_Memory_Pool_Options options (ACE_DEFAULT_BASE_ADDR);
-#endif /* ACE_HAS_WINCE */
+#endif /* ACE_OPENVMS */
   //FUZZ: disable check_for_lack_ACE_OS
   ACE_MMAP_Memory_Pool mmap (MMAP_FILENAME, &options);
   //FUZZ: enable check_for_lack_ACE_OS
diff --git a/ACE/tests/Bug_3943_Regression_Test.cpp b/ACE/tests/Bug_3943_Regression_Test.cpp
index 2763741b581..b0155ef6d2c 100644
--- a/ACE/tests/Bug_3943_Regression_Test.cpp
+++ b/ACE/tests/Bug_3943_Regression_Test.cpp
@@ -95,7 +95,6 @@ namespace {
                     const DWORD minorVersion,
                     const BYTE productType)
   {
-#if !defined(ACE_HAS_WINCE)
     OSVERSIONINFOEX versioninfo;
     versioninfo.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEX);
     versioninfo.dwMajorVersion = majorVersion;
@@ -170,27 +169,19 @@ namespace {
       }
 
     return 0;
-#else // defined(ACE_HAS_WINCE)
-    // no version testing of WinCE has been performed
-    ACE_UNUSED_ARG (majorVersion);
-    ACE_UNUSED_ARG (minorVersion);
-    ACE_UNUSED_ARG (productType);
-    return -1;
-#endif /* ACE_HAS_WINCE */
   }
 #endif /* ACE_WIN32 */
 
   int processENOBUFS()
   {
-#if defined (ACE_WIN32) && !defined(ACE_HAS_WINCE)
+#if defined (ACE_WIN32)
     // it has been identified that Windows7 does not have the ENOBUFS issue
     // but testing has not been performed on Server 2008 or Vista to identify
-    // wether the issue exists or not
+    // whether the issue exists or not
     return beforeVersion(6, 1, VER_NT_WORKSTATION);
-#else // defined(ACE_HAS_WINCE)
-    // currently, no versions of WINCE identified to not have the ENOBUFS error
+#else
     return 0;
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE */
+#endif /* ACE_WIN32 */
   }
 
   struct IovecGuard
@@ -205,31 +196,31 @@ namespace {
     static const int ALL_SLOTS = -1;
   };
 
+  /*
+   * This class is the product created by both ACE_Connector
+   * and ACE_Acceptor objects.
+   *
+   * This class gets its own header file to work around AIX C++
+   * compiler "features" related to template instantiation...  It is
+   * only used by Conn_Test.cpp.
+   */
   class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
   {
-    // = TITLE
-    //      This class is the product created by both <ACE_Connector>
-    //      and <ACE_Acceptor> objects.
-    //
-    // = DESCRIPTION
-    //    This class gets its own header file to work around AIX C++
-    //    compiler "features" related to template instantiation...  It is
-    //    only used by Conn_Test.cpp.
   public:
-    Svc_Handler (ACE_Thread_Manager * = 0);
     // Do-nothing constructor.
+    Svc_Handler (ACE_Thread_Manager * = nullptr);
 
-    int open (void *) override;
     // Initialization hook.
+    int open (void *) override;
 
-    void send_data ();
     // Send data to server.
+    void send_data ();
 
-    void recv_data ();
     // Recv data from client.
+    void recv_data ();
 
-    int close (u_long = 0) override;
     // Shutdown the <Svc_Handler>.
+    int close (u_long = 0) override;
 
   private:
     enum Direction { READX, WRITEX }; // VxWorks defines READ and WRITE
diff --git a/ACE/tests/Main.cpp b/ACE/tests/Main.cpp
index 46833b5d73f..3d248d70163 100644
--- a/ACE/tests/Main.cpp
+++ b/ACE/tests/Main.cpp
@@ -10,11 +10,8 @@
  */
 //=============================================================================
 
-
 #include "ace/OS_main.h"
-#if defined (ACE_HAS_WINCE)
-#  include "ace/ACE.h"
-#endif /* ACE_HAS_WINCE */
+
 int run_main (int argc, ACE_TCHAR *argv[]);
 
 int
diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp
index 97c419fcfbe..384f99365f1 100644
--- a/ACE/tests/Malloc_Test.cpp
+++ b/ACE/tests/Malloc_Test.cpp
@@ -91,15 +91,15 @@ myallocator (const void *base_addr = 0)
 
   if (static_allocator.get () == 0)
     {
-#if defined (ACE_HAS_WINCE) || defined (ACE_OPENVMS)
-      // WinCE cannot do fixed base, ever.
+#if defined (ACE_OPENVMS)
+      // OpenVMS cannot do fixed base, ever.
       ACE_UNUSED_ARG (base_addr);
       ACE_MMAP_Memory_Pool_Options options
         (0,
          ACE_MMAP_Memory_Pool_Options::NEVER_FIXED);
 #else
       ACE_MMAP_Memory_Pool_Options options (base_addr);
-#endif /* ACE_HAS_WINCE */
+#endif /* ACE_OPENVMS */
 
 #if !defined (ACE_TEST_REMAP_ON_FAULT)
       options.minimum_bytes_ = 512 * 1024;
@@ -118,15 +118,15 @@ init_test (const void *base_addr = 0)
 {
   // Cleanup the MMAP file so we won't trip over the leftover mmap
   // file from the previous crash.
-#if defined (ACE_HAS_WINCE) || defined (ACE_OPENVMS)
-  // WinCE cannot do fixed base, ever.
+#if defined (ACE_OPENVMS)
+  // OpenVMS cannot do fixed base, ever.
   ACE_UNUSED_ARG (base_addr);
   ACE_MMAP_Memory_Pool_Options options
     (0,
      ACE_MMAP_Memory_Pool_Options::NEVER_FIXED);
 #else
   ACE_MMAP_Memory_Pool_Options options (base_addr);
-#endif /* ACE_HAS_WINCE */
+#endif /* ACE_OPENVMS */
   //FUZZ: disable check_for_lack_ACE_OS
   ACE_MMAP_Memory_Pool mmap (MMAP_FILENAME, &options);
   //FUZZ: enable check_for_lack_ACE_OS
@@ -307,7 +307,7 @@ child ()
 // virtual address on every 32 bit process.  On WinNT/2k, memory above
 // 2Gb is reserved for the system.  So, we need to check at runtime
 // (we want an ACE_HAS_WINNT4 == 0 ace to run on either).
-// To catch any odd case arising from Pharlap and/or WinCE, do the
+// To catch any odd case arising from Pharlap, do the
 // run time check and run the NT4-or-better code unless we're on
 // CE or something other than NT4 (Pharlap reports itself as NT 3.51).
 static void
diff --git a/ACE/tests/Message_Queue_Test.cpp b/ACE/tests/Message_Queue_Test.cpp
index ce5163e5be4..be63d886a1a 100644
--- a/ACE/tests/Message_Queue_Test.cpp
+++ b/ACE/tests/Message_Queue_Test.cpp
@@ -44,11 +44,7 @@ using QUEUE = ACE_Message_Queue<ACE_NULL_SYNCH>;
 using ITERATOR = ACE_Message_Queue_Iterator<ACE_NULL_SYNCH>;
 using REVERSE_ITERATOR = ACE_Message_Queue_Reverse_Iterator<ACE_NULL_SYNCH>;
 
-#if defined (ACE_HAS_WINCE)
-static const int MESSAGE_FACTOR = 10000;
-#else
 static const int MESSAGE_FACTOR = 100000;
-#endif
 static const int MAX_MESSAGES = 10000;
 static const int MAX_MESSAGE_SIZE = 32;
 static const char test_message[] = "ACE_Message_Queue Test Message";
diff --git a/ACE/tests/Network_Adapters_Test.cpp b/ACE/tests/Network_Adapters_Test.cpp
index 7ef95d8116d..24838782704 100644
--- a/ACE/tests/Network_Adapters_Test.cpp
+++ b/ACE/tests/Network_Adapters_Test.cpp
@@ -835,7 +835,7 @@ extern "C"
 }
 #endif /* #if defined (ACE_HAS_SIG_C_FUNC) */
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32)
 static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType)
 {
   switch (fdwCtrlType)
@@ -1011,9 +1011,7 @@ run_main (int argc, ACE_TCHAR *argv[])
   ACE_START_TEST (ACE_TEXT ("Network_Adapters_Test"));
 
 #if defined (ACE_WIN32)
-#if !defined (ACE_HAS_WINCE)
   SetConsoleCtrlHandler(&CtrlHandler, TRUE);
-#endif
 #else /* #if defined (ACE_WIN32) */
   // Set a handler for SIGSEGV signal to call for abort.
   ACE_Sig_Action sa1 ((ACE_SignalHandler) sigsegv_handler, SIGSEGV);
diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp
index 03666ca0ae2..e48b46a43de 100644
--- a/ACE/tests/OS_Test.cpp
+++ b/ACE/tests/OS_Test.cpp
@@ -108,7 +108,7 @@ rename_test ()
     }
   ACE_OS::fclose (f);
 
-#if defined (ACE_WIN32) && defined (ACE_LACKS_WIN32_MOVEFILEEX) || defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32) && defined (ACE_LACKS_WIN32_MOVEFILEEX)
   // Can't rename if new_file exists already.
   ACE_OS::unlink (new_file);
 #endif
diff --git a/ACE/tests/Proactor_Test_IPV6.cpp b/ACE/tests/Proactor_Test_IPV6.cpp
index c4e2adb050d..376e7b415c6 100644
--- a/ACE/tests/Proactor_Test_IPV6.cpp
+++ b/ACE/tests/Proactor_Test_IPV6.cpp
@@ -200,7 +200,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op)
 
   ACE_TEST_ASSERT (this->proactor_ == 0);
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32)
 
   ACE_UNUSED_ARG (type_proactor);
   ACE_UNUSED_ARG (max_op);
@@ -264,7 +264,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op)
       break;
   }
 
-#endif // (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#endif // (ACE_WIN32)
 
   // always delete implementation  1 , not  !(proactor_impl == 0)
   ACE_NEW_RETURN (this->proactor_,
@@ -1316,8 +1316,7 @@ Client::initiate_write_stream ()
 
   static const size_t complete_message_length = ACE_OS::strlen (complete_message);
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
-
+#if defined (ACE_WIN32)
   ACE_Message_Block *mb1 = 0,
                     *mb2 = 0,
                     *mb3 = 0;
@@ -1354,7 +1353,7 @@ Client::initiate_write_stream ()
                         ACE_TEXT ("Client::ACE_Asynch_Stream::writev")),
                        -1);
     }
-#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#else /* defined (ACE_WIN32) */
 
   ACE_Message_Block *mb = 0;
 
@@ -1381,7 +1380,7 @@ Client::initiate_write_stream ()
                         ACE_TEXT ("write")),
                        -1);
     }
-#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#endif /* defined (ACE_WIN32) */
 
   this->io_count_++;
   this->total_w_++;
@@ -1397,7 +1396,7 @@ Client::initiate_read_stream ()
   static const size_t complete_message_length =
     ACE_OS::strlen (complete_message);
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if defined (ACE_WIN32)
   ACE_Message_Block *mb1 = 0,
                     *mb2 = 0,
                     *mb3 = 0,
@@ -1446,7 +1445,7 @@ Client::initiate_read_stream ()
                          ACE_TEXT ("Client::ACE_Asynch_Read_Stream::readv")),
                         -1);
     }
-#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#else /* defined (ACE_WIN32) */
 
   // Try to read more chunks
   size_t blksize = ( complete_message_length > BUFSIZ ) ?
@@ -1479,7 +1478,7 @@ Client::initiate_read_stream ()
                          ACE_TEXT ("read")),
                         -1);
     }
-#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#endif /* defined (ACE_WIN32) */
 
   this->io_count_++;
   this->total_r_++;
@@ -1530,7 +1529,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
                     ACE_TEXT ("error"),
                     result.error ()));
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if defined (ACE_WIN32)
         size_t bytes_transferred = result.bytes_transferred ();
         char index = 0;
         for (ACE_Message_Block* mb_i = &mb;
@@ -1561,7 +1560,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
                         index,
                         mb_i->rd_ptr ()));
           }
-#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#else /* defined (ACE_WIN32) */
         // write 0 at string end for proper printout (if end of mb, it's 0 already)
         mb.rd_ptr()[0]  = '\0';
         // move rd_ptr backwards as required for printout
@@ -1570,7 +1569,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
                     ACE_TEXT ("%s = %s\n"),
                     ACE_TEXT ("message_block"),
                     mb.rd_ptr ()));
-#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#endif /* defined (ACE_WIN32) */
 
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("**** end of message ****************\n")));
diff --git a/ACE/tests/Process_Env_Test.cpp b/ACE/tests/Process_Env_Test.cpp
index a7107a0fbec..4b9342c8557 100644
--- a/ACE/tests/Process_Env_Test.cpp
+++ b/ACE/tests/Process_Env_Test.cpp
@@ -14,7 +14,7 @@
 #include "ace/Process.h"
 #include "ace/SString.h"
 
-#if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR)
 using setenvfn_t = void (*)(const ACE_TCHAR *, const ACE_TCHAR *, void *);
 
 void create_large_env (setenvfn_t setenv, void *ctx)
@@ -54,7 +54,7 @@ run_main (int, ACE_TCHAR*[])
   int test_status = 0;
   ACE_START_TEST (ACE_TEXT ("Process_Env_Test"));
 
-#if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR)
   ACE_Process_Options options (
                         0,
                         ACE_Process_Options::DEFAULT_COMMAND_LINE_BUF_LEN,
@@ -120,7 +120,7 @@ run_main (int, ACE_TCHAR*[])
 
 #else
   ACE_DEBUG ((LM_INFO, "This test is for Win32 without ACE_USES_WCHAR\n"));
-#endif /* ACE_WIN32 && !ACE_USES_WCHAR && !ACE_HAS_WINCE */
+#endif /* ACE_WIN32 && !ACE_USES_WCHAR */
 
   ACE_END_TEST;
   return test_status;
diff --git a/ACE/tests/Process_Manager_Test.cpp b/ACE/tests/Process_Manager_Test.cpp
index 7464ffded68..67d8f4d8924 100644
--- a/ACE/tests/Process_Manager_Test.cpp
+++ b/ACE/tests/Process_Manager_Test.cpp
@@ -75,9 +75,7 @@ spawn_child (const ACE_TCHAR *argv0,
              int sleep_time,
              int my_process_id)
 {
-#if defined (ACE_HAS_WINCE)
-const ACE_TCHAR *cmdline_format = ACE_TEXT("%s %d");
-#elif defined (ACE_WIN32)
+#if defined (ACE_WIN32)
 const ACE_TCHAR *cmdline_format = ACE_TEXT("\"%s\" %s %d");
 #elif !defined (ACE_USES_WCHAR)
 const ACE_TCHAR *cmdline_format = ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE_TEXT("%s %s %d");
@@ -134,9 +132,7 @@ const ACE_TCHAR *cmdline_format = ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE
   opts.process_name (argv0);
 #ifndef ACE_LACKS_VA_FUNCTIONS
   opts.command_line (cmdline_format,
-#if !defined (ACE_HAS_WINCE)
                      argv0,
-#endif /* !ACE_HAS_WINCE */
                      cmd,
                      sleep_time);
 #else
diff --git a/ACE/tests/SSL/Main.cpp b/ACE/tests/SSL/Main.cpp
index 46833b5d73f..3d248d70163 100644
--- a/ACE/tests/SSL/Main.cpp
+++ b/ACE/tests/SSL/Main.cpp
@@ -10,11 +10,8 @@
  */
 //=============================================================================
 
-
 #include "ace/OS_main.h"
-#if defined (ACE_HAS_WINCE)
-#  include "ace/ACE.h"
-#endif /* ACE_HAS_WINCE */
+
 int run_main (int argc, ACE_TCHAR *argv[]);
 
 int
diff --git a/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp b/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp
index 8a52126f1b0..162d22215fb 100644
--- a/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp
+++ b/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp
@@ -38,8 +38,7 @@
 #include "ace/SSL/SSL_SOCK_Acceptor.h"
 #include "ace/SSL/SSL_SOCK_Stream.h"
 
-
-#if defined (ACE_HAS_THREADS) && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_THREADS) && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS)))
   // This only works on Win32 platforms and on Unix platforms
   // supporting POSIX aio calls.
 
diff --git a/ACE/tests/Service_Config_Test.cpp b/ACE/tests/Service_Config_Test.cpp
index faecd5b834b..78f8dd5e38b 100644
--- a/ACE/tests/Service_Config_Test.cpp
+++ b/ACE/tests/Service_Config_Test.cpp
@@ -676,7 +676,7 @@ testNonACEThread ()
 
   u_int errors_before = error;
 
-#if defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WTHREADS)
   HANDLE thr_h = (HANDLE)_beginthreadex (0,
                                          0,
                                          &nonacethreadentry,
diff --git a/ACE/tests/Thread_Pool_Test.cpp b/ACE/tests/Thread_Pool_Test.cpp
index 0a76061e31a..7be44853b36 100644
--- a/ACE/tests/Thread_Pool_Test.cpp
+++ b/ACE/tests/Thread_Pool_Test.cpp
@@ -223,14 +223,12 @@ Thread_Pool::test_queue_deactivation_shutdown ()
 
       if (manual)
         {
-#if !defined (ACE_HAS_WINCE)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("(%t) enter a new message for ")
                       ACE_TEXT ("the task pool...")));
           n = ACE_OS::read (ACE_STDIN,
                             mb->wr_ptr (),
                             mb->size ());
-#endif  // ACE_HAS_WINCE
         }
       else
         {
@@ -315,14 +313,12 @@ Thread_Pool::test_empty_message_shutdown ()
 
       if (manual)
         {
-#if !defined (ACE_HAS_WINCE)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("(%t) enter a new message for ")
                       ACE_TEXT ("the task pool...")));
           n = ACE_OS::read (ACE_STDIN,
                             mb->wr_ptr (),
                             mb->size ());
-#endif  // ACE_HAS_WINCE
         }
       else
         {
diff --git a/ACE/tests/Unload_libACE.cpp b/ACE/tests/Unload_libACE.cpp
index b1a1b2d831b..ed0e775b8ac 100644
--- a/ACE/tests/Unload_libACE.cpp
+++ b/ACE/tests/Unload_libACE.cpp
@@ -240,11 +240,9 @@ main (int, char **)
 #else
 # if defined (WIN32) && defined (ACE_USES_WCHAR)
 // Borrow include list from ace_wchar.h
-# if defined (ACE_HAS_WINCE)
-#   include /**/ <wtypes.h>
-# elif !defined (__BORLANDC__)
+# if !defined (__BORLANDC__)
 #   include /**/ <wchar.h>
-# endif /* ACE_HAS_WINCE || __BORLANDC__ */
+# endif /* __BORLANDC__ */
 
 int
 wmain (int, wchar_t **)
diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst
index 26069c4b405..afe19c68eee 100644
--- a/ACE/tests/run_test.lst
+++ b/ACE/tests/run_test.lst
@@ -122,7 +122,7 @@ Dirent_Test: !VxWorks_RTP !LabVIEW_RT
 Dynamic_Priority_Test
 Dynamic_Test
 Enum_Interfaces_Test: !NO_NETWORK !LynxOS
-Env_Value_Test: !WinCE !LabVIEW_RT
+Env_Value_Test: !LabVIEW_RT
 FIFO_Test: !ACE_FOR_TAO
 Framework_Component_Test: !STATIC !nsk
 Future_Set_Test: !nsk !ACE_FOR_TAO
@@ -279,7 +279,7 @@ SOCK_SEQPACK_SCTP_Test: !MSVC !nsk !ACE_FOR_TAO
 SOCK_Test_IPv6: !nsk
 Process_Strategy_Test: !VxWorks !LynxOS !ACE_FOR_TAO !PHARLAP
 Recursive_Condition_Bug_Test: !ST
-UnloadLibACE: !STATIC !WinCE !LabVIEW_RT
+UnloadLibACE: !STATIC !LabVIEW_RT
 UUID_Test: !NO_UUID !ACE_FOR_TAO
 Wild_Match_Test
 SSL/Bug_2912_Regression_Test: SSL !ACE_FOR_TAO !BAD_AIO
diff --git a/ACE/tests/test_config.h b/ACE/tests/test_config.h
index 82b7059ab75..beb395d7b6e 100644
--- a/ACE/tests/test_config.h
+++ b/ACE/tests/test_config.h
@@ -35,13 +35,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Log_Msg.h"
 
-#if defined (ACE_HAS_WINCE)
-// Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'.
-// PPC 2002 only accepts '\log' as a valid directory name, while 'log\' works under WinCE 3.0.
-# define ACE_LOG_DIRECTORY_FOR_MKDIR ACE_TEXT ("\\log")
-# define ACE_LOG_DIRECTORY           ACE_TEXT ("\\log\\")
-# define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X)
-#elif defined (ACE_WIN32)
+#if defined (ACE_WIN32)
 # define ACE_LOG_DIRECTORY ACE_TEXT ("log\\")
 # define ACE_LOG_DIRECTORY_FOR_MKDIR ACE_TEXT ("log\\")
 # define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X)
@@ -63,11 +57,11 @@
 # define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".log")
 #endif /* ACE_LOG_FILE_EXT_NAME */
 
-#if defined (ACE_HAS_WINCE) || defined (ACE_HAS_PHARLAP)
+#if defined (ACE_HAS_PHARLAP)
 size_t const ACE_MAX_CLIENTS = 4;
 #else
 size_t const ACE_MAX_CLIENTS = 30;
-#endif /* ACE_HAS_WINCE */
+#endif /* ACE_HAS_PHARLAP */
 
 size_t const ACE_NS_MAX_ENTRIES = 1000;
 size_t const ACE_DEFAULT_USECS = 1000;
diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc
index 3a311cb2fae..3bf798d63d3 100644
--- a/ACE/tests/tests.mpc
+++ b/ACE/tests/tests.mpc
@@ -2194,7 +2194,6 @@ project(Based Pointer Test) : acetest {
 }
 
 project(Library Unload): unload_libace {
-  avoids += wince
   exename = UnloadLibACE
   staticflags += ACE_AS_STATIC_LIBS
   Source_Files {
diff --git a/TAO/MPC/config/notify_monitor_control.mpb b/TAO/MPC/config/notify_monitor_control.mpb
index 026b234b94a..c8951b1fb68 100644
--- a/TAO/MPC/config/notify_monitor_control.mpb
+++ b/TAO/MPC/config/notify_monitor_control.mpb
@@ -1,6 +1,5 @@
 // -*- MPC -*-
 feature(notify_monitor_control): svc_utils {
-  avoids += wince
   after += TAO_Monitor CosNotification_MC CosNotification_MC_Ext
   libs  += TAO_CosNotification_MC_Ext TAO_CosNotification_MC TAO_Monitor
   macros += TAO_HAS_NOTIFICATION_MONITOR_CONTROL
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index 1bfc3b652ac..13706bef7db 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -42,7 +42,7 @@ to run TAO on:<P>
   </tr>
   <tr valign=top>
     <td><b>Partially supported, i.e., infrequently tested</b></td>
-    <td>Solaris 9, FreeBSD, NetBSD, Windows CE, MacOSX, Linux/Alpha (RedHat, SuSE, and Debian), and AIX 5.x
+    <td>Solaris 9, FreeBSD, NetBSD, MacOSX, Linux/Alpha (RedHat, SuSE, and Debian), and AIX 5.x
     </td>
   </tr>
   <tr valign=top bgcolor="#AFAFAF">
diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst
index ea47acd20b5..1d505fb5b88 100644
--- a/TAO/bin/tao_orb_tests.lst
+++ b/TAO/bin/tao_orb_tests.lst
@@ -284,7 +284,7 @@ TAO/tests/CallbackTest/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/CallbackTest/run_test_ipv6.pl: IPV6 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/CallbackTest/run_test_mixed_ip.pl: IPV6 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Crashed_Callback/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !OpenVMS_IA64Crash
-# Disabled Crash On Write on Win32, see bugzilla 959 why !LabVIEW_RT !WinCE
+# Disabled Crash On Write on Win32, see bugzilla 959 why !LabVIEW_RT
 TAO/tests/Crash_On_Write/run_test.pl: !ST !Win32
 TAO/tests/Mixed_Sync_ASync_Events/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Mixed_Sync_ASync_Events/run_exclusive_rw.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
index ca175391239..06f3f6b3dee 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
@@ -11,13 +11,11 @@ Trading_Shutdown::Trading_Shutdown (Trading_Service& trader)
                 ACE_TEXT("%p\n"),
                 ACE_TEXT("register_handler")));
 
-#ifndef ACE_HAS_WINCE
   if (this->shutdown_.register_handler (SIGTERM,
                                         this) == -1)
     ORBSVCS_ERROR ((LM_ERROR,
                 ACE_TEXT("%p\n"),
                 ACE_TEXT("register_handler")));
-#endif  // ACE_HAS_WINCE
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
index 464f46def2e..58b71530eb1 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
@@ -25,12 +25,8 @@
 # pragma warning (disable : 4250)
 #endif /* _MSC_VER */
 
-// Note: 'interface' has been defined as struct on WinCE platform and
-//       gives a compiler error.  This undef has been found harmless on
-//       Windows and solaris platforms; however, if this generates
-//       error, then proper ifdef must be added around following block.
 #if defined (interface)
-#undef interface
+# undef interface
 #endif  // interface
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index a7b0e2bf5f0..50fa3272b9f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -26,11 +26,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 //////////////////////
 
 // compare the DFS finish times of two task entries, order higher time *first*
-#if defined (ACE_HAS_WINCE)
-int _cdecl compare_entry_finish_times (const void *first, const void *second)
-#else
 extern "C" int compare_entry_finish_times (const void *first, const void *second)
-#endif  // ACE_HAS_WINCE
 {
   // sort blank entries to the end
   if (! first)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
index 74e5d01c316..9421340692f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
@@ -15,15 +15,11 @@
 // Helper function type definition for sort //
 //////////////////////////////////////////////
 
-#if defined (ACE_HAS_WINCE)
-typedef int (_cdecl* COMP_FUNC) (const void*, const void*);
-#else
 // This is awkward, but it makes MSVC++ happy.
 extern "C"
 {
 typedef int (*COMP_FUNC) (const void*, const void*);
 }
-#endif  // ACE_HAS_WINCE
 
 ///////////////////////////////////////////////////
 // class ACE_Strategy_Scheduler member functions //
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
index 9f25a876c4a..fcdd9eaa8ed 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
@@ -244,11 +244,7 @@ protected:
 
 private:
     // = Comparison function to pass to qsort: calls instance ()->sort_comp ().
-#if defined (ACE_HAS_WINCE)
-  static int _cdecl sort_function (void *arg1, void *arg2);
-#else
   static int sort_function (void *arg1, void *arg2);
-#endif  // ACE_HAS_WINCE
 
     /// Instance of the strategy.
   static ACE_MUF_Scheduler_Strategy *instance_;
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
index 15ac48ac812..2f3c009efb1 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
@@ -77,7 +77,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   // Ignore the error value since the directory may already exist.
   const ACE_TCHAR *test_dir {};
 
-#if !defined (ACE_HAS_WINCE)
 #  if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
   test_dir = ACE_OS::getenv (ACE_TEXT ("ACE_TEST_DIR"));
 #  else
@@ -93,7 +92,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 #  endif /* ACE_WIN32 || !ACE_USES_WCHAR */
 
   if (test_dir == 0)
-#endif /* ACE_HAS_WINCE */
     test_dir = ACE_TEXT ("");
 
   // This could be done with ACE_OS::sprintf() but it requires different
@@ -123,11 +121,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   // directory does exist, it causes a wierd console error message
   // about "cat: input error on standard input: Is a directory".  So,
   // VxWorks users must create the directory manually.
-#   if defined (ACE_HAS_WINCE)
-      ACE_OS::mkdir (ACE_LOG_DIRECTORY_FOR_MKDIR);
-#   else
       ACE_OS::mkdir (ACE_LOG_DIRECTORY);
-#   endif  // ACE_HAS_WINCE
 # endif /* ! VXWORKS */
 
 # if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
index 15ac48ac812..2f3c009efb1 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
@@ -77,7 +77,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   // Ignore the error value since the directory may already exist.
   const ACE_TCHAR *test_dir {};
 
-#if !defined (ACE_HAS_WINCE)
 #  if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
   test_dir = ACE_OS::getenv (ACE_TEXT ("ACE_TEST_DIR"));
 #  else
@@ -93,7 +92,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 #  endif /* ACE_WIN32 || !ACE_USES_WCHAR */
 
   if (test_dir == 0)
-#endif /* ACE_HAS_WINCE */
     test_dir = ACE_TEXT ("");
 
   // This could be done with ACE_OS::sprintf() but it requires different
@@ -123,11 +121,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   // directory does exist, it causes a wierd console error message
   // about "cat: input error on standard input: Is a directory".  So,
   // VxWorks users must create the directory manually.
-#   if defined (ACE_HAS_WINCE)
-      ACE_OS::mkdir (ACE_LOG_DIRECTORY_FOR_MKDIR);
-#   else
       ACE_OS::mkdir (ACE_LOG_DIRECTORY);
-#   endif  // ACE_HAS_WINCE
 # endif /* ! VXWORKS */
 
 # if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
index 15ac48ac812..2f3c009efb1 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
@@ -77,7 +77,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   // Ignore the error value since the directory may already exist.
   const ACE_TCHAR *test_dir {};
 
-#if !defined (ACE_HAS_WINCE)
 #  if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
   test_dir = ACE_OS::getenv (ACE_TEXT ("ACE_TEST_DIR"));
 #  else
@@ -93,7 +92,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 #  endif /* ACE_WIN32 || !ACE_USES_WCHAR */
 
   if (test_dir == 0)
-#endif /* ACE_HAS_WINCE */
     test_dir = ACE_TEXT ("");
 
   // This could be done with ACE_OS::sprintf() but it requires different
@@ -123,11 +121,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   // directory does exist, it causes a wierd console error message
   // about "cat: input error on standard input: Is a directory".  So,
   // VxWorks users must create the directory manually.
-#   if defined (ACE_HAS_WINCE)
-      ACE_OS::mkdir (ACE_LOG_DIRECTORY_FOR_MKDIR);
-#   else
       ACE_OS::mkdir (ACE_LOG_DIRECTORY);
-#   endif  // ACE_HAS_WINCE
 # endif /* ! VXWORKS */
 
 # if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
diff --git a/TAO/orbsvcs/tests/HTIOP/test_config.h b/TAO/orbsvcs/tests/HTIOP/test_config.h
index 6a0904281cf..e08ad3c0a52 100644
--- a/TAO/orbsvcs/tests/HTIOP/test_config.h
+++ b/TAO/orbsvcs/tests/HTIOP/test_config.h
@@ -35,13 +35,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Log_Msg.h"
 
-#if defined (ACE_HAS_WINCE)
-// Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'.
-// PPC 2002 only accepts '\log' as a valid directory name, while 'log\' works under WinCE 3.0.
-# define ACE_LOG_DIRECTORY_FOR_MKDIR ACE_TEXT ("\\log")
-# define ACE_LOG_DIRECTORY           ACE_TEXT ("\\log\\")
-# define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X)
-#elif defined (ACE_WIN32)
+#if defined (ACE_WIN32)
 # define ACE_LOG_DIRECTORY ACE_TEXT ("log\\")
 # define ACE_LOG_DIRECTORY_FOR_MKDIR ACE_TEXT ("log\\")
 # define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X)
@@ -57,11 +51,11 @@
 
 #define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".log")
 
-#if defined (ACE_HAS_WINCE) || defined (ACE_HAS_PHARLAP)
+#if defined (ACE_HAS_PHARLAP)
 size_t const ACE_MAX_CLIENTS = 4;
 #else
 size_t const ACE_MAX_CLIENTS = 30;
-#endif /* ACE_HAS_WINCE */
+#endif /* ACE_HAS_PHARLAP */
 
 size_t const ACE_NS_MAX_ENTRIES = 1000;
 size_t const ACE_DEFAULT_USECS = 1000;
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index 72a37aaaea1..7a4f1bca094 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -454,7 +454,6 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl () const
 
 #if defined(ACE_WIN32) \
   && !defined (ACE_LACKS_MSG_WFMO) \
-  && !defined (ACE_HAS_WINCE)      \
   && !defined (ACE_HAS_PHARLAP)
     case TAO_REACTOR_MSGWFMO:
       ACE_NEW_RETURN (impl, ACE_Msg_WFMO_Reactor (0, tmq.get ()), 0);
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index f8aa2c5beec..c4df7669a0d 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -152,8 +152,6 @@ CORBA::SystemException::_tao_errno (int errno_value)
       return TAO_ECONNREFUSED_MINOR_CODE;
     case ENOENT:
       return TAO_ENOENT_MINOR_CODE;
-
-#if !defined (ACE_HAS_WINCE)
     case EMFILE:
       return TAO_EMFILE_MINOR_CODE;
     case EBADF:
@@ -162,8 +160,6 @@ CORBA::SystemException::_tao_errno (int errno_value)
       return TAO_EPERM_MINOR_CODE;
     case EINVAL:
       return TAO_EINVAL_MINOR_CODE;
-#endif  // ACE_HAS_WINCE
-
 #if (ENOSYS != EFAULT)
     case ENOSYS:
       return TAO_ENOSYS_MINOR_CODE;
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index fe76c2aec9b..9c6c32cfbc7 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -964,7 +964,7 @@ namespace
     // NOTE: When adding new global arguments, ensure they are only
     // applied when apply_values is true, but that they are always
     // consumed, if they need to be consumed.
-#if defined (TAO_DEBUG) && !defined (ACE_HAS_WINCE)
+#if defined (TAO_DEBUG)
     // Make it a little easier to debug programs using this code.
     if (apply_values)
       {
@@ -982,7 +982,7 @@ namespace
                         TAO_debug_level));
           }
       }
-#endif  /* TAO_DEBUG && !ACE_HAS_WINCE */
+#endif  /* TAO_DEBUG */
 
     // Extract the Service Configurator ORB options from the argument
     // vector.