ChangeLogTag:Thu May 2 12:00:15 UTC 2002 Don Hinton <dhinton@ieee.org>

16 files changed, 164 insertions, 49 deletions

diff --git a/ChangeLog b/ChangeLog
index 4881df0d9d8..89fa90e3d8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+Thu May  2 12:00:15 UTC 2002  Don Hinton  <dhinton@ieee.org>
+
+	* ace/OS.h:  Uncommented ACE_DEFAULT_MUTEX defs since they are used
+	  in the tests.  Perhaps they should be moved...
+
+	* apps/gperf/src/Options.h: Removed Log_Msg.h and OS.h, added 
+	  config-all.h and ace_sys_types.h.
+
+	* apps/gperf/src/Gen_Perf.cpp: Added Log_Msg.h.
+
+	* apps/gperf/src/Key_List.cpp: Added OS_String.h and OS.h.  Changed ACE_OS to
+	  ACE_OS_String for string functions, e.g., strcmp.
+
+	* ace/gperf/src/List_Node.cpp: Added Log_Msg.h and ace_ctype.h.
+
+	* apps/gperf/src/Iterator.cpp: Added include of ace_ctype.h.
+
+	* apps/gperf/src/Hash_Table.cpp: Added Log_Msg.h and
+	  OS_String.h.  Changed ACE_OS to ACE_OS_String for string related
+	  functions.
+
+	* apps/gperf/src/Bool_Array.cpp: Added Log_Msg.h and OS_Errno.h.
+
+	* apps/drwho/Rwho_DB_Manager.h:  Added ace_sys_param.h.
+
+	* apps/drwho/Multicast_Manager.cpp: Added ace_ctype.h and OS_String.h, changed
+	  ACE_OS to ACE_OS_String where needed.
+
+	* apps/drwho/File_Manager.cpp: 
+	* apps/drwho/PM_Server.cpp:  
+	* apps/drwho/HT_Server.cpp:  Added OS_String.h, and used it for string 
+	  functions.
+	
 Thu May  2 10:15:22 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
 	* ace/OS.h:
@@ -5,7 +38,7 @@ Thu May  2 10:15:22 UTC 2002  Don Hinton  <dhinton@ieee.org>
 	  Removed commented out/unneeded includes.  Removed ACE_HAS_BROKEN_IF_HEADER
 	  ifafilt struct declaration that didn't seem to be used.
 
-	  OS.h is now under 2000 lines!  It may get below 1500 before its all over!
+	  OS.h is now under 2000 lines!  It may get below 1500 before it's all over!
 
 Thu May  2 09:11:17 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 4881df0d9d8..89fa90e3d8c 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,36 @@
+Thu May  2 12:00:15 UTC 2002  Don Hinton  <dhinton@ieee.org>
+
+	* ace/OS.h:  Uncommented ACE_DEFAULT_MUTEX defs since they are used
+	  in the tests.  Perhaps they should be moved...
+
+	* apps/gperf/src/Options.h: Removed Log_Msg.h and OS.h, added 
+	  config-all.h and ace_sys_types.h.
+
+	* apps/gperf/src/Gen_Perf.cpp: Added Log_Msg.h.
+
+	* apps/gperf/src/Key_List.cpp: Added OS_String.h and OS.h.  Changed ACE_OS to
+	  ACE_OS_String for string functions, e.g., strcmp.
+
+	* ace/gperf/src/List_Node.cpp: Added Log_Msg.h and ace_ctype.h.
+
+	* apps/gperf/src/Iterator.cpp: Added include of ace_ctype.h.
+
+	* apps/gperf/src/Hash_Table.cpp: Added Log_Msg.h and
+	  OS_String.h.  Changed ACE_OS to ACE_OS_String for string related
+	  functions.
+
+	* apps/gperf/src/Bool_Array.cpp: Added Log_Msg.h and OS_Errno.h.
+
+	* apps/drwho/Rwho_DB_Manager.h:  Added ace_sys_param.h.
+
+	* apps/drwho/Multicast_Manager.cpp: Added ace_ctype.h and OS_String.h, changed
+	  ACE_OS to ACE_OS_String where needed.
+
+	* apps/drwho/File_Manager.cpp: 
+	* apps/drwho/PM_Server.cpp:  
+	* apps/drwho/HT_Server.cpp:  Added OS_String.h, and used it for string 
+	  functions.
+	
 Thu May  2 10:15:22 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
 	* ace/OS.h:
@@ -5,7 +38,7 @@ Thu May  2 10:15:22 UTC 2002  Don Hinton  <dhinton@ieee.org>
 	  Removed commented out/unneeded includes.  Removed ACE_HAS_BROKEN_IF_HEADER
 	  ifafilt struct declaration that didn't seem to be used.
 
-	  OS.h is now under 2000 lines!  It may get below 1500 before its all over!
+	  OS.h is now under 2000 lines!  It may get below 1500 before it's all over!
 
 Thu May  2 09:11:17 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 4881df0d9d8..89fa90e3d8c 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,36 @@
+Thu May  2 12:00:15 UTC 2002  Don Hinton  <dhinton@ieee.org>
+
+	* ace/OS.h:  Uncommented ACE_DEFAULT_MUTEX defs since they are used
+	  in the tests.  Perhaps they should be moved...
+
+	* apps/gperf/src/Options.h: Removed Log_Msg.h and OS.h, added 
+	  config-all.h and ace_sys_types.h.
+
+	* apps/gperf/src/Gen_Perf.cpp: Added Log_Msg.h.
+
+	* apps/gperf/src/Key_List.cpp: Added OS_String.h and OS.h.  Changed ACE_OS to
+	  ACE_OS_String for string functions, e.g., strcmp.
+
+	* ace/gperf/src/List_Node.cpp: Added Log_Msg.h and ace_ctype.h.
+
+	* apps/gperf/src/Iterator.cpp: Added include of ace_ctype.h.
+
+	* apps/gperf/src/Hash_Table.cpp: Added Log_Msg.h and
+	  OS_String.h.  Changed ACE_OS to ACE_OS_String for string related
+	  functions.
+
+	* apps/gperf/src/Bool_Array.cpp: Added Log_Msg.h and OS_Errno.h.
+
+	* apps/drwho/Rwho_DB_Manager.h:  Added ace_sys_param.h.
+
+	* apps/drwho/Multicast_Manager.cpp: Added ace_ctype.h and OS_String.h, changed
+	  ACE_OS to ACE_OS_String where needed.
+
+	* apps/drwho/File_Manager.cpp: 
+	* apps/drwho/PM_Server.cpp:  
+	* apps/drwho/HT_Server.cpp:  Added OS_String.h, and used it for string 
+	  functions.
+	
 Thu May  2 10:15:22 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
 	* ace/OS.h:
@@ -5,7 +38,7 @@ Thu May  2 10:15:22 UTC 2002  Don Hinton  <dhinton@ieee.org>
 	  Removed commented out/unneeded includes.  Removed ACE_HAS_BROKEN_IF_HEADER
 	  ifafilt struct declaration that didn't seem to be used.
 
-	  OS.h is now under 2000 lines!  It may get below 1500 before its all over!
+	  OS.h is now under 2000 lines!  It may get below 1500 before it's all over!
 
 Thu May  2 09:11:17 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
diff --git a/ace/OS.h b/ace/OS.h
index 2e9b9db78fc..24f266491f5 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -1951,8 +1951,8 @@ extern "C" ACE_OS_Export void ace_mutex_lock_cleanup_adapter (void *args);
 # endif /* ACE_HAS_THR_C_FUNC */
 
 /////////////////////////////////////////////////////////////////////////////
-// These don't seem to be used anywhere...
-#if 0
+// These don't seem to be used anywhere... except in the tests!!!
+// looks like Global_Macros.h or Default_Constants might be a better place...
 # if !defined (ACE_DEFAULT_MUTEX_A)
 #   define ACE_DEFAULT_MUTEX_A "ACE_MUTEX"
 # endif /* ACE_DEFAULT_MUTEX_A */
@@ -1962,7 +1962,6 @@ extern "C" ACE_OS_Export void ace_mutex_lock_cleanup_adapter (void *args);
 # endif /* ACE_HAS_WCHAR */
 
 # define ACE_DEFAULT_MUTEX ACE_LIB_TEXT (ACE_DEFAULT_MUTEX_A)
-#endif /* 0 */
 
 //////////////////////////////////////////////////////////////////////////////
 // Need to look into getting rid of this--or moving it to a move apropriate place.
diff --git a/apps/drwho/File_Manager.cpp b/apps/drwho/File_Manager.cpp
index 83bdc87f338..84901b426e8 100644
--- a/apps/drwho/File_Manager.cpp
+++ b/apps/drwho/File_Manager.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "File_Manager.h"
+#include "ace/OS_String.h"
 
 File_Manager::File_Manager (void)
   : number_of_friends (0),
@@ -81,7 +82,7 @@ File_Manager::open_passwd_file (void)
        (pwent = ACE_OS::getpwent ()) != 0; )
     if (*pwent->pw_gecos != '\0')
       {
-	char *cp = strchr (pwent->pw_gecos, ',');
+	char *cp = ACE_OS_String::strchr (pwent->pw_gecos, ',');
 
 	if (cp != 0)
 	  *cp = '\0';
diff --git a/apps/drwho/HT_Server.cpp b/apps/drwho/HT_Server.cpp
index 5af2b21c4b5..9285ee01f3e 100644
--- a/apps/drwho/HT_Server.cpp
+++ b/apps/drwho/HT_Server.cpp
@@ -2,6 +2,7 @@
 
 #include "HT_Server.h"
 #include "ace/ACE.h"
+#include "ace/OS_String.h"
 
 // Insert a KEY_NAME into the hash table, if it doesn't already exist
 // there.  What gets returned is a pointer to the node inserted.  Note
@@ -15,7 +16,7 @@ HT_Server::insert (const char *key_name, int max_len)
   // This is tricky...
 
   for (prpp = &this->hash_table[ACE::hash_pjw (key_name) % this->hash_table_size];
-       *prpp != 0 && strncmp ((*prpp)->get_login (), key_name, max_len) != 0;
+       *prpp != 0 && ACE_OS_String::strncmp ((*prpp)->get_login (), key_name, max_len) != 0;
        prpp = &(*prpp)->next_)
     continue;
 
diff --git a/apps/drwho/Multicast_Manager.cpp b/apps/drwho/Multicast_Manager.cpp
index f213a65846e..c7b706492e4 100644
--- a/apps/drwho/Multicast_Manager.cpp
+++ b/apps/drwho/Multicast_Manager.cpp
@@ -3,6 +3,8 @@
 #include "Multicast_Manager.h"
 #include "ace/Mem_Map.h"
 #include "ace/Log_Msg.h"
+#include "ace/ace_ctype.h"
+#include "ace/OS_String.h"
 
 // Initialize all the static member vars.
 int Multicast_Manager::received_host_count = 0;
@@ -80,12 +82,12 @@ Multicast_Manager::get_next_host_addr (in_addr &host_addr)
         }
 
       Multicast_Manager::received_host_count++;
-      ACE_OS::memcpy (&host_addr,
-                      hp->h_addr,
-                      sizeof host_addr);
-      ACE_OS::memcpy (&Multicast_Manager::current_ptr->host_addr,
-                      hp->h_addr,
-                      sizeof host_addr);
+      ACE_OS_String::memcpy (&host_addr,
+                             hp->h_addr,
+                             sizeof host_addr);
+      ACE_OS_String::memcpy (&Multicast_Manager::current_ptr->host_addr,
+                             hp->h_addr,
+                             sizeof host_addr);
       return 1;
     }
 
@@ -118,7 +120,7 @@ Multicast_Manager::get_host_entry (const char *host)
     hp = ACE_OS::gethostbyname (host);
 
 
-  return hp == 0 ? 0 : (hostent *) memcpy (&host_entry, hp, sizeof *hp);
+  return hp == 0 ? 0 : (hostent *) ACE_OS_String::memcpy (&host_entry, hp, sizeof *hp);
 }
 
 // Adds an additional new host to the list of host machines.
@@ -137,9 +139,9 @@ Multicast_Manager::checkoff_host (in_addr host_addr)
   for (Host_Elem *tmp = Multicast_Manager::drwho_list;
        tmp != 0;
        tmp = tmp->next)
-    if (ACE_OS::memcmp (&tmp->host_addr.s_addr,
-                        &host_addr.s_addr,
-                        sizeof host_addr.s_addr) == 0)
+    if (ACE_OS_String::memcmp (&tmp->host_addr.s_addr,
+                               &host_addr.s_addr,
+                               sizeof host_addr.s_addr) == 0)
       {
         tmp->checked_off = 1;
         Multicast_Manager::received_host_count--;
diff --git a/apps/drwho/PM_Server.cpp b/apps/drwho/PM_Server.cpp
index 0b946f5cca9..7bc5e65e288 100644
--- a/apps/drwho/PM_Server.cpp
+++ b/apps/drwho/PM_Server.cpp
@@ -4,6 +4,7 @@
 #include "Rwho_DB_Manager.h"
 #include "PM_Server.h"
 #include "ace/ACE.h"
+#include "ace/OS_String.h"
 
 // This is the main method for the server side of things.  It reads
 // the RWHO file on the local machine and inserts HOST_NAME
@@ -67,7 +68,7 @@ PM_Server::handle_protocol_entries (char *buf_ptr,
                np->get_inactive_count (),
                np->get_active_count (),
                np->get_host_name ());
-      buf_ptr += strlen (buf_ptr) + 1;
+      buf_ptr += ACE_OS_String::strlen (buf_ptr) + 1;
     }
 
   return buf_ptr;
diff --git a/apps/drwho/Rwho_DB_Manager.h b/apps/drwho/Rwho_DB_Manager.h
index ff1dde83a65..f1e03bfe4f8 100644
--- a/apps/drwho/Rwho_DB_Manager.h
+++ b/apps/drwho/Rwho_DB_Manager.h
@@ -25,6 +25,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "Protocol_Record.h"
+#include "ace/ace_sys_param.h"
 
 class RWho_DB_Manager
 {
diff --git a/apps/gperf/src/Bool_Array.cpp b/apps/gperf/src/Bool_Array.cpp
index 718d997b456..d0531b86baa 100644
--- a/apps/gperf/src/Bool_Array.cpp
+++ b/apps/gperf/src/Bool_Array.cpp
@@ -24,12 +24,15 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "Bool_Array.h"
-#include "ace/OS_String.h"
 
 ACE_RCSID(src, Bool_Array, "$Id$")
 
 #if defined (ACE_HAS_GPERF)
 
+#include "ace/OS_String.h"
+#include "ace/Log_Msg.h"
+#include "ace/OS_Errno.h"
+
 // Prints out debugging diagnostics.
 
 Bool_Array::~Bool_Array (void)
diff --git a/apps/gperf/src/Gen_Perf.cpp b/apps/gperf/src/Gen_Perf.cpp
index a946421a80d..5b083ccdff6 100644
--- a/apps/gperf/src/Gen_Perf.cpp
+++ b/apps/gperf/src/Gen_Perf.cpp
@@ -28,6 +28,7 @@ ACE_RCSID(src, Gen_Perf, "$Id$")
 #if defined (ACE_HAS_GPERF)
 
 #include "Vectors.h"
+#include "ace/Log_Msg.h"
 
 // Current release version.
 extern const char *version_string;
diff --git a/apps/gperf/src/Hash_Table.cpp b/apps/gperf/src/Hash_Table.cpp
index 04f3a403339..adfc0a724ad 100644
--- a/apps/gperf/src/Hash_Table.cpp
+++ b/apps/gperf/src/Hash_Table.cpp
@@ -28,6 +28,8 @@ ACE_RCSID(src, Hash_Table, "$Id$")
 #if defined (ACE_HAS_GPERF)
 
 #include "ace/ACE.h"
+#include "ace/Log_Msg.h"
+#include "ace/OS_String.h"
 
 // The size of the hash table is always the smallest power of 2 >= the
 // size indicated by the user.  This allows several optimizations,
@@ -43,18 +45,18 @@ Hash_Table::Hash_Table (size_t s)
     this->size_ = 1;
   ACE_NEW (this->table_,
            List_Node*[this->size_]);
-  ACE_OS::memset ((char *) this->table_,
-                  0,
-                  this->size_ * sizeof *this->table_);
+  ACE_OS_String::memset ((char *) this->table_,
+                         0,
+                         this->size_ * sizeof *this->table_);
 }
 
 Hash_Table::~Hash_Table (void)
 {
   if (option[DEBUGGING])
     {
-      u_int keysig_width = option.max_keysig_size () > ACE_OS::strlen ("keysig") 
+      u_int keysig_width = option.max_keysig_size () > ACE_OS_String::strlen ("keysig") 
         ? option.max_keysig_size () 
-        : ACE_OS::strlen ("keysig");
+        : ACE_OS_String::strlen ("keysig");
 
       ACE_DEBUG ((LM_DEBUG,
                   "\ndumping the hash table\ntotal available table slots = %d, total bytes = %d, total collisions = %d\n"
@@ -97,7 +99,7 @@ Hash_Table::find (List_Node *item,
 
   for (probe = hash_val & size;
        this->table_[probe]
-         && (ACE_OS::strcmp (this->table_[probe]->keysig, item->keysig) != 0
+         && (ACE_OS_String::strcmp (this->table_[probe]->keysig, item->keysig) != 0
              || (ignore_length == 0 && this->table_[probe]->length != item->length));
        probe = probe + increment & size)
     this->collisions_++;
diff --git a/apps/gperf/src/Iterator.cpp b/apps/gperf/src/Iterator.cpp
index 75d6e40ddef..43b343b3aa9 100644
--- a/apps/gperf/src/Iterator.cpp
+++ b/apps/gperf/src/Iterator.cpp
@@ -22,6 +22,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "Iterator.h"
+#include "ace/ace_ctype.h"
 
 ACE_RCSID(src, Iterator, "$Id$")
 
diff --git a/apps/gperf/src/Key_List.cpp b/apps/gperf/src/Key_List.cpp
index 19f856148d8..1c05d750fa3 100644
--- a/apps/gperf/src/Key_List.cpp
+++ b/apps/gperf/src/Key_List.cpp
@@ -29,6 +29,7 @@ ACE_RCSID(src, Key_List, "$Id$")
 
 #include "ace/Read_Buffer.h"
 #include "Hash_Table.h"
+#include "ace/OS_String.h"
 
 // Default type for generated code.
 const char *const Key_List::default_array_type = "char *";
@@ -185,16 +186,16 @@ Key_List::output_types (void)
       else
         {
           // Yow, we've got a user-defined type...
-          int struct_tag_length = ACE_OS::strcspn (array_type_,
-                                                   "{\n\0");
+          int struct_tag_length = ACE_OS_String::strcspn (array_type_,
+                                                          "{\n\0");
           if (option[POINTER])      // And it must return a pointer...
             {
               ACE_NEW_RETURN (return_type,
                               char[struct_tag_length + 2],
                               -1);
-              ACE_OS::strncpy (return_type,
-                               array_type_,
-                               struct_tag_length);
+              ACE_OS_String::strncpy (return_type,
+                                      array_type_,
+                                      struct_tag_length);
               return_type[struct_tag_length] = '*';
               return_type[struct_tag_length + 1] = '\0';
             }
@@ -202,9 +203,9 @@ Key_List::output_types (void)
           ACE_NEW_RETURN (struct_tag,
                           char[struct_tag_length + 2],
                           -1);
-          ACE_OS::strncpy (struct_tag,
-                           array_type_,
-                           struct_tag_length);
+          ACE_OS_String::strncpy (struct_tag,
+                                  array_type_,
+                                  struct_tag_length);
           if (struct_tag[struct_tag_length] != ' ')
             {
               struct_tag[struct_tag_length] = ' ';
@@ -249,18 +250,18 @@ Key_List::read_keys (void)
           const char *delimiter = option.delimiter ();
           ACE_NEW_RETURN (this->head,
                           List_Node (buffer,
-                                     ACE_OS::strcspn (buffer,
-                                                      delimiter)),
+                                     ACE_OS_String::strcspn (buffer,
+                                                             delimiter)),
                           -1);
           for (temp = this->head;
                (buffer = input.read ('\n'))
-                 && ACE_OS::strcmp (buffer, "%%");
+                 && ACE_OS_String::strcmp (buffer, "%%");
                temp = temp->next)
             {
               ACE_NEW_RETURN (temp->next,
                               List_Node (buffer,
-                                         ACE_OS::strcspn (buffer,
-                                                          delimiter)),
+                                         ACE_OS_String::strcspn (buffer,
+                                                                 delimiter)),
                               -1);
               this->total_keys++;
             }
@@ -360,7 +361,7 @@ Key_List::merge (List_Node *list1, List_Node *list2)
     return list1;
   else if (occurrence_sort && list1->occurrence < list2->occurrence
            || hash_sort && list1->hash_value > list2->hash_value
-           || key_sort && strcmp (list1->key, list2->key) >= 0)
+           || key_sort && ACE_OS_String::strcmp (list1->key, list2->key) >= 0)
     {
       list2->next = merge (list2->next, list1);
       return list2;
@@ -551,15 +552,15 @@ Key_List::output_switch (int use_keyword_table)
       // Keep track of the longest string we'll need!
       const char *s = "charmap[*str] == *resword->%s && !strncasecmp (str + 1, resword->%s + 1, len - 1)";
       comp_buffer =
-        new char [strlen (s) + 2 * strlen (option.key_name ()) + 1];
+        new char [ACE_OS_String::strlen (s) + 2 * ACE_OS_String::strlen (option.key_name ()) + 1];
       if (option[COMP])
-        sprintf (comp_buffer, "%s == *resword->%s && !%s (str + 1, resword->%s + 1, len - 1)",
-                 option[STRCASECMP] ? "charmap[*str]" : "*str", option.key_name (),
-                 option[STRCASECMP] ? "strncasecmp" : "strncmp", option.key_name ());
+        ACE_OS::sprintf (comp_buffer, "%s == *resword->%s && !%s (str + 1, resword->%s + 1, len - 1)",
+                         option[STRCASECMP] ? "charmap[*str]" : "*str", option.key_name (),
+                         option[STRCASECMP] ? "strncasecmp" : "strncmp", option.key_name ());
       else
-        sprintf (comp_buffer, "%s == *resword->%s && !%s (str + 1, resword->%s + 1)",
-                 option[STRCASECMP] ? "charmap[*str]" : "*str", option.key_name (),
-                 option[STRCASECMP] ? "strcasecmp" : "strcmp", option.key_name ());
+        ACE_OS::sprintf (comp_buffer, "%s == *resword->%s && !%s (str + 1, resword->%s + 1)",
+                         option[STRCASECMP] ? "charmap[*str]" : "*str", option.key_name (),
+                         option[STRCASECMP] ? "strcasecmp" : "strcmp", option.key_name ());
     }
   else
     {
diff --git a/apps/gperf/src/List_Node.cpp b/apps/gperf/src/List_Node.cpp
index 0f5fb5052ff..cfd4a9a7cbb 100644
--- a/apps/gperf/src/List_Node.cpp
+++ b/apps/gperf/src/List_Node.cpp
@@ -28,6 +28,8 @@ ACE_RCSID(src, List_Node, "$Id$")
 #if defined (ACE_HAS_GPERF)
 
 #include "Vectors.h"
+#include "ace/Log_Msg.h"
+#include "ace/ace_ctype.h"
 
 // Sorts the key set alphabetically to speed up subsequent operation
 // Uses insertion sort since the set is probably quite small.
diff --git a/apps/gperf/src/Options.h b/apps/gperf/src/Options.h
index bc737b0cd6e..55fb5ca133c 100644
--- a/apps/gperf/src/Options.h
+++ b/apps/gperf/src/Options.h
@@ -24,8 +24,7 @@
 #ifndef OPTIONS_H
 #define OPTIONS_H
 
-#include "ace/Log_Msg.h"
-#include "ace/OS.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,6 +32,8 @@
 
 #if defined (ACE_HAS_GPERF)
 
+#include "ace/ace_sys_types.h"
+
 // Enumerate the potential debugging Options.
 
 enum Option_Type