changed include protection from #if !defined to ifndef, and added #pragma once, if possible

38 files changed, 95 insertions, 76 deletions

diff --git a/apps/drwho/BS_Client.h b/apps/drwho/BS_Client.h
index b6e62ebb339..9859768df82 100644
--- a/apps/drwho/BS_Client.h
+++ b/apps/drwho/BS_Client.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_BS_CLIENT_H)
+#ifndef _BS_CLIENT_H
 #define _BS_CLIENT_H
 
 #include "Binary_Search.h"
@@ -22,7 +22,7 @@
 class BS_Client : public Binary_Search
 {
   // = TITLE
-  //    Provides the client's binary search lookup table abstraction. 
+  //    Provides the client's binary search lookup table abstraction.
 public:
   // = Initialization.
   BS_Client (void);
diff --git a/apps/drwho/BS_Server.h b/apps/drwho/BS_Server.h
index 03ff73d0aac..3c7c1a82afc 100644
--- a/apps/drwho/BS_Server.h
+++ b/apps/drwho/BS_Server.h
@@ -10,14 +10,14 @@
 //    BS_Server.h
 //
 // = DESCRIPTION
-//    Provides the server's binary search lookup table abstraction. 
+//    Provides the server's binary search lookup table abstraction.
 //
 // = AUTHOR
 //    Douglas C. Schmidt
 //
 // ============================================================================
 
-#if !defined (_BS_SERVER_H)
+#ifndef _BS_SERVER_H
 #define _BS_SERVER_H
 
 #include "Binary_Search.h"
@@ -25,7 +25,7 @@
 class BS_Server : public Binary_Search
 {
   // = TITLE
-  //    Provides the server's binary search lookup table abstraction. 
+  //    Provides the server's binary search lookup table abstraction.
 public:
   // = Initialization.
   BS_Server (const char *packet);
diff --git a/apps/drwho/Binary_Search.h b/apps/drwho/Binary_Search.h
index 2cdbcbc511c..ae8dc93cb29 100644
--- a/apps/drwho/Binary_Search.h
+++ b/apps/drwho/Binary_Search.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#if !defined (_BINARY_SEARCH_H)
+#ifndef _BINARY_SEARCH_H
 #define _BINARY_SEARCH_H
 
 #include "Search_Struct.h"
diff --git a/apps/drwho/CM_Client.h b/apps/drwho/CM_Client.h
index 09bc7e40d8f..1e789633a5a 100644
--- a/apps/drwho/CM_Client.h
+++ b/apps/drwho/CM_Client.h
@@ -11,14 +11,14 @@
 //
 // = DESCRIPTION
 //    Provides a virtual communcations layer for the client in the
-//    drwho program. 
+//    drwho program.
 //
 // = AUTHOR
 //    Douglas C. Schmidt
 //
 // ============================================================================
 
-#if !defined (_CM_CLIENT_H)
+#ifndef _CM_CLIENT_H
 #define _CM_CLIENT_H
 
 #include "Comm_Manager.h"
diff --git a/apps/drwho/CM_Server.h b/apps/drwho/CM_Server.h
index 0e944db3064..a91402a5e48 100644
--- a/apps/drwho/CM_Server.h
+++ b/apps/drwho/CM_Server.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_CM_SERVER_H)
+#ifndef _CM_SERVER_H
 #define _CM_SERVER_H
 
 #include "Options.h"
diff --git a/apps/drwho/Comm_Manager.h b/apps/drwho/Comm_Manager.h
index 0dfd6b7c72e..ec3caf93e74 100644
--- a/apps/drwho/Comm_Manager.h
+++ b/apps/drwho/Comm_Manager.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_COMM_MANAGER_H)
+#ifndef _COMM_MANAGER_H
 #define _COMM_MANAGER_H
 
 #include "global.h"
diff --git a/apps/drwho/Drwho_Node.h b/apps/drwho/Drwho_Node.h
index c3c1418bbc8..02251b669df 100644
--- a/apps/drwho/Drwho_Node.h
+++ b/apps/drwho/Drwho_Node.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_DRWHO_NODE_H)
+#ifndef _DRWHO_NODE_H
 #define _DRWHO_NODE_H
 
 #include "global.h"
@@ -48,5 +48,5 @@ public:
   int inactive_count_;
   Drwho_Node *next_;
 };
-  
+
 #endif /* _DRWHO_NODE_H */
diff --git a/apps/drwho/File_Manager.h b/apps/drwho/File_Manager.h
index 374ba10b992..55482b2823d 100644
--- a/apps/drwho/File_Manager.h
+++ b/apps/drwho/File_Manager.h
@@ -14,11 +14,16 @@
 //
 // ============================================================================
 
-#if !defined (_FILE_MANAGER_H)
+#ifndef _FILE_MANAGER_H
 #define _FILE_MANAGER_H
 
 #include "global.h"
 #include "ace/Singleton.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Mem_Map.h"
 
 class File_Manager
diff --git a/apps/drwho/HT_Client.h b/apps/drwho/HT_Client.h
index 16828077d00..274cc6e72e6 100644
--- a/apps/drwho/HT_Client.h
+++ b/apps/drwho/HT_Client.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_HT_CLIENT_H)
+#ifndef _HT_CLIENT_H
 #define _HT_CLIENT_H
 
 #include "Hash_Table.h"
@@ -22,7 +22,7 @@
 class HT_Client : public Hash_Table
 {
   // = TITLE
-  //   Provides the client's hash table abstraction. 
+  //   Provides the client's hash table abstraction.
 public:
   virtual Protocol_Record *insert (const char *key_name,
                                    int max_len = MAXUSERIDNAMELEN);
diff --git a/apps/drwho/HT_Server.h b/apps/drwho/HT_Server.h
index 96b110b14b0..3dbff633cfb 100644
--- a/apps/drwho/HT_Server.h
+++ b/apps/drwho/HT_Server.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_HT_SERVER_H)
+#ifndef _HT_SERVER_H
 #define _HT_SERVER_H
 
 #include "Hash_Table.h"
diff --git a/apps/drwho/Hash_Table.h b/apps/drwho/Hash_Table.h
index 327c55b74dd..44f5ea769fc 100644
--- a/apps/drwho/Hash_Table.h
+++ b/apps/drwho/Hash_Table.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_HASH_TABLE_H)
+#ifndef _HASH_TABLE_H
 #define _HASH_TABLE_H
 
 #include "Search_Struct.h"
@@ -32,7 +32,7 @@ public:
   virtual Protocol_Record *get_each_entry (void);
 
 protected:
-  enum 
+  enum
   {
     HASH_TABLE_SIZE = 500
   };
diff --git a/apps/drwho/Multicast_Manager.h b/apps/drwho/Multicast_Manager.h
index 33e815fe8b6..5b5f42eddbc 100644
--- a/apps/drwho/Multicast_Manager.h
+++ b/apps/drwho/Multicast_Manager.h
@@ -14,12 +14,12 @@
 //
 // ============================================================================
 
-#if !defined (_MULTICAST_MANAGER_H)
+#ifndef _MULTICAST_MANAGER_H
 #define _MULTICAST_MANAGER_H
 
 #include "global.h"
 
-class Host_Elem 
+class Host_Elem
 {
 public:
   const char *host_name;
@@ -30,7 +30,7 @@ public:
   Host_Elem (const char *h_name, Host_Elem *n);
 };
 
-class Multicast_Manager 
+class Multicast_Manager
 {
   // = TITLE
   //   This file handles all the operations upon host machines names
diff --git a/apps/drwho/Options.h b/apps/drwho/Options.h
index d009c358e7e..13cf06777d2 100644
--- a/apps/drwho/Options.h
+++ b/apps/drwho/Options.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_OPTIONS_H)
+#ifndef _OPTIONS_H
 #define _OPTIONS_H
 
 #include "global.h"
@@ -38,16 +38,16 @@ public:
 
   // Different types of messages.
   enum Protocol_Types
-  { 
-    PROTO_USR     = 1, // Only return info on one user. 
-    PROTO_ALL     = 2, // Return info on all users logged in around the system. 
-    PROTO_FLO     = 3, // Return info on friends logged in. 
-    PROTO_RUSER   = 4, // Return info in ruser format! 
-    PROTO_RWHO    = 5, // Return info in rwho format. 
-    PROTO_WHO     = 6, // Return info in who format. 
-    PROTO_RUPTIME = 7  // Return info in ruptime format. 
+  {
+    PROTO_USR     = 1, // Only return info on one user.
+    PROTO_ALL     = 2, // Return info on all users logged in around the system.
+    PROTO_FLO     = 3, // Return info on friends logged in.
+    PROTO_RUSER   = 4, // Return info in ruser format!
+    PROTO_RWHO    = 5, // Return info in rwho format.
+    PROTO_WHO     = 6, // Return info in who format.
+    PROTO_RUPTIME = 7  // Return info in ruptime format.
   };
-  
+
   static void set_options (int argc, char *argv[]);
   static void set_opt (Option_Types opt);
   static int get_opt (Option_Types opt);
diff --git a/apps/drwho/PMC_All.h b/apps/drwho/PMC_All.h
index 6f7578b492a..308388adf4f 100644
--- a/apps/drwho/PMC_All.h
+++ b/apps/drwho/PMC_All.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PMC_ALL_H)
+#ifndef _PMC_ALL_H
 #define _PMC_ALL_H
 
 #include "PM_Client.h"
@@ -22,7 +22,7 @@
 class PMC_All : public PM_Client
 {
   // = TITLE
-  //   Provides the client's lookup table abstraction for `all' users... 
+  //   Provides the client's lookup table abstraction for `all' users...
 
 protected:
   virtual Protocol_Record *insert_protocol_info (Protocol_Record &protocol_record);
diff --git a/apps/drwho/PMC_Flo.h b/apps/drwho/PMC_Flo.h
index 88f534023be..305a8d8803c 100644
--- a/apps/drwho/PMC_Flo.h
+++ b/apps/drwho/PMC_Flo.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PMC_FLO_H)
+#ifndef _PMC_FLO_H
 #define _PMC_FLO_H
 
 #include "PM_Client.h"
@@ -22,7 +22,7 @@
 class PMC_Flo : public PM_Client
 {
   // = TITLE
-  //   Provides the client's lookup table abstraction for `flo' users... 
+  //   Provides the client's lookup table abstraction for `flo' users...
 
 public:
   PMC_Flo (void);
diff --git a/apps/drwho/PMC_Ruser.h b/apps/drwho/PMC_Ruser.h
index f121fc95be7..fe3d3c23363 100644
--- a/apps/drwho/PMC_Ruser.h
+++ b/apps/drwho/PMC_Ruser.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PMC_RUSER_H)
+#ifndef _PMC_RUSER_H
 #define _PMC_RUSER_H
 
 #include "PM_Client.h"
@@ -22,7 +22,7 @@
 class PMC_Ruser : public PM_Client
 {
   // = TITLE
-  //   Provides the client's lookup table abstraction for `ruser' users... 
+  //   Provides the client's lookup table abstraction for `ruser' users...
 
 public:
   PMC_Ruser (void);
diff --git a/apps/drwho/PMC_Usr.h b/apps/drwho/PMC_Usr.h
index 09edd37fa28..f98c8325b83 100644
--- a/apps/drwho/PMC_Usr.h
+++ b/apps/drwho/PMC_Usr.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PMC_USR_H)
+#ifndef _PMC_USR_H
 #define _PMC_USR_H
 
 #include "PM_Client.h"
diff --git a/apps/drwho/PMS_All.h b/apps/drwho/PMS_All.h
index b4de614d5df..41459f57cbe 100644
--- a/apps/drwho/PMS_All.h
+++ b/apps/drwho/PMS_All.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PMS_ALL_H)
+#ifndef _PMS_ALL_H
 #define _PMS_ALL_H
 
 #include "PM_Server.h"
diff --git a/apps/drwho/PMS_Flo.h b/apps/drwho/PMS_Flo.h
index 5ef36641015..b7fefa5abec 100644
--- a/apps/drwho/PMS_Flo.h
+++ b/apps/drwho/PMS_Flo.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PMS_FLO_H)
+#ifndef _PMS_FLO_H
 #define _PMS_FLO_H
 
 #include "PM_Server.h"
@@ -22,7 +22,7 @@
 class PMS_Flo : public PM_Server
 {
   // = TITLE
-  //   Provides the server's lookup table abstraction for `flo' users... 
+  //   Provides the server's lookup table abstraction for `flo' users...
 
 public:
   PMS_Flo (void);
diff --git a/apps/drwho/PMS_Ruser.h b/apps/drwho/PMS_Ruser.h
index cecca15b7b5..f26e916549f 100644
--- a/apps/drwho/PMS_Ruser.h
+++ b/apps/drwho/PMS_Ruser.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PMS_RUSER_H)
+#ifndef _PMS_RUSER_H
 #define _PMS_RUSER_H
 
 #include "PM_Server.h"
@@ -22,7 +22,7 @@
 class PMS_Ruser : public PM_Server
 {
   // = TITLE
-  //   Provides the server's lookup table abstraction for `ruser' users... 
+  //   Provides the server's lookup table abstraction for `ruser' users...
 
 public:
   PMS_Ruser (void);
diff --git a/apps/drwho/PMS_Usr.h b/apps/drwho/PMS_Usr.h
index 2d1df1f3d46..1f29e43d653 100644
--- a/apps/drwho/PMS_Usr.h
+++ b/apps/drwho/PMS_Usr.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PMS_USR_H)
+#ifndef _PMS_USR_H
 #define _PMS_USR_H
 
 #include "PM_Server.h"
@@ -22,7 +22,7 @@
 class PMS_Usr : public PM_Server
 {
   // = TITLE
-  //   Provides the client's lookup table abstraction for `Usr' users... 
+  //   Provides the client's lookup table abstraction for `Usr' users...
 
 public:
   PMS_Usr (void);
diff --git a/apps/drwho/PM_Client.h b/apps/drwho/PM_Client.h
index 6c7b3c90660..f44ab84f69f 100644
--- a/apps/drwho/PM_Client.h
+++ b/apps/drwho/PM_Client.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PM_CLIENT_H)
+#ifndef _PM_CLIENT_H
 #define _PM_CLIENT_H
 
 #include "Protocol_Manager.h"
@@ -22,7 +22,7 @@
 class PM_Client : public Protocol_Manager
 {
   // = TITLE
-  //   Provides the client side of the friend manager lookup table abstraction. 
+  //   Provides the client side of the friend manager lookup table abstraction.
 public:
   PM_Client (void);
   virtual ~PM_Client (void);
diff --git a/apps/drwho/PM_Server.h b/apps/drwho/PM_Server.h
index 11dba1748ab..2a355c8e262 100644
--- a/apps/drwho/PM_Server.h
+++ b/apps/drwho/PM_Server.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PM_SERVER_H)
+#ifndef _PM_SERVER_H
 #define _PM_SERVER_H
 
 #include "Protocol_Manager.h"
@@ -22,7 +22,7 @@
 class PM_Server : public Protocol_Manager
 {
   // = TITLE
-  //   Handle the server's lookup table abstraction. 
+  //   Handle the server's lookup table abstraction.
 
 public:
   PM_Server (void);
diff --git a/apps/drwho/Protocol_Manager.h b/apps/drwho/Protocol_Manager.h
index 63f95d9b342..d61e752c8df 100644
--- a/apps/drwho/Protocol_Manager.h
+++ b/apps/drwho/Protocol_Manager.h
@@ -14,10 +14,15 @@
 //
 // ============================================================================
 
-#if !defined (_PROTOCOL_MANAGER_H)
+#ifndef _PROTOCOL_MANAGER_H
 #define _PROTOCOL_MANAGER_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "Options.h"
 #include "Search_Struct.h"
 #include "Protocol_Record.h"
@@ -26,7 +31,7 @@ class Protocol_Manager
 {
   // = TITLE
   //   A base class that consolidates friend management functionality
-  //   shared by both clients and servers.  
+  //   shared by both clients and servers.
 public:
   Protocol_Manager (void);
   virtual ~Protocol_Manager (void);
diff --git a/apps/drwho/Protocol_Record.h b/apps/drwho/Protocol_Record.h
index 74d48b7494a..60cf250adf1 100644
--- a/apps/drwho/Protocol_Record.h
+++ b/apps/drwho/Protocol_Record.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_PROTOCOL_RECORD_H)
+#ifndef _PROTOCOL_RECORD_H
 #define _PROTOCOL_RECORD_H
 
 #include "Drwho_Node.h"
@@ -22,7 +22,7 @@
 class Protocol_Record
 {
   // = TITLE
-  //   Stores information about a single friend's status. 
+  //   Stores information about a single friend's status.
 
 public:
   Protocol_Record (void);
diff --git a/apps/drwho/Rwho_DB_Manager.h b/apps/drwho/Rwho_DB_Manager.h
index bb8029fff9a..b995a172a7d 100644
--- a/apps/drwho/Rwho_DB_Manager.h
+++ b/apps/drwho/Rwho_DB_Manager.h
@@ -14,14 +14,19 @@
 //
 // ============================================================================
 
-#if !defined (_RWHO_DB_MANAGER_H)
+#ifndef _RWHO_DB_MANAGER_H
 #define _RWHO_DB_MANAGER_H
 
 #include <protocols/rwhod.h>
 #include "ace/Dirent.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "Protocol_Record.h"
 
-class RWho_DB_Manager 
+class RWho_DB_Manager
 {
   // = TITLE
   //   This class returns the user/machine pairs one at a time from
diff --git a/apps/drwho/SL_Client.h b/apps/drwho/SL_Client.h
index 7af14197258..16be3842064 100644
--- a/apps/drwho/SL_Client.h
+++ b/apps/drwho/SL_Client.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SL_CLIENT_H)
+#ifndef _SL_CLIENT_H
 #define _SL_CLIENT_H
 
 #include "Single_Lookup.h"
@@ -22,7 +22,7 @@
 class SL_Client : public Single_Lookup
 {
   // = TITLE
-  //   Provides the client's single user lookup table abstraction. 
+  //   Provides the client's single user lookup table abstraction.
 
 public:
   SL_Client (const char *key_name);
diff --git a/apps/drwho/SL_Server.h b/apps/drwho/SL_Server.h
index 7302371275a..2a8ee2ba054 100644
--- a/apps/drwho/SL_Server.h
+++ b/apps/drwho/SL_Server.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SL_SERVER_H)
+#ifndef _SL_SERVER_H
 #define _SL_SERVER_H
 
 #include "Single_Lookup.h"
@@ -22,7 +22,7 @@
 class SL_Server : public Single_Lookup
 {
   // = TITLE
-  //   Provides the server's single user lookup table abstraction. 
+  //   Provides the server's single user lookup table abstraction.
 
 public:
   SL_Server (const char *packet);
diff --git a/apps/drwho/SML_Client.h b/apps/drwho/SML_Client.h
index 42dedf46248..d02fb8d6fa0 100644
--- a/apps/drwho/SML_Client.h
+++ b/apps/drwho/SML_Client.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SML_CLIENT_H)
+#ifndef _SML_CLIENT_H
 #define _SML_CLIENT_H
 
 #include "SM_Client.h"
diff --git a/apps/drwho/SML_Server.h b/apps/drwho/SML_Server.h
index cb1f1d0d80e..5fc665450df 100644
--- a/apps/drwho/SML_Server.h
+++ b/apps/drwho/SML_Server.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SML_SERVER_H)
+#ifndef _SML_SERVER_H
 #define _SML_SERVER_H
 
 #include "SM_Server.h"
diff --git a/apps/drwho/SMR_Client.h b/apps/drwho/SMR_Client.h
index dc3081f1210..9725c3ebd96 100644
--- a/apps/drwho/SMR_Client.h
+++ b/apps/drwho/SMR_Client.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SMR_CLIENT_H)
+#ifndef _SMR_CLIENT_H
 #define _SMR_CLIENT_H
 
 #include "SM_Client.h"
diff --git a/apps/drwho/SMR_Server.h b/apps/drwho/SMR_Server.h
index d471245aeae..af8b384d701 100644
--- a/apps/drwho/SMR_Server.h
+++ b/apps/drwho/SMR_Server.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SMR_SERVER_H)
+#ifndef _SMR_SERVER_H
 #define _SMR_SERVER_H
 
 #include "SM_Server.h"
diff --git a/apps/drwho/SM_Client.h b/apps/drwho/SM_Client.h
index 884ad94b4de..0a262f71c78 100644
--- a/apps/drwho/SM_Client.h
+++ b/apps/drwho/SM_Client.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SM_CLIENT_H)
+#ifndef _SM_CLIENT_H
 #define _SM_CLIENT_H
 
 #include "PM_Client.h"
diff --git a/apps/drwho/SM_Server.h b/apps/drwho/SM_Server.h
index 83aa063cd72..f9fbc9857d1 100644
--- a/apps/drwho/SM_Server.h
+++ b/apps/drwho/SM_Server.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SM_SERVER_H)
+#ifndef _SM_SERVER_H
 #define _SM_SERVER_H
 
 #include "PM_Server.h"
diff --git a/apps/drwho/Search_Struct.h b/apps/drwho/Search_Struct.h
index 6b7f12b9750..c45dcbf6086 100644
--- a/apps/drwho/Search_Struct.h
+++ b/apps/drwho/Search_Struct.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SEARCH_STRUCT_H)
+#ifndef _SEARCH_STRUCT_H
 #define _SEARCH_STRUCT_H
 
 #include "Protocol_Record.h"
diff --git a/apps/drwho/Select_Manager.h b/apps/drwho/Select_Manager.h
index c4f89b7e57b..0f6af73e443 100644
--- a/apps/drwho/Select_Manager.h
+++ b/apps/drwho/Select_Manager.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SELECT_MANAGER_H)
+#ifndef _SELECT_MANAGER_H
 #define _SELECT_MANAGER_H
 
 class Select_Manager
diff --git a/apps/drwho/Single_Lookup.h b/apps/drwho/Single_Lookup.h
index 4b00249ef05..fa86301215e 100644
--- a/apps/drwho/Single_Lookup.h
+++ b/apps/drwho/Single_Lookup.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_SINGLE_LOOKUP_H)
+#ifndef _SINGLE_LOOKUP_H
 #define _SINGLE_LOOKUP_H
 
 #include "Options.h"
diff --git a/apps/drwho/global.h b/apps/drwho/global.h
index 090b20b5b33..d049bd3f43d 100644
--- a/apps/drwho/global.h
+++ b/apps/drwho/global.h
@@ -17,32 +17,36 @@
 //
 // ============================================================================
 
-#if !defined (_GLOBAL_H)
+#ifndef _GLOBAL_H
 #define _GLOBAL_H
 
 #include "ace/OS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 // These constants are used throughout drwho.
 
-enum 
+enum
 {
   MAXUSERIDNAMELEN = 8,
-  MAX_USER_TIMEOUT = 300, 
-  MAX_HOST_TIMEOUT = 300, 
+  MAX_USER_TIMEOUT = 300,
+  MAX_HOST_TIMEOUT = 300,
   UDP_PACKET_SIZE = 1024 * 8,
   PORT_NUMBER = 12344
 };
 
-// Default name of file where friends info is stored. 
+// Default name of file where friends info is stored.
 #define FRIEND_FILE ".friends.dta"
 
-// Default name where rwho info is stored. 
+// Default name where rwho info is stored.
 #define RWHODIR "/usr/spool/rwho"
 
-// Macros for handling message types. 
+// Macros for handling message types.
 #define GET_PACKET_TYPE(P)      (ntohs (*((short *) P)))
 #define SET_PACKET_TYPE(P,T)    ((*(short *) P) = ntohs (T))
 #define SKIP_PACKET_TYPE(P)     ((P) + sizeof (short))
-#define SUBTRACT_PACKET_TYPE(L) ((L) - sizeof (short)) 
+#define SUBTRACT_PACKET_TYPE(L) ((L) - sizeof (short))
 
 #endif /* _GLOBAL_H */