Basic_Types.h

252 files changed, 277 insertions, 273 deletions

diff --git a/ace/ACE.h b/ace/ACE.h
index 8c2a15c3818..4f077e8da59 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -14,15 +14,16 @@
 // 
 // ============================================================================
 
+// This #include must come first to avoid recursive include problems.
 #include "ace/OS.h"
 
+#ifndef ACE_ACE_H
+#define ACE_ACE_H
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (ACE_ACE_H)
-#define ACE_ACE_H
-
 // Forward declarations.
 class ACE_Time_Value;
 class ACE_INET_Addr;
diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h
index 3a38cb421b3..a134592784f 100644
--- a/ace/Basic_Types.h
+++ b/ace/Basic_Types.h
@@ -44,7 +44,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_BASIC_TYPES_H)
+#ifndef ACE_BASIC_TYPES_H
 #define ACE_BASIC_TYPES_H
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ace/CORBA_Handler.h b/ace/CORBA_Handler.h
index e12f3f48dbe..fbf106356e6 100644
--- a/ace/CORBA_Handler.h
+++ b/ace/CORBA_Handler.h
@@ -15,8 +15,8 @@
 //
 // ============================================================================
 
-#if !defined (_CORBA_HANDLER_H)
-#define _CORBA_HANDLER_H
+#ifndef ACE_CORBA_HANDLER_H
+#define ACE_CORBA_HANDLER_H
 
 #include "ace/Service_Config.h"
 #include "ace/Pipe.h"
diff --git a/ace/CORBA_Ref.h b/ace/CORBA_Ref.h
index 93bdacb0511..46c222f6106 100644
--- a/ace/CORBA_Ref.h
+++ b/ace/CORBA_Ref.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_CORBA_REF_H)
+#ifndef ACE_CORBA_REF_H
 #define ACE_CORBA_REF_H
 
 #include "ace/ACE.h"
diff --git a/ace/Connector.h b/ace/Connector.h
index 61f1a8a632d..08d7f877366 100644
--- a/ace/Connector.h
+++ b/ace/Connector.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_CONNECTOR_H)
+#ifndef ACE_CONNECTOR_H
 #define ACE_CONNECTOR_H
 
 #include "ace/Service_Config.h"
diff --git a/ace/Containers.h b/ace/Containers.h
index 3cec86db71d..093c98c7999 100644
--- a/ace/Containers.h
+++ b/ace/Containers.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_CONTAINERS_H)
+#ifndef ACE_CONTAINERS_H
 #define ACE_CONTAINERS_H
 
 #include "ace/OS.h"
diff --git a/ace/Containers_T.h b/ace/Containers_T.h
index 6a11b717918..f8ed5cef14d 100644
--- a/ace/Containers_T.h
+++ b/ace/Containers_T.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_CONTAINERS_T_H)
+#ifndef ACE_CONTAINERS_T_H
 #define ACE_CONTAINERS_T_H
 
 #include "ace/ACE.h"
diff --git a/ace/DEV.h b/ace/DEV.h
index 2836caee151..5bf209be58e 100644
--- a/ace/DEV.h
+++ b/ace/DEV.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_DEV_H)
+#ifndef ACE_DEV_H
 #define ACE_DEV_H
 
 #include "ace/IO_SAP.h"
diff --git a/ace/DEV_Addr.h b/ace/DEV_Addr.h
index 6065d1916cc..2836cabc595 100644
--- a/ace/DEV_Addr.h
+++ b/ace/DEV_Addr.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_DEV_ADDR_H)
+#ifndef ACE_DEV_ADDR_H
 #define ACE_DEV_ADDR_H
 
 #include "ace/Addr.h"
diff --git a/ace/DEV_Connector.h b/ace/DEV_Connector.h
index 845c610531a..a43b4e2ae5f 100644
--- a/ace/DEV_Connector.h
+++ b/ace/DEV_Connector.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_DEV_CONNECTOR_H)
+#ifndef ACE_DEV_CONNECTOR_H
 #define ACE_DEV_CONNECTOR_H
 
 #include "ace/DEV_IO.h"
diff --git a/ace/DEV_IO.h b/ace/DEV_IO.h
index 52d90205921..ad82d31927f 100644
--- a/ace/DEV_IO.h
+++ b/ace/DEV_IO.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_DEV_IO_H) 
+#ifndef ACE_DEV_IO_H 
 #define ACE_DEV_IO_H
 
 #include "ace/DEV.h"
diff --git a/ace/Date_Time.h b/ace/Date_Time.h
index 88aee2299bb..10ebea907a2 100644
--- a/ace/Date_Time.h
+++ b/ace/Date_Time.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_DATE_TIME_H)
+#ifndef ACE_DATE_TIME_H
 #define ACE_DATE_TIME_H
 
 #include "ace/ACE.h"
diff --git a/ace/Dirent.h b/ace/Dirent.h
index e7830f47457..3adda60f32b 100644
--- a/ace/Dirent.h
+++ b/ace/Dirent.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_DIRENT_H)
+#ifndef ACE_DIRENT_H
 #define ACE_DIRENT_H
 
 #include "ace/OS.h"
diff --git a/ace/Dump.h b/ace/Dump.h
index 1f709ad9340..bccc5d62eb7 100644
--- a/ace/Dump.h
+++ b/ace/Dump.h
@@ -48,7 +48,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_DUMP_H)
+#ifndef ACE_DUMP_H
 #define ACE_DUMP_H
 
 #include "ace/Synch.h"
diff --git a/ace/Dump_T.h b/ace/Dump_T.h
index fa8916064d9..857a69f1d63 100644
--- a/ace/Dump_T.h
+++ b/ace/Dump_T.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_DUMP_T_H)
+#ifndef ACE_DUMP_T_H
 #define ACE_DUMP_T_H
 
 #include "ace/Dump.h"
diff --git a/ace/Dynamic.h b/ace/Dynamic.h
index f824e5e0462..1d84ecab301 100644
--- a/ace/Dynamic.h
+++ b/ace/Dynamic.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_DYNAMIC_H)
+#ifndef ACE_DYNAMIC_H
 #define ACE_DYNAMIC_H
 
 #include "ace/ACE.h"
diff --git a/ace/Dynamic_Service.h b/ace/Dynamic_Service.h
index bd7ef408f16..5f0e152f648 100644
--- a/ace/Dynamic_Service.h
+++ b/ace/Dynamic_Service.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_DYNAMIC_SERVICE_H)
+#ifndef ACE_DYNAMIC_SERVICE_H
 #define ACE_DYNAMIC_SERVICE_H
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ace/Env_Value_T.h b/ace/Env_Value_T.h
index 2ff9b18323d..be9ab570dfb 100644
--- a/ace/Env_Value_T.h
+++ b/ace/Env_Value_T.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_ENV_VALUE_T_H)
+#ifndef ACE_ENV_VALUE_T_H
 #define ACE_ENV_VALUE_T_H
 
 #include "ace/OS.h"		// Need to get ACE_static_cast definition
diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h
index 453f4c6ed70..b8918111c12 100644
--- a/ace/Event_Handler.h
+++ b/ace/Event_Handler.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_EVENT_HANDLER_H)
+#ifndef ACE_EVENT_HANDLER_H
 #define ACE_EVENT_HANDLER_H
 
 #include "ace/ACE.h"
diff --git a/ace/Event_Handler_T.h b/ace/Event_Handler_T.h
index 7c3081d247f..248bb62824b 100644
--- a/ace/Event_Handler_T.h
+++ b/ace/Event_Handler_T.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_EVENT_HANDLER_T_H)
+#ifndef ACE_EVENT_HANDLER_T_H
 #define ACE_EVENT_HANDLER_T_H
 
 #include "ace/Event_Handler.h"
diff --git a/ace/FIFO.h b/ace/FIFO.h
index d9a48bc265f..a51b4028b4d 100644
--- a/ace/FIFO.h
+++ b/ace/FIFO.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_FIFO_H)
+#ifndef ACE_FIFO_H
 #define ACE_FIFO_H
 
 #include "ace/IPC_SAP.h"
diff --git a/ace/FIFO_Recv.h b/ace/FIFO_Recv.h
index 4b38cf991f1..b857b3e9633 100644
--- a/ace/FIFO_Recv.h
+++ b/ace/FIFO_Recv.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_FIFO_RECV_H)
+#ifndef ACE_FIFO_RECV_H
 #define ACE_FIFO_RECV_H
 
 #include "ace/FIFO.h"
diff --git a/ace/FIFO_Recv_Msg.h b/ace/FIFO_Recv_Msg.h
index 4134f593778..af68b412cf2 100644
--- a/ace/FIFO_Recv_Msg.h
+++ b/ace/FIFO_Recv_Msg.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_FIFO_RECV_MSG_H)
+#ifndef ACE_FIFO_RECV_MSG_H
 #define ACE_FIFO_RECV_MSG_H
 
 #include "ace/FIFO_Recv.h"
diff --git a/ace/FIFO_Send.h b/ace/FIFO_Send.h
index d6d13683330..8e7e15633c8 100644
--- a/ace/FIFO_Send.h
+++ b/ace/FIFO_Send.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_FIFO_SEND_H)
+#ifndef ACE_FIFO_SEND_H
 #define ACE_FIFO_SEND_H
 
 #include "ace/FIFO.h"
diff --git a/ace/FIFO_Send_Msg.h b/ace/FIFO_Send_Msg.h
index 55726ea36cc..6e6e3373e3b 100644
--- a/ace/FIFO_Send_Msg.h
+++ b/ace/FIFO_Send_Msg.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_FIFO_SEND_MSG_H)
+#ifndef ACE_FIFO_SEND_MSG_H
 #define ACE_FIFO_SEND_MSG_H
 
 #include "ace/FIFO_Send.h"
diff --git a/ace/FILE.h b/ace/FILE.h
index 5636e8128bb..ec8c2cd2494 100644
--- a/ace/FILE.h
+++ b/ace/FILE.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_FILE_H)
+#ifndef ACE_FILE_H
 #define ACE_FILE_H
 
 #include "ace/IO_SAP.h"
diff --git a/ace/FILE_Addr.h b/ace/FILE_Addr.h
index 462a720c0bf..d928c8a8209 100644
--- a/ace/FILE_Addr.h
+++ b/ace/FILE_Addr.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_FILE_ADDR_H)
+#ifndef ACE_FILE_ADDR_H
 #define ACE_FILE_ADDR_H
 
 #include "ace/Addr.h"
diff --git a/ace/FILE_Connector.h b/ace/FILE_Connector.h
index 63ee7c063c3..d144f0f27d3 100644
--- a/ace/FILE_Connector.h
+++ b/ace/FILE_Connector.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_FILE_CONNECTOR_H)
+#ifndef ACE_FILE_CONNECTOR_H
 #define ACE_FILE_CONNECTOR_H
 
 #include "ace/FILE_IO.h"
diff --git a/ace/FILE_IO.h b/ace/FILE_IO.h
index 8bfe350d4d8..e717783317a 100644
--- a/ace/FILE_IO.h
+++ b/ace/FILE_IO.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_FILE_IO_H) 
+#ifndef ACE_FILE_IO_H 
 #define ACE_FILE_IO_H
 
 #include "ace/FILE.h"
diff --git a/ace/Filecache.h b/ace/Filecache.h
index a9252dbb898..7422f6dd243 100644
--- a/ace/Filecache.h
+++ b/ace/Filecache.h
@@ -15,7 +15,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_FILECACHE_H)
+#ifndef ACE_FILECACHE_H
 #define ACE_FILECACHE_H
 
 #include "ace/Mem_Map.h"
diff --git a/ace/Free_List.h b/ace/Free_List.h
index f2a6223a7cb..f4583c7bc47 100644
--- a/ace/Free_List.h
+++ b/ace/Free_List.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_FREE_LIST_H)
+#ifndef ACE_FREE_LIST_H
 #define ACE_FREE_LIST_H
 
 #include "ace/OS.h"
diff --git a/ace/Functor.h b/ace/Functor.h
index 8e7ad7aed55..c0a9ed4c6e9 100644
--- a/ace/Functor.h
+++ b/ace/Functor.h
@@ -24,7 +24,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_FUNCTOR_H)
+#ifndef ACE_FUNCTOR_H
 #define ACE_FUNCTOR_H
 
 #include "ace/OS.h"
diff --git a/ace/Functor_T.h b/ace/Functor_T.h
index ff26c1a01b8..ae596e6ff1a 100644
--- a/ace/Functor_T.h
+++ b/ace/Functor_T.h
@@ -24,7 +24,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_FUNCTOR_T_H)
+#ifndef ACE_FUNCTOR_T_H
 #define ACE_FUNCTOR_T_H
 
 #include "ace/Functor.h"
diff --git a/ace/Future.h b/ace/Future.h
index 7d0aa301a8b..839adc35df9 100644
--- a/ace/Future.h
+++ b/ace/Future.h
@@ -16,7 +16,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_FUTURE_H)
+#ifndef ACE_FUTURE_H
 #define ACE_FUTURE_H
 
 #include "ace/Synch.h"
diff --git a/ace/Get_Opt.h b/ace/Get_Opt.h
index b8c4bc6a3f9..49758895474 100644
--- a/ace/Get_Opt.h
+++ b/ace/Get_Opt.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_GET_OPT_H)
+#ifndef ACE_GET_OPT_H
 #define ACE_GET_OPT_H
 
 #include "ace/ACE.h"
diff --git a/ace/Handle_Set.h b/ace/Handle_Set.h
index 68822bf5097..3c809e4e5e0 100644
--- a/ace/Handle_Set.h
+++ b/ace/Handle_Set.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_HANDLE_SET_H)
+#ifndef ACE_HANDLE_SET_H
 #define ACE_HANDLE_SET_H
 
 #include "ace/ACE.h"
diff --git a/ace/Hash_Map_Manager.h b/ace/Hash_Map_Manager.h
index 8c3a627ec6d..98ba6f40b20 100644
--- a/ace/Hash_Map_Manager.h
+++ b/ace/Hash_Map_Manager.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_HASH_MAP_MANAGER_H)
+#ifndef ACE_HASH_MAP_MANAGER_H
 #define ACE_HASH_MAP_MANAGER_H
 
 #include "ace/OS.h"
diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h
index ac5f34e3418..c2d962b3198 100644
--- a/ace/High_Res_Timer.h
+++ b/ace/High_Res_Timer.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_HIGH_RES_TIMER_H)
+#ifndef ACE_HIGH_RES_TIMER_H
 #define ACE_HIGH_RES_TIMER_H
 
 #include "ace/ACE.h"
diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h
index 5253a5892c6..d66b8ff515f 100644
--- a/ace/INET_Addr.h
+++ b/ace/INET_Addr.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_INET_ADDR_H)
+#ifndef ACE_INET_ADDR_H
 #define ACE_INET_ADDR_H
 
 #include "ace/ACE.h"
diff --git a/ace/IOStream.h b/ace/IOStream.h
index 16ff622d9f8..560d5be4004 100644
--- a/ace/IOStream.h
+++ b/ace/IOStream.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_IOSTREAM_H)
+#ifndef ACE_IOSTREAM_H
 #define ACE_IOSTREAM_H
 
 #include "ace/OS.h"
diff --git a/ace/IOStream_T.h b/ace/IOStream_T.h
index 94e41e2c621..90229fe02e7 100644
--- a/ace/IOStream_T.h
+++ b/ace/IOStream_T.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_IOSTREAM_T_H)
+#ifndef ACE_IOSTREAM_T_H
 #define ACE_IOSTREAM_T_H
 
 #include "ace/IOStream.h"
diff --git a/ace/IO_Cntl_Msg.h b/ace/IO_Cntl_Msg.h
index e508d6f44b0..b650057588f 100644
--- a/ace/IO_Cntl_Msg.h
+++ b/ace/IO_Cntl_Msg.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_IO_CNTL_MSG_H)
+#ifndef ACE_IO_CNTL_MSG_H
 #define ACE_IO_CNTL_MSG_H
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ace/IO_SAP.h b/ace/IO_SAP.h
index 5f2df308213..6704bd8f4b1 100644
--- a/ace/IO_SAP.h
+++ b/ace/IO_SAP.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_IO_SAP_H)
+#ifndef ACE_IO_SAP_H
 #define ACE_IO_SAP_H
 
 #include "ace/ACE.h"
diff --git a/ace/IPC_SAP.h b/ace/IPC_SAP.h
index b371be16ee4..c39bac13ec3 100644
--- a/ace/IPC_SAP.h
+++ b/ace/IPC_SAP.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_IPC_SAP_H)
+#ifndef ACE_IPC_SAP_H
 #define ACE_IPC_SAP_H
 
 #include "ace/ACE.h"
diff --git a/ace/LOCK_SOCK_Acceptor.h b/ace/LOCK_SOCK_Acceptor.h
index c965dd102a9..6cfda36eb7c 100644
--- a/ace/LOCK_SOCK_Acceptor.h
+++ b/ace/LOCK_SOCK_Acceptor.h
@@ -13,7 +13,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_LOCK_SOCK_ACCEPTOR_H)
+#ifndef ACE_LOCK_SOCK_ACCEPTOR_H
 #define ACE_LOCK_SOCK_ACCEPTOR_H
 
 #include "ace/SOCK_Acceptor.h"
diff --git a/ace/LSOCK.h b/ace/LSOCK.h
index 63630af08bb..981d6cc0c9f 100644
--- a/ace/LSOCK.h
+++ b/ace/LSOCK.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_LOCAL_SOCK_H)
+#ifndef ACE_LOCAL_SOCK_H
 #define ACE_LOCAL_SOCK_H
 
 #include "ace/SOCK.h"
diff --git a/ace/LSOCK_Acceptor.h b/ace/LSOCK_Acceptor.h
index 1d2bb1935e0..df226630ee8 100644
--- a/ace/LSOCK_Acceptor.h
+++ b/ace/LSOCK_Acceptor.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_LOCAL_SOCK_ACCEPTOR_H)
+#ifndef ACE_LOCAL_SOCK_ACCEPTOR_H
 #define ACE_LOCAL_SOCK_ACCEPTOR_H
 
 #include "ace/SOCK_Acceptor.h"
diff --git a/ace/LSOCK_CODgram.h b/ace/LSOCK_CODgram.h
index 1562b2c1aeb..81cba17ff0d 100644
--- a/ace/LSOCK_CODgram.h
+++ b/ace/LSOCK_CODgram.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_LOCAL_SOCK_CODGRAM_H)
+#ifndef ACE_LOCAL_SOCK_CODGRAM_H
 #define ACE_LOCAL_SOCK_CODGRAM_H
 
 #include "ace/LSOCK.h"
diff --git a/ace/LSOCK_Connector.h b/ace/LSOCK_Connector.h
index dbb29d0b494..7443dbfd67c 100644
--- a/ace/LSOCK_Connector.h
+++ b/ace/LSOCK_Connector.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_LOCAL_SOCK_CONNECTOR_H)
+#ifndef ACE_LOCAL_SOCK_CONNECTOR_H
 #define ACE_LOCAL_SOCK_CONNECTOR_H
 
 #include "ace/SOCK_Connector.h"
diff --git a/ace/LSOCK_Dgram.h b/ace/LSOCK_Dgram.h
index 0c8e87a3ffc..c70c43971f6 100644
--- a/ace/LSOCK_Dgram.h
+++ b/ace/LSOCK_Dgram.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_LOCAL_SOCK_DGRAM_H)
+#ifndef ACE_LOCAL_SOCK_DGRAM_H
 #define ACE_LOCAL_SOCK_DGRAM_H
 
 #include "ace/SOCK_Dgram.h"
diff --git a/ace/LSOCK_Stream.h b/ace/LSOCK_Stream.h
index c19d80e261d..f690ff9cead 100644
--- a/ace/LSOCK_Stream.h
+++ b/ace/LSOCK_Stream.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_LOCAL_SOCK_STREAM_H)
+#ifndef ACE_LOCAL_SOCK_STREAM_H
 #define ACE_LOCAL_SOCK_STREAM_H
 
 #include "ace/SOCK_Stream.h"
diff --git a/ace/Local_Name_Space.h b/ace/Local_Name_Space.h
index 96c97124896..5e8396998f8 100644
--- a/ace/Local_Name_Space.h
+++ b/ace/Local_Name_Space.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_LOCAL_NAME_SPACE_H)
+#ifndef ACE_LOCAL_NAME_SPACE_H
 #define ACE_LOCAL_NAME_SPACE_H
 
 #include "ace/SString.h"
diff --git a/ace/Local_Name_Space_T.h b/ace/Local_Name_Space_T.h
index 062a07e8dff..2c232c6d8c4 100644
--- a/ace/Local_Name_Space_T.h
+++ b/ace/Local_Name_Space_T.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_LOCAL_NAME_SPACE_T_H)
+#ifndef ACE_LOCAL_NAME_SPACE_T_H
 #define ACE_LOCAL_NAME_SPACE_T_H
 
 #include "ace/Name_Space.h"
diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h
index 1739e085d9f..3752ba29588 100644
--- a/ace/Local_Tokens.h
+++ b/ace/Local_Tokens.h
@@ -36,7 +36,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_LOCAL_MUTEX_H)
+#ifndef ACE_LOCAL_MUTEX_H
 #define ACE_LOCAL_MUTEX_H
 
 #include "ace/Synch_T.h"
diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h
index 0114f53df95..de8676c929b 100644
--- a/ace/Log_Msg.h
+++ b/ace/Log_Msg.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_LOG_MSG_H)
+#ifndef ACE_LOG_MSG_H
 #define ACE_LOG_MSG_H
 
 // This stuff must come first to avoid problems with circular
diff --git a/ace/Log_Priority.h b/ace/Log_Priority.h
index 29f8d053077..e398d0da873 100644
--- a/ace/Log_Priority.h
+++ b/ace/Log_Priority.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_LOG_PRIORITY_H)
+#ifndef ACE_LOG_PRIORITY_H
 #define ACE_LOG_PRIORITY_H
 
 enum ACE_Log_Priority
diff --git a/ace/Log_Record.h b/ace/Log_Record.h
index 0e87de3bf5f..de38ba930e1 100644
--- a/ace/Log_Record.h
+++ b/ace/Log_Record.h
@@ -19,7 +19,7 @@
 #include "ace/ACE.h"
 #include "ace/Log_Priority.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#ifndef ACE_LACKS_PRAGMA_ONCE
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
diff --git a/ace/Malloc.h b/ace/Malloc.h
index a2c464425ae..bb78ccbf2f2 100644
--- a/ace/Malloc.h
+++ b/ace/Malloc.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_MALLOC_H)
+#ifndef ACE_MALLOC_H
 #define ACE_MALLOC_H
 
 #include "ace/ACE.h"
diff --git a/ace/Malloc_Base.h b/ace/Malloc_Base.h
index db947a1e759..6bd7abe5cf5 100644
--- a/ace/Malloc_Base.h
+++ b/ace/Malloc_Base.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_MALLOC_BASE_H)
+#ifndef ACE_MALLOC_BASE_H
 #define ACE_MALLOC_BASE_H
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h
index d3d81f8706c..fce3ae24943 100644
--- a/ace/Malloc_T.h
+++ b/ace/Malloc_T.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_MALLOC_T_H)
+#ifndef ACE_MALLOC_T_H
 #define ACE_MALLOC_T_H
 
 #include "ace/ACE.h"
diff --git a/ace/Managed_Object.h b/ace/Managed_Object.h
index 1fc19a46376..32ba8d4f20e 100644
--- a/ace/Managed_Object.h
+++ b/ace/Managed_Object.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_MANAGED_OBJECT_H)
+#ifndef ACE_MANAGED_OBJECT_H
 #define ACE_MANAGED_OBJECT_H
 
 #include "ace/OS.h"
diff --git a/ace/Map_Manager.h b/ace/Map_Manager.h
index c282cd186fe..bb3182cb48a 100644
--- a/ace/Map_Manager.h
+++ b/ace/Map_Manager.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_MAP_MANAGER_H)
+#ifndef ACE_MAP_MANAGER_H
 #define ACE_MAP_MANAGER_H
 
 #include "ace/OS.h"
diff --git a/ace/Mem_Map.h b/ace/Mem_Map.h
index 86e8f00705b..1f3ab930882 100644
--- a/ace/Mem_Map.h
+++ b/ace/Mem_Map.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_MEM_MAP_H)
+#ifndef ACE_MEM_MAP_H
 #define ACE_MEM_MAP_H
 
 #include "ace/ACE.h"
diff --git a/ace/Memory_Pool.h b/ace/Memory_Pool.h
index e27d8936a2c..5d25ec7666c 100644
--- a/ace/Memory_Pool.h
+++ b/ace/Memory_Pool.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_MEMORY_POOL_H)
+#ifndef ACE_MEMORY_POOL_H
 #define ACE_MEMORY_POOL_H
 
 #include "ace/ACE.h"
diff --git a/ace/Message_Block.h b/ace/Message_Block.h
index 539101fc248..9003e793970 100644
--- a/ace/Message_Block.h
+++ b/ace/Message_Block.h
@@ -16,7 +16,7 @@
 
 #include "ace/ACE.h"
 
-#if !defined (ACE_MESSAGE_BLOCK_H)
+#ifndef ACE_MESSAGE_BLOCK_H
 #define ACE_MESSAGE_BLOCK_H
 
 #include "ace/Malloc.h"
diff --git a/ace/Message_Block_T.h b/ace/Message_Block_T.h
index cbbc47b7eba..e80c4c98165 100644
--- a/ace/Message_Block_T.h
+++ b/ace/Message_Block_T.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_MESSAGE_BLOCK_T_H)
+#ifndef ACE_MESSAGE_BLOCK_T_H
 #define ACE_MESSAGE_BLOCK_T_H
 
 #include "ace/Message_Block.h"
diff --git a/ace/Message_Queue.h b/ace/Message_Queue.h
index f0176ca291e..de665e0e2d9 100644
--- a/ace/Message_Queue.h
+++ b/ace/Message_Queue.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_MESSAGE_QUEUE_H)
+#ifndef ACE_MESSAGE_QUEUE_H
 #define ACE_MESSAGE_QUEUE_H
 
 #include "ace/Message_Block.h"
diff --git a/ace/Message_Queue_T.h b/ace/Message_Queue_T.h
index f6d91a2ea2f..bab88c1d548 100644
--- a/ace/Message_Queue_T.h
+++ b/ace/Message_Queue_T.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_MESSAGE_QUEUE_T_H)
+#ifndef ACE_MESSAGE_QUEUE_T_H
 #define ACE_MESSAGE_QUEUE_T_H
 
 #include "ace/Synch.h"
diff --git a/ace/Method_Object.h b/ace/Method_Object.h
index 22f6224c349..b62867c4268 100644
--- a/ace/Method_Object.h
+++ b/ace/Method_Object.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_METHOD_OBJECT_H)
+#ifndef ACE_METHOD_OBJECT_H
 #define ACE_METHOD_OBJECT_H
 
 #include "ace/OS.h"
diff --git a/ace/Module.h b/ace/Module.h
index 8768b5c2bbf..3cb5614a42c 100644
--- a/ace/Module.h
+++ b/ace/Module.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_MODULE_H)
+#ifndef ACE_MODULE_H
 #define ACE_MODULE_H
 
 #include "ace/ACE.h"
diff --git a/ace/Msg_WFMO_Reactor.h b/ace/Msg_WFMO_Reactor.h
index b168dbf6226..53287a6e4d8 100644
--- a/ace/Msg_WFMO_Reactor.h
+++ b/ace/Msg_WFMO_Reactor.h
@@ -15,7 +15,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_MSG_WFMO_REACTOR_H)
+#ifndef ACE_MSG_WFMO_REACTOR_H
 #define ACE_MSG_WFMO_REACTOR_H
 
 #include "ace/WFMO_Reactor.h"
diff --git a/ace/Multiplexor.h b/ace/Multiplexor.h
index 4b73e1a69fd..6a77bd47d2f 100644
--- a/ace/Multiplexor.h
+++ b/ace/Multiplexor.h
@@ -19,7 +19,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_MULTIPLEXOR_H)
+#ifndef ACE_MULTIPLEXOR_H
 #define ACE_MULTIPLEXOR_H
 
 #include "ace/Module.h"
diff --git a/ace/NT_Service.h b/ace/NT_Service.h
index d60d01559af..c1244ec9f85 100644
--- a/ace/NT_Service.h
+++ b/ace/NT_Service.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_NT_SERVICE_H)
+#ifndef ACE_NT_SERVICE_H
 #define ACE_NT_SERVICE_H
 
 #include "ace/inc_user_config.h"
diff --git a/ace/Name_Proxy.h b/ace/Name_Proxy.h
index 11eeec8a44a..2e442cf1a31 100644
--- a/ace/Name_Proxy.h
+++ b/ace/Name_Proxy.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_NAME_PROXY_H)
+#ifndef ACE_NAME_PROXY_H
 #define ACE_NAME_PROXY_H
 
 #include "ace/INET_Addr.h"
diff --git a/ace/Name_Request_Reply.h b/ace/Name_Request_Reply.h
index e90e75b84ba..fe43ed7ea0b 100644
--- a/ace/Name_Request_Reply.h
+++ b/ace/Name_Request_Reply.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_NAME_REQUEST_REPLY_H)
+#ifndef ACE_NAME_REQUEST_REPLY_H
 #define ACE_NAME_REQUEST_REPLY_H
 
 #include "ace/Time_Value.h"
diff --git a/ace/Name_Space.h b/ace/Name_Space.h
index c81a7d6de2e..553da801745 100644
--- a/ace/Name_Space.h
+++ b/ace/Name_Space.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_NAME_SPACE_H)
+#ifndef ACE_NAME_SPACE_H
 #define ACE_NAME_SPACE_H
 
 #include "ace/ACE.h"
diff --git a/ace/Naming_Context.h b/ace/Naming_Context.h
index 5da21a192a6..7ca37dd3fd1 100644
--- a/ace/Naming_Context.h
+++ b/ace/Naming_Context.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_NAMING_CONTEXT_H)
+#ifndef ACE_NAMING_CONTEXT_H
 #define ACE_NAMING_CONTEXT_H
 
 #include "ace/ACE.h"
diff --git a/ace/OS.h b/ace/OS.h
index 4a6f6522e2e..460790ce6de 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -15,7 +15,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_OS_H)
+#ifndef ACE_OS_H
 # define ACE_OS_H
 
 // This file should be a link to the platform/compiler-specific
diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h
index 268bf5fe978..846cda63454 100644
--- a/ace/Object_Manager.h
+++ b/ace/Object_Manager.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_OBJECT_MANAGER_H)
+#ifndef ACE_OBJECT_MANAGER_H
 #define ACE_OBJECT_MANAGER_H
 
 #include "ace/OS.h"
diff --git a/ace/Obstack.h b/ace/Obstack.h
index 0d37fb6cf8d..7313aa2acb0 100644
--- a/ace/Obstack.h
+++ b/ace/Obstack.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_OBSTACK_H)
+#ifndef ACE_OBSTACK_H
 #define ACE_OBSTACK_H
 
 #include "ace/Malloc.h"
diff --git a/ace/Parse_Node.h b/ace/Parse_Node.h
index e38bf5f4f50..88b7fb7aaa8 100644
--- a/ace/Parse_Node.h
+++ b/ace/Parse_Node.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_PARSE_NODE_H)
+#ifndef ACE_PARSE_NODE_H
 #define ACE_PARSE_NODE_H
 
 #include "ace/Service_Types.h"
diff --git a/ace/Pipe.h b/ace/Pipe.h
index dd210ad6d61..d11ca761678 100644
--- a/ace/Pipe.h
+++ b/ace/Pipe.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_PIPE_H)
+#ifndef ACE_PIPE_H
 #define ACE_PIPE_H
 
 #include "ace/ACE.h"
diff --git a/ace/Priority_Reactor.h b/ace/Priority_Reactor.h
index 15ed6413dad..241ebd7d419 100644
--- a/ace/Priority_Reactor.h
+++ b/ace/Priority_Reactor.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_PRIORITY_REACTOR_H)
+#ifndef ACE_PRIORITY_REACTOR_H
 #define ACE_PRIORITY_REACTOR_H
 
 #include "ace/Containers.h"
diff --git a/ace/Proactor.h b/ace/Proactor.h
index a99c704347c..22b4256ac15 100644
--- a/ace/Proactor.h
+++ b/ace/Proactor.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_PROACTOR_H)
+#ifndef ACE_PROACTOR_H
 #define ACE_PROACTOR_H
 
 #include "ace/OS.h"
diff --git a/ace/Process.h b/ace/Process.h
index 1004b002945..3bcaa596d4a 100644
--- a/ace/Process.h
+++ b/ace/Process.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_PROCESS_H)
+#ifndef ACE_PROCESS_H
 #define ACE_PROCESS_H
 
 #include "ace/OS.h"
diff --git a/ace/Process_Manager.h b/ace/Process_Manager.h
index 69a31503976..62e347b70af 100644
--- a/ace/Process_Manager.h
+++ b/ace/Process_Manager.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_PROCESS_MANAGER_H)
+#ifndef ACE_PROCESS_MANAGER_H
 #define ACE_PROCESS_MANAGER_H
 
 #include "ace/Synch.h"
diff --git a/ace/Profile_Timer.h b/ace/Profile_Timer.h
index 317ecab7faa..4d0bafee63f 100644
--- a/ace/Profile_Timer.h
+++ b/ace/Profile_Timer.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_PROFILE_TIMER_H)
+#ifndef ACE_PROFILE_TIMER_H
 #define ACE_PROFILE_TIMER_H
 
 #include "ace/ACE.h"
diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h
index 969396e82b0..1bb7c589beb 100644
--- a/ace/RB_Tree.h
+++ b/ace/RB_Tree.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_RB_TREE_H)
+#ifndef ACE_RB_TREE_H
 #define ACE_RB_TREE_H
 
 #include "ace/ACE.h"
diff --git a/ace/Reactor.h b/ace/Reactor.h
index fcb018ca049..6620583f63d 100644
--- a/ace/Reactor.h
+++ b/ace/Reactor.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_REACTOR_H)
+#ifndef ACE_REACTOR_H
 #define ACE_REACTOR_H
 
 class ACE_Reactor_Impl;
diff --git a/ace/Reactor_Impl.h b/ace/Reactor_Impl.h
index 5ecf6961cd6..d4edb289073 100644
--- a/ace/Reactor_Impl.h
+++ b/ace/Reactor_Impl.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_REACTOR_IMPL_H)
+#ifndef ACE_REACTOR_IMPL_H
 #define ACE_REACTOR_IMPL_H
 
 // Timer Queue is a complicated template class. A simple forward
diff --git a/ace/Read_Buffer.h b/ace/Read_Buffer.h
index 003227f4996..9ad4ad605de 100644
--- a/ace/Read_Buffer.h
+++ b/ace/Read_Buffer.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_READ_BUFFER_H)
+#ifndef ACE_READ_BUFFER_H
 #define ACE_READ_BUFFER_H
 
 #include "ace/ACE.h"
diff --git a/ace/Registry.h b/ace/Registry.h
index 00f08008503..330a0e95d62 100644
--- a/ace/Registry.h
+++ b/ace/Registry.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_REGISTRY_H)
+#ifndef ACE_REGISTRY_H
 #define ACE_REGISTRY_H
 
 #include "ace/OS.h"
diff --git a/ace/Registry_Name_Space.h b/ace/Registry_Name_Space.h
index fa558373427..8ce4ea191e8 100644
--- a/ace/Registry_Name_Space.h
+++ b/ace/Registry_Name_Space.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_REGISTRY_NAME_SPACE_H)
+#ifndef ACE_REGISTRY_NAME_SPACE_H
 #define ACE_REGISTRY_NAME_SPACE_H
 
 #include "ace/OS.h"
diff --git a/ace/Remote_Name_Space.h b/ace/Remote_Name_Space.h
index d96c16bee6a..a94036d53ef 100644
--- a/ace/Remote_Name_Space.h
+++ b/ace/Remote_Name_Space.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_REMOTE_NAME_SPACE_H)
+#ifndef ACE_REMOTE_NAME_SPACE_H
 #define ACE_REMOTE_NAME_SPACE_H
 
 #include "ace/ACE.h"
diff --git a/ace/Remote_Tokens.h b/ace/Remote_Tokens.h
index 036ec781815..a91bba25809 100644
--- a/ace/Remote_Tokens.h
+++ b/ace/Remote_Tokens.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_REMOTE_MUTEX_H)
+#ifndef ACE_REMOTE_MUTEX_H
 #define ACE_REMOTE_MUTEX_H
 
 #include "ace/INET_Addr.h"
diff --git a/ace/SOCK.h b/ace/SOCK.h
index 37f33522c5f..a32ee1cddbb 100644
--- a/ace/SOCK.h
+++ b/ace/SOCK.h
@@ -14,7 +14,7 @@
 // 
 //============================================================================
 
-#if !defined (ACE_SOCK_H)
+#ifndef ACE_SOCK_H
 #define ACE_SOCK_H
 
 #include "ace/ACE.h"
diff --git a/ace/SOCK_Acceptor.h b/ace/SOCK_Acceptor.h
index ff2f3e2d29f..a49611e64c1 100644
--- a/ace/SOCK_Acceptor.h
+++ b/ace/SOCK_Acceptor.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SOCK_ACCEPTOR_H)
+#ifndef ACE_SOCK_ACCEPTOR_H
 #define ACE_SOCK_ACCEPTOR_H
 
 #include "ace/SOCK_Stream.h"
diff --git a/ace/SOCK_CODgram.h b/ace/SOCK_CODgram.h
index 6a859a1085c..623dad627ae 100644
--- a/ace/SOCK_CODgram.h
+++ b/ace/SOCK_CODgram.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SOCK_CODGRAM_H)
+#ifndef ACE_SOCK_CODGRAM_H
 #define ACE_SOCK_CODGRAM_H
 
 #include "ace/SOCK_IO.h"
diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h
index 741c61ee578..175e6666d2a 100644
--- a/ace/SOCK_Connector.h
+++ b/ace/SOCK_Connector.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SOCK_CONNECTOR_H)
+#ifndef ACE_SOCK_CONNECTOR_H
 #define ACE_SOCK_CONNECTOR_H
 
 #include "ace/SOCK_Stream.h"
diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h
index 4f6b903af45..671ddfe6b45 100644
--- a/ace/SOCK_Dgram.h
+++ b/ace/SOCK_Dgram.h
@@ -14,7 +14,7 @@
 // 
 // ===========================================================================
 
-#if !defined (ACE_SOCK_DGRAM_H)
+#ifndef ACE_SOCK_DGRAM_H
 #define ACE_SOCK_DGRAM_H
 
 #include "ace/SOCK.h"
diff --git a/ace/SOCK_Dgram_Bcast.h b/ace/SOCK_Dgram_Bcast.h
index fc4325b2fde..86e9c0e234f 100644
--- a/ace/SOCK_Dgram_Bcast.h
+++ b/ace/SOCK_Dgram_Bcast.h
@@ -13,7 +13,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SOCK_DGRAM_BCAST_H)
+#ifndef ACE_SOCK_DGRAM_BCAST_H
 #define ACE_SOCK_DGRAM_BCAST_H
 
 #include "ace/INET_Addr.h"
diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h
index e3e76cb5985..9209902f557 100644
--- a/ace/SOCK_Dgram_Mcast.h
+++ b/ace/SOCK_Dgram_Mcast.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SOCK_DGRAM_MCAST_H)
+#ifndef ACE_SOCK_DGRAM_MCAST_H
 #define ACE_SOCK_DGRAM_MCAST_H
 
 #include "ace/SOCK_Dgram.h"
diff --git a/ace/SOCK_IO.h b/ace/SOCK_IO.h
index 5342e6bc35d..0a7592fe5d1 100644
--- a/ace/SOCK_IO.h
+++ b/ace/SOCK_IO.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SOCK_IO_H)
+#ifndef ACE_SOCK_IO_H
 #define ACE_SOCK_IO_H
 
 #include "ace/SOCK.h"
diff --git a/ace/SOCK_Stream.h b/ace/SOCK_Stream.h
index a6d1706a246..862d46d2bc8 100644
--- a/ace/SOCK_Stream.h
+++ b/ace/SOCK_Stream.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SOCK_STREAM_H)
+#ifndef ACE_SOCK_STREAM_H
 #define ACE_SOCK_STREAM_H
 
 #include "ace/SOCK_IO.h"
diff --git a/ace/SPIPE.h b/ace/SPIPE.h
index d75f354e071..ebfa0e63c2c 100644
--- a/ace/SPIPE.h
+++ b/ace/SPIPE.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SPIPE_H)
+#ifndef ACE_SPIPE_H
 #define ACE_SPIPE_H
 
 #include "ace/IPC_SAP.h"
diff --git a/ace/SPIPE_Acceptor.h b/ace/SPIPE_Acceptor.h
index a72dda638cb..cfcc88028ff 100644
--- a/ace/SPIPE_Acceptor.h
+++ b/ace/SPIPE_Acceptor.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SPIPE_ACCEPTOR_H) 
+#ifndef ACE_SPIPE_ACCEPTOR_H 
 #define ACE_SPIPE_ACCEPTOR_H
 
 #include "ace/SPIPE_Stream.h"
diff --git a/ace/SPIPE_Addr.h b/ace/SPIPE_Addr.h
index 1dee1121df9..04190b91cac 100644
--- a/ace/SPIPE_Addr.h
+++ b/ace/SPIPE_Addr.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SPIPE_ADDR_H)
+#ifndef ACE_SPIPE_ADDR_H
 #define ACE_SPIPE_ADDR_H
 
 #include "ace/Addr.h"
diff --git a/ace/SPIPE_Connector.h b/ace/SPIPE_Connector.h
index f552b0da4e3..34d5df2b01d 100644
--- a/ace/SPIPE_Connector.h
+++ b/ace/SPIPE_Connector.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SPIPE_CONNECTOR_H)
+#ifndef ACE_SPIPE_CONNECTOR_H
 #define ACE_SPIPE_CONNECTOR_H
 
 #include "ace/SPIPE_Stream.h"
diff --git a/ace/SPIPE_Stream.h b/ace/SPIPE_Stream.h
index 55325a0432e..91cb117c903 100644
--- a/ace/SPIPE_Stream.h
+++ b/ace/SPIPE_Stream.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SPIPE_STREAM_H)
+#ifndef ACE_SPIPE_STREAM_H
 #define ACE_SPIPE_STREAM_H
 
 #include "ace/SPIPE.h"
diff --git a/ace/SString.h b/ace/SString.h
index 80f6b4cb302..6283d79587f 100644
--- a/ace/SString.h
+++ b/ace/SString.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_SSTRING_H)
+#ifndef ACE_SSTRING_H
 #define ACE_SSTRING_H
 
 #include "ace/ACE.h"
diff --git a/ace/SV_Message.h b/ace/SV_Message.h
index b7f70e66d69..e28b25ff501 100644
--- a/ace/SV_Message.h
+++ b/ace/SV_Message.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SV_MESSAGE_H)
+#ifndef ACE_SV_MESSAGE_H
 #define ACE_SV_MESSAGE_H
 
 #include "ace/ACE.h"
diff --git a/ace/SV_Message_Queue.h b/ace/SV_Message_Queue.h
index caf89378622..9e3a35ee7f7 100644
--- a/ace/SV_Message_Queue.h
+++ b/ace/SV_Message_Queue.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_MESSAGE_QUEUE_H)
+#ifndef ACE_MESSAGE_QUEUE_H
 #define ACE_MESSAGE_QUEUE_H
 
 #include "ace/ACE.h"
diff --git a/ace/SV_Semaphore_Complex.h b/ace/SV_Semaphore_Complex.h
index d3c03c357ac..11b9d4ecbb6 100644
--- a/ace/SV_Semaphore_Complex.h
+++ b/ace/SV_Semaphore_Complex.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SV_SEMAPHORE_COMPLEX_H)
+#ifndef ACE_SV_SEMAPHORE_COMPLEX_H
 #define ACE_SV_SEMAPHORE_COMPLEX_H
 
 #include "ace/SV_Semaphore_Simple.h"
diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h
index aafb08ac8c1..88997030e56 100644
--- a/ace/SV_Semaphore_Simple.h
+++ b/ace/SV_Semaphore_Simple.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SV_SEMAPHORE_SIMPLE_H)
+#ifndef ACE_SV_SEMAPHORE_SIMPLE_H
 #define ACE_SV_SEMAPHORE_SIMPLE_H
 
 #include "ace/ACE.h"
diff --git a/ace/SV_Shared_Memory.h b/ace/SV_Shared_Memory.h
index a00a036eb43..e1ff26755e0 100644
--- a/ace/SV_Shared_Memory.h
+++ b/ace/SV_Shared_Memory.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SV_SHARED_MEMORY_H)
+#ifndef ACE_SV_SHARED_MEMORY_H
 #define ACE_SV_SHARED_MEMORY_H
 
 #include "ace/ACE.h"
diff --git a/ace/Sched_Params.h b/ace/Sched_Params.h
index c554033dd74..06f4fc1dd8c 100644
--- a/ace/Sched_Params.h
+++ b/ace/Sched_Params.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_SCHED_PARAMS_H)
+#ifndef ACE_SCHED_PARAMS_H
 #define ACE_SCHED_PARAMS_H
 
 #include "ace/OS.h"
diff --git a/ace/Select_Reactor.h b/ace/Select_Reactor.h
index 709799e5c97..42dad6db900 100644
--- a/ace/Select_Reactor.h
+++ b/ace/Select_Reactor.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_SELECT_REACTOR_H)
+#ifndef ACE_SELECT_REACTOR_H
 #define ACE_SELECT_REACTOR_H
 
 #include "ace/Select_Reactor_T.h"
diff --git a/ace/Select_Reactor_Base.h b/ace/Select_Reactor_Base.h
index 82a04e370d6..bbf8d84c683 100644
--- a/ace/Select_Reactor_Base.h
+++ b/ace/Select_Reactor_Base.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_SELECT_REACTOR_BASE_H)
+#ifndef ACE_SELECT_REACTOR_BASE_H
 #define ACE_SELECT_REACTOR_BASE_H
 
 #include "ace/Signal.h"
diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h
index c8417f83351..6c8f1d20e2c 100644
--- a/ace/Select_Reactor_T.h
+++ b/ace/Select_Reactor_T.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_SELECT_REACTOR_T_H)
+#ifndef ACE_SELECT_REACTOR_T_H
 #define ACE_SELECT_REACTOR_T_H
 
 #include "ace/Select_Reactor_Base.h"
diff --git a/ace/Service_Config.h b/ace/Service_Config.h
index b6c707f0b76..f0430bb60dc 100644
--- a/ace/Service_Config.h
+++ b/ace/Service_Config.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_SERVICE_CONFIG_H)
+#ifndef ACE_SERVICE_CONFIG_H
 #define ACE_SERVICE_CONFIG_H
 
 #include "ace/Service_Object.h"
diff --git a/ace/Service_Manager.h b/ace/Service_Manager.h
index 06505e84a7a..9ea7876fef6 100644
--- a/ace/Service_Manager.h
+++ b/ace/Service_Manager.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SERVICE_MANAGER_H)
+#ifndef ACE_SERVICE_MANAGER_H
 #define ACE_SERVICE_MANAGER_H
 
 #include "ace/SOCK_Stream.h"
diff --git a/ace/Service_Object.h b/ace/Service_Object.h
index 485b5396840..144a5e04368 100644
--- a/ace/Service_Object.h
+++ b/ace/Service_Object.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SERVICE_OBJECT_H)
+#ifndef ACE_SERVICE_OBJECT_H
 #define ACE_SERVICE_OBJECT_H
 
 #include "ace/Shared_Object.h"
diff --git a/ace/Service_Repository.h b/ace/Service_Repository.h
index 180e251721d..ca75e8b8777 100644
--- a/ace/Service_Repository.h
+++ b/ace/Service_Repository.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SERVICE_REPOSITORY_H)
+#ifndef ACE_SERVICE_REPOSITORY_H
 #define ACE_SERVICE_REPOSITORY_H
 
 #include "ace/Service_Types.h"
diff --git a/ace/Service_Types.h b/ace/Service_Types.h
index ffd4475b8a0..d4e2dde4fec 100644
--- a/ace/Service_Types.h
+++ b/ace/Service_Types.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SERVICE_TYPE_H)
+#ifndef ACE_SERVICE_TYPE_H
 #define ACE_SERVICE_TYPE_H
 
 #include "ace/Service_Object.h"
diff --git a/ace/Shared_Memory.h b/ace/Shared_Memory.h
index af990d016fa..abf5c3aff50 100644
--- a/ace/Shared_Memory.h
+++ b/ace/Shared_Memory.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SHARED_MEMORY_H)
+#ifndef ACE_SHARED_MEMORY_H
 #define ACE_SHARED_MEMORY_H
 
 #include "ace/ACE.h"
diff --git a/ace/Shared_Memory_MM.h b/ace/Shared_Memory_MM.h
index 94285dbfad0..59d0d457650 100644
--- a/ace/Shared_Memory_MM.h
+++ b/ace/Shared_Memory_MM.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_SHARED_MALLOC_MM_H)
+#ifndef ACE_SHARED_MALLOC_MM_H
 #define ACE_SHARED_MALLOC_MM_H
 
 #include "ace/Shared_Memory.h"
diff --git a/ace/Shared_Memory_SV.h b/ace/Shared_Memory_SV.h
index 6694b2bcf62..a27ab8c6274 100644
--- a/ace/Shared_Memory_SV.h
+++ b/ace/Shared_Memory_SV.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SHARED_MALLOC_SV_H)
+#ifndef ACE_SHARED_MALLOC_SV_H
 #define ACE_SHARED_MALLOC_SV_H
 
 #include "ace/Shared_Memory.h"
diff --git a/ace/Shared_Object.h b/ace/Shared_Object.h
index b4a14c79649..c41c398484f 100644
--- a/ace/Shared_Object.h
+++ b/ace/Shared_Object.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SHARED_OBJECT_H)
+#ifndef ACE_SHARED_OBJECT_H
 #define ACE_SHARED_OBJECT_H
 
 #include "ace/ACE.h"
diff --git a/ace/Signal.h b/ace/Signal.h
index 541b78e81e9..8cd768cd72c 100644
--- a/ace/Signal.h
+++ b/ace/Signal.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_SIGNAL_HANDLER_H)
+#ifndef ACE_SIGNAL_HANDLER_H
 #define ACE_SIGNAL_HANDLER_H
 
 #include "ace/Synch.h"
diff --git a/ace/Singleton.h b/ace/Singleton.h
index 91ab3833657..419af5bac9c 100644
--- a/ace/Singleton.h
+++ b/ace/Singleton.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_SINGLETON_H)
+#ifndef ACE_SINGLETON_H
 #define ACE_SINGLETON_H
 
 #include "ace/Synch.h"
diff --git a/ace/Stats.h b/ace/Stats.h
index 88388c95575..bb898833d4e 100644
--- a/ace/Stats.h
+++ b/ace/Stats.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_STATS_H)
+#ifndef ACE_STATS_H
 #define ACE_STATS_H
 
 #include "ace/ACE.h"
diff --git a/ace/Strategies.h b/ace/Strategies.h
index 9bf57220a11..e06bd9a6963 100644
--- a/ace/Strategies.h
+++ b/ace/Strategies.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_STRATEGIES_H)
+#ifndef ACE_STRATEGIES_H
 #define ACE_STRATEGIES_H
 
 #include "ace/Event_Handler.h"
diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h
index 9b375e9945f..fea23d00ce0 100644
--- a/ace/Strategies_T.h
+++ b/ace/Strategies_T.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_STRATEGIES_T_H)
+#ifndef ACE_STRATEGIES_T_H
 #define ACE_STRATEGIES_T_H
 
 #include "ace/Strategies.h"
diff --git a/ace/Stream.h b/ace/Stream.h
index 9dd83e3249b..096172b6d3d 100644
--- a/ace/Stream.h
+++ b/ace/Stream.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_STREAM_H)
+#ifndef ACE_STREAM_H
 #define ACE_STREAM_H
 
 #include "ace/ACE.h"
diff --git a/ace/Stream_Modules.h b/ace/Stream_Modules.h
index 7c593608d45..904413ef405 100644
--- a/ace/Stream_Modules.h
+++ b/ace/Stream_Modules.h
@@ -21,7 +21,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (ACE_STREAM_MODULES)
+#ifndef ACE_STREAM_MODULES
 #define ACE_STREAM_MODULES
 
 template <ACE_SYNCH_DECL>
diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h
index 8fdca0d39e5..f7fe6a3ee5d 100644
--- a/ace/Svc_Conf.h
+++ b/ace/Svc_Conf.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SVC_CONF_H)
+#ifndef ACE_SVC_CONF_H
 #define ACE_SVC_CONF_H
 
 // Globally visible macros, type decls, and extern var decls for
diff --git a/ace/Svc_Handler.h b/ace/Svc_Handler.h
index 49153beafa8..85eda573095 100644
--- a/ace/Svc_Handler.h
+++ b/ace/Svc_Handler.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SVC_HANDLER_H)
+#ifndef ACE_SVC_HANDLER_H
 #define ACE_SVC_HANDLER_H
 
 // Forward decls.
diff --git a/ace/Synch.h b/ace/Synch.h
index 514628cf4eb..d4739123c3c 100644
--- a/ace/Synch.h
+++ b/ace/Synch.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_SYNCH_H)
+#ifndef ACE_SYNCH_H
 #define ACE_SYNCH_H
 
 #include "ace/ACE.h"
diff --git a/ace/Synch_Options.h b/ace/Synch_Options.h
index fbcadb95748..b9fab9a7a6e 100644
--- a/ace/Synch_Options.h
+++ b/ace/Synch_Options.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_SYNCH_OPTIONS_H)
+#ifndef ACE_SYNCH_OPTIONS_H
 #define ACE_SYNCH_OPTIONS_H
 
 #include "ace/ACE.h"
diff --git a/ace/Synch_T.h b/ace/Synch_T.h
index fce5025c447..3e470689865 100644
--- a/ace/Synch_T.h
+++ b/ace/Synch_T.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_SYNCH_T_H)
+#ifndef ACE_SYNCH_T_H
 #define ACE_SYNCH_T_H
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ace/System_Time.h b/ace/System_Time.h
index b288d6872bb..b05bc7aac98 100644
--- a/ace/System_Time.h
+++ b/ace/System_Time.h
@@ -15,7 +15,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_SYSTEM_TIME_H)
+#ifndef ACE_SYSTEM_TIME_H
 #define ACE_SYSTEM_TIME_H
 
 #include "ace/OS.h"
diff --git a/ace/TLI.h b/ace/TLI.h
index d63dc67ac9f..85991e53de0 100644
--- a/ace/TLI.h
+++ b/ace/TLI.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TLI_H)
+#ifndef ACE_TLI_H
 #define ACE_TLI_H
 
 #include "ace/IPC_SAP.h"
diff --git a/ace/TLI_Acceptor.h b/ace/TLI_Acceptor.h
index 5d3913f14ff..041f8ad6645 100644
--- a/ace/TLI_Acceptor.h
+++ b/ace/TLI_Acceptor.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TLI_ACCEPTOR_H)
+#ifndef ACE_TLI_ACCEPTOR_H
 #define ACE_TLI_ACCEPTOR_H
 
 #include "ace/TLI.h"
diff --git a/ace/TLI_Connector.h b/ace/TLI_Connector.h
index 7a9830fa9f4..360baabb65e 100644
--- a/ace/TLI_Connector.h
+++ b/ace/TLI_Connector.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TLI_CONNECTOR_H)
+#ifndef ACE_TLI_CONNECTOR_H
 #define ACE_TLI_CONNECTOR_H
 
 #include "ace/TLI_Stream.h"
diff --git a/ace/TLI_Stream.h b/ace/TLI_Stream.h
index a9badd58820..3c38f8db9d5 100644
--- a/ace/TLI_Stream.h
+++ b/ace/TLI_Stream.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TLI_STREAM_H)
+#ifndef ACE_TLI_STREAM_H
 #define ACE_TLI_STREAM_H
 
 #include "ace/TLI.h"
diff --git a/ace/TP_Reactor.h b/ace/TP_Reactor.h
index 7f4bab25121..b53ee3b74af 100644
--- a/ace/TP_Reactor.h
+++ b/ace/TP_Reactor.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_TP_REACTOR_H)
+#ifndef ACE_TP_REACTOR_H
 #define ACE_TP_REACTOR_H
 
 #include "ace/Select_Reactor.h"
diff --git a/ace/TTY_IO.h b/ace/TTY_IO.h
index e1f334315b3..ad0d8903108 100644
--- a/ace/TTY_IO.h
+++ b/ace/TTY_IO.h
@@ -16,7 +16,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TTY_IO_H)
+#ifndef ACE_TTY_IO_H
 #define ACE_TTY_IO_H
 
 #include "ace/OS.h"
diff --git a/ace/Task.h b/ace/Task.h
index 764e3409702..35125b68f25 100644
--- a/ace/Task.h
+++ b/ace/Task.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_TASK_H)
+#ifndef ACE_TASK_H
 #define ACE_TASK_H
 
 #include "ace/Service_Object.h"
diff --git a/ace/Task_T.h b/ace/Task_T.h
index 2e17069219a..1ecbd85fb99 100644
--- a/ace/Task_T.h
+++ b/ace/Task_T.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_TASK_T_H)
+#ifndef ACE_TASK_T_H
 #define ACE_TASK_T_H
 
 #include "ace/Message_Queue.h"
diff --git a/ace/Thread.h b/ace/Thread.h
index e90762a8466..bdeb8148a05 100644
--- a/ace/Thread.h
+++ b/ace/Thread.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_THREAD_H)
+#ifndef ACE_THREAD_H
 #define ACE_THREAD_H
 
 #include "ace/ACE.h"
diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h
index d896f5b51ec..b5d58bccb1f 100644
--- a/ace/Thread_Manager.h
+++ b/ace/Thread_Manager.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_THREAD_MANAGER_H)
+#ifndef ACE_THREAD_MANAGER_H
 #define ACE_THREAD_MANAGER_H
 
 #include "ace/Thread.h"
diff --git a/ace/Time_Request_Reply.h b/ace/Time_Request_Reply.h
index 087c236bbc8..d92faa0f9ee 100644
--- a/ace/Time_Request_Reply.h
+++ b/ace/Time_Request_Reply.h
@@ -19,7 +19,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TIME_REQUEST_REPLY_H)
+#ifndef ACE_TIME_REQUEST_REPLY_H
 #define ACE_TIME_REQUEST_REPLY_H
 
 #include "ace/Time_Value.h"
diff --git a/ace/Time_Value.h b/ace/Time_Value.h
index 05c2c8a74e1..d3fa1094fef 100644
--- a/ace/Time_Value.h
+++ b/ace/Time_Value.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TIME_VALUE_H)
+#ifndef ACE_TIME_VALUE_H
 #define ACE_TIME_VALUE_H
 
 // This file is no longer used and is only here due to backwards
diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h
index 950e83059f9..be8b6153254 100644
--- a/ace/Timeprobe.h
+++ b/ace/Timeprobe.h
@@ -1,6 +1,7 @@
+/* -*- C++ -*- */
 // $Id$
 
-#if !defined (ACE_TIMEPROBE_H)
+#ifndef ACE_TIMEPROBE_H
 #define ACE_TIMEPROBE_H
 
 #include "ace/OS.h"
diff --git a/ace/Timeprobe_T.h b/ace/Timeprobe_T.h
index 2bb4a96eec2..6fe1bd79502 100644
--- a/ace/Timeprobe_T.h
+++ b/ace/Timeprobe_T.h
@@ -1,6 +1,7 @@
+/* -*- C++ -*- */
 // $Id$
 
-#if !defined (ACE_TIMEPROBE_T_H)
+#ifndef ACE_TIMEPROBE_T_H
 #define ACE_TIMEPROBE_T_H
 
 #include "ace/OS.h"
diff --git a/ace/Timer_Hash.h b/ace/Timer_Hash.h
index 95a0f93a5b9..2fbe0f80428 100644
--- a/ace/Timer_Hash.h
+++ b/ace/Timer_Hash.h
@@ -1,6 +1,5 @@
-// $Id$
-
 /* -*- C++ -*- */
+// $Id$
 
 // ============================================================================
 //
@@ -15,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TIMER_HASH_H)
+#ifndef ACE_TIMER_HASH_H
 #define ACE_TIMER_HASH_H
 
 #include "ace/Timer_Hash_T.h"
diff --git a/ace/Timer_Hash_T.h b/ace/Timer_Hash_T.h
index c2dc3bebccd..24b37a908b8 100644
--- a/ace/Timer_Hash_T.h
+++ b/ace/Timer_Hash_T.h
@@ -1,6 +1,5 @@
-// $Id$
-
 /* -*- C++ -*- */
+// $Id$
 
 // ============================================================================
 //
@@ -15,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TIMER_HASH_T_H)
+#ifndef ACE_TIMER_HASH_T_H
 #define ACE_TIMER_HASH_T_H
 
 #include "ace/Timer_Queue_T.h"
diff --git a/ace/Timer_Heap.h b/ace/Timer_Heap.h
index b3ac06d50f2..d23033a726a 100644
--- a/ace/Timer_Heap.h
+++ b/ace/Timer_Heap.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TIMER_HEAP_H)
+#ifndef ACE_TIMER_HEAP_H
 #define ACE_TIMER_HEAP_H
 
 #include "ace/Timer_Heap_T.h"
diff --git a/ace/Timer_Heap_T.h b/ace/Timer_Heap_T.h
index 32150de7647..b959230f01f 100644
--- a/ace/Timer_Heap_T.h
+++ b/ace/Timer_Heap_T.h
@@ -1,6 +1,6 @@
+/* -*- C++ -*- */
 // $Id$
 
-/* -*- C++ -*- */
 // ============================================================================
 //
 // = LIBRARY
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TIMER_HEAP_T_H)
+#ifndef ACE_TIMER_HEAP_T_H
 #define ACE_TIMER_HEAP_T_H
 
 #include "ace/Timer_Queue_T.h"
diff --git a/ace/Timer_List.h b/ace/Timer_List.h
index 290c5d78a01..a25f7bbab05 100644
--- a/ace/Timer_List.h
+++ b/ace/Timer_List.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TIMER_LIST_H)
+#ifndef ACE_TIMER_LIST_H
 #define ACE_TIMER_LIST_H
 
 #include "ace/Timer_List_T.h"
diff --git a/ace/Timer_List_T.h b/ace/Timer_List_T.h
index fa593d1642b..c77ea71d7be 100644
--- a/ace/Timer_List_T.h
+++ b/ace/Timer_List_T.h
@@ -1,6 +1,6 @@
+/* -*- C++ -*- */
 // $Id$
 
-/* -*- C++ -*- */
 // ============================================================================
 //
 // = LIBRARY
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TIMER_LIST_T_H)
+#ifndef ACE_TIMER_LIST_T_H
 #define ACE_TIMER_LIST_T_H
 
 #include "ace/Timer_Queue_T.h"
diff --git a/ace/Timer_Queue.h b/ace/Timer_Queue.h
index 288c921d5fb..0b35da4b98f 100644
--- a/ace/Timer_Queue.h
+++ b/ace/Timer_Queue.h
@@ -1,5 +1,4 @@
 // $Id$
-
 /* -*- C++ -*- */
 
 // ============================================================================
@@ -15,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TIMER_QUEUE_H)
+#ifndef ACE_TIMER_QUEUE_H
 #define ACE_TIMER_QUEUE_H
 
 #include "ace/Synch.h"
diff --git a/ace/Timer_Queue_Adapters.h b/ace/Timer_Queue_Adapters.h
index 95c3a6aec6f..74df493dd75 100644
--- a/ace/Timer_Queue_Adapters.h
+++ b/ace/Timer_Queue_Adapters.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_TIMER_QUEUE_ADAPTERS_H)
+#ifndef ACE_TIMER_QUEUE_ADAPTERS_H
 # define ACE_TIMER_QUEUE_ADAPTERS_H
 
 # include "ace/Task.h"
diff --git a/ace/Timer_Queue_T.h b/ace/Timer_Queue_T.h
index e17abb7c86c..fc12b857aba 100644
--- a/ace/Timer_Queue_T.h
+++ b/ace/Timer_Queue_T.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TIMER_QUEUE_T_H)
+#ifndef ACE_TIMER_QUEUE_T_H
 #define ACE_TIMER_QUEUE_T_H
 
 #include "ace/Free_List.h"
diff --git a/ace/Timer_Wheel.h b/ace/Timer_Wheel.h
index e618957ce19..b21bd64fa33 100644
--- a/ace/Timer_Wheel.h
+++ b/ace/Timer_Wheel.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TIMER_WHEEL_H)
+#ifndef ACE_TIMER_WHEEL_H
 #define ACE_TIMER_WHEEL_H
 
 #include "ace/Timer_Wheel_T.h"
diff --git a/ace/Timer_Wheel_T.h b/ace/Timer_Wheel_T.h
index 25e717825bd..b8995cf3bb2 100644
--- a/ace/Timer_Wheel_T.h
+++ b/ace/Timer_Wheel_T.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TIMER_WHEEL_T_H)
+#ifndef ACE_TIMER_WHEEL_T_H
 #define ACE_TIMER_WHEEL_T_H
 
 #include "ace/Timer_Queue_T.h"
diff --git a/ace/Token.h b/ace/Token.h
index 437b549f5aa..49d53db1dc4 100644
--- a/ace/Token.h
+++ b/ace/Token.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TOKEN_H)
+#ifndef ACE_TOKEN_H
 #define ACE_TOKEN_H
 
 #include "ace/Synch.h"
diff --git a/ace/Token_Collection.h b/ace/Token_Collection.h
index 10a60de017f..404d3bcc148 100644
--- a/ace/Token_Collection.h
+++ b/ace/Token_Collection.h
@@ -24,7 +24,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_TOKEN_COLLECTION_H)
+#ifndef ACE_TOKEN_COLLECTION_H
 #define ACE_TOKEN_COLLECTION_H
 
 #include "ace/Map_Manager.h"
diff --git a/ace/Token_Invariants.h b/ace/Token_Invariants.h
index f5dc8bebed2..fa0d83048a7 100644
--- a/ace/Token_Invariants.h
+++ b/ace/Token_Invariants.h
@@ -19,7 +19,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_TOKEN_INVARIANTS_H)
+#ifndef ACE_TOKEN_INVARIANTS_H
 #define ACE_TOKEN_INVARIANTS_H
 
 #include "ace/Synch.h"
diff --git a/ace/Token_Manager.h b/ace/Token_Manager.h
index 13f12b4e657..9fadea24b74 100644
--- a/ace/Token_Manager.h
+++ b/ace/Token_Manager.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_TOKEN_MANAGER_H)
+#ifndef ACE_TOKEN_MANAGER_H
 #define ACE_TOKEN_MANAGER_H
 
 #include "ace/Synch.h"
diff --git a/ace/Token_Request_Reply.h b/ace/Token_Request_Reply.h
index 9c201bfed3c..f12db8e0769 100644
--- a/ace/Token_Request_Reply.h
+++ b/ace/Token_Request_Reply.h
@@ -1,7 +1,6 @@
 /* -*- C++ -*- */
 // $Id$
 
-
 // ============================================================================
 //
 // = LIBRARY
@@ -20,8 +19,8 @@
 // 
 // ============================================================================
 
-#if !defined (_TOKEN_REQUEST_REPLY_H)
-#define _TOKEN_REQUEST_REPLY_H
+#ifndef (ACE_TOKEN_REQUEST_REPLY_H)
+#define ACE_TOKEN_REQUEST_REPLY_H
 
 #include "ace/Local_Tokens.h"
 #include "ace/Time_Value.h"
@@ -226,4 +225,4 @@ private:
 #include "ace/Token_Request_Reply.i"
 #endif /* __ACE_INLINE__ */
 
-#endif /* _TOKEN_REQUEST_REPLY_H */
+#endif /* ACE_TOKEN_REQUEST_REPLY_H */
diff --git a/ace/Trace.h b/ace/Trace.h
index 8f6e8b27869..bce87e6abb8 100644
--- a/ace/Trace.h
+++ b/ace/Trace.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TRACE_H)
+#ifndef ACE_TRACE_H
 #define ACE_TRACE_H
 
 class ACE_Export ACE_Trace
diff --git a/ace/Typed_SV_Message.h b/ace/Typed_SV_Message.h
index f85186ccd48..37c9c9fcc74 100644
--- a/ace/Typed_SV_Message.h
+++ b/ace/Typed_SV_Message.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TYPED_SV_MESSAGE_H)
+#ifndef ACE_TYPED_SV_MESSAGE_H
 #define ACE_TYPED_SV_MESSAGE_H
 
 #include "ace/ACE.h"
diff --git a/ace/Typed_SV_Message_Queue.h b/ace/Typed_SV_Message_Queue.h
index e9a94867285..d2c93f06639 100644
--- a/ace/Typed_SV_Message_Queue.h
+++ b/ace/Typed_SV_Message_Queue.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_TYPED_MESSAGE_QUEUE_H)
+#ifndef ACE_TYPED_MESSAGE_QUEUE_H
 #define ACE_TYPED_MESSAGE_QUEUE_H
 
 #include "ace/SV_Message_Queue.h"
diff --git a/ace/UNIX_Addr.h b/ace/UNIX_Addr.h
index 5bee7b4f3df..54c1eabc19a 100644
--- a/ace/UNIX_Addr.h
+++ b/ace/UNIX_Addr.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_UNIX_ADDR_H)
+#ifndef ACE_UNIX_ADDR_H
 #define ACE_UNIX_ADDR_H
 
 #include "ace/Addr.h"
diff --git a/ace/UPIPE_Acceptor.h b/ace/UPIPE_Acceptor.h
index 576646a4407..342211444bc 100644
--- a/ace/UPIPE_Acceptor.h
+++ b/ace/UPIPE_Acceptor.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_UPIPE_ACCEPTOR_H) 
+#ifndef ACE_UPIPE_ACCEPTOR_H 
 #define ACE_UPIPE_ACCEPTOR_H
 
 #include "ace/UPIPE_Stream.h"
diff --git a/ace/UPIPE_Addr.h b/ace/UPIPE_Addr.h
index fcdf59e54a8..ae1162d101d 100644
--- a/ace/UPIPE_Addr.h
+++ b/ace/UPIPE_Addr.h
@@ -15,7 +15,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_UPIPE_ADDR_H)
+#ifndef ACE_UPIPE_ADDR_H
 #define ACE_UPIPE_ADDR_H
 
 #include "ace/SPIPE_Addr.h"
diff --git a/ace/UPIPE_Connector.h b/ace/UPIPE_Connector.h
index de2e5fa2c63..905da37b07e 100644
--- a/ace/UPIPE_Connector.h
+++ b/ace/UPIPE_Connector.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined (ACE_UPIPE_CONNECTOR_H)
+#ifndef ACE_UPIPE_CONNECTOR_H
 #define ACE_UPIPE_CONNECTOR_H
 
 #include "ace/UPIPE_Stream.h"
diff --git a/ace/UPIPE_Stream.h b/ace/UPIPE_Stream.h
index 53921bca065..62b3022910a 100644
--- a/ace/UPIPE_Stream.h
+++ b/ace/UPIPE_Stream.h
@@ -14,7 +14,7 @@
 // 
 // ============================================================================
 
-#if !defined ACE_UPIPE_STREAM_H
+#ifndef ACE_UPIPE_STREAM_H
 #define ACE_UPIPE_STREAM_H
 
 #include "ace/Stream.h"
diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h
index 59ba69b971d..cdf95dff8a0 100644
--- a/ace/WFMO_Reactor.h
+++ b/ace/WFMO_Reactor.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_WFMO_REACTOR_H)
+#ifndef ACE_WFMO_REACTOR_H
 #define ACE_WFMO_REACTOR_H
 
 #include "ace/Signal.h"
diff --git a/ace/XtReactor.h b/ace/XtReactor.h
index acc0735727f..7cf4f9fe0dd 100644
--- a/ace/XtReactor.h
+++ b/ace/XtReactor.h
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_XTREACTOR_H)
+#ifndef ACE_XTREACTOR_H
 #define ACE_XTREACTOR_H
 
 #include "ace/Select_Reactor.h"
diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h
index 1ec90feeca5..12588834eb2 100644
--- a/ace/config-WinCE.h
+++ b/ace/config-WinCE.h
@@ -1,6 +1,6 @@
 // $Id$
 
-#if ! defined (ACE_CONFIG_WINCE_H)
+#ifndef ACE_CONFIG_WINCE_H
 #define ACE_CONFIG_WINCE_H
 
 // Only DLL version is supported on CE.
@@ -43,7 +43,7 @@
 #define ACE_LACKS_INLINE_FUNCTIONS
 #endif /* SH3 && _DEBUG */
 
-#if !defined (ACE_DEFAULT_SERVER_HOST)
+#ifndef ACE_DEFAULT_SERVER_HOST
 # define ACE_DEFAULT_SERVER_HOST L"localhost"
 #endif /* ACE_DEFAULT_SERVER_HOST */
 
diff --git a/ace/config-aix-3.2.5.h b/ace/config-aix-3.2.5.h
index 9090292445f..49438015dda 100644
--- a/ace/config-aix-3.2.5.h
+++ b/ace/config-aix-3.2.5.h
@@ -4,6 +4,9 @@
 // The following configuration file is designed to work for AIX 3.2.5
 // with xlC.  Thanks to Bob Olson <olson@mcs.anl.gov> for this.
 
+#ifndef ACE_CONFIG_H
+#define ACE_CONFIG_H
+
 /*#define ACE_HAS_PTHREADS*/
 
 #define MAXNAMELEN 1024
@@ -39,3 +42,5 @@
 
 // Platform supports STREAMS.
 /*#define ACE_HAS_STREAMS*/
+
+#endif /* ACE_CONFIG_H */
diff --git a/ace/config-aix-4.1.x.h b/ace/config-aix-4.1.x.h
index b35358dd169..8827e54abf3 100644
--- a/ace/config-aix-4.1.x.h
+++ b/ace/config-aix-4.1.x.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for OS
 // platforms running AIX 4.1.x using the IBM C++ compiler.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 // Compiling for AIX.
diff --git a/ace/config-aix-4.2.x.h b/ace/config-aix-4.2.x.h
index da4be30107e..eaffcd8bbf3 100644
--- a/ace/config-aix-4.2.x.h
+++ b/ace/config-aix-4.2.x.h
@@ -5,7 +5,7 @@
 // platforms running AIX 4.2.x using the IBM C++ compiler (xlC) or
 // g++/egcs.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #if defined (__xlC__)
diff --git a/ace/config-chorus.h b/ace/config-chorus.h
index f3fa85f382a..bb570909967 100644
--- a/ace/config-chorus.h
+++ b/ace/config-chorus.h
@@ -7,7 +7,7 @@
 //   * GreenHills
 // It uses the Chorus POSIX threads interface.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #if !defined (__ACE_INLINE__)
diff --git a/ace/config-cygwin32-common.h b/ace/config-cygwin32-common.h
index 3c0906ecd7a..df23cb3647b 100644
--- a/ace/config-cygwin32-common.h
+++ b/ace/config-cygwin32-common.h
@@ -7,7 +7,7 @@
 // architecture, compiler (g++ or egcs), and libc (libc5 or glibc),
 // and configures based on those.
 
-#if !defined (ACE_CYGWIN32_COMMON_H)
+#ifndef ACE_CYGWIN32_COMMON_H
 #define ACE_CYGWIN32_COMMON_H
 #define CYGWIN32
 #define ACE_LACKS_UNIX_DOMAIN_SOCKETS
diff --git a/ace/config-cygwin32.h b/ace/config-cygwin32.h
index ae4efc440e1..04c26e7a17d 100644
--- a/ace/config-cygwin32.h
+++ b/ace/config-cygwin32.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for Linux
 // platforms using GNU C++.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #include "ace/config-cygwin32-common.h"
diff --git a/ace/config-dgux-4.11-epc.h b/ace/config-dgux-4.11-epc.h
index 7ef820940d5..4fd4ae3f3fe 100644
--- a/ace/config-dgux-4.11-epc.h
+++ b/ace/config-dgux-4.11-epc.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for DG/UX
 // 4.11 platforms using the EPC compiler.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 // Platform requires (struct sockaddr *) for msg_name field of struct
diff --git a/ace/config-dgux-4.x-ghs.h b/ace/config-dgux-4.x-ghs.h
index 538096ac92e..51d424d2ca3 100644
--- a/ace/config-dgux-4.x-ghs.h
+++ b/ace/config-dgux-4.x-ghs.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for DG/UX
 // 4.x platforms using the Green Hills Multi C++ compiler.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 // Static objects do not get initialized correctly, so this is needed.
diff --git a/ace/config-freebsd-pthread.h b/ace/config-freebsd-pthread.h
index 8a8f57da110..5f3aa909728 100644
--- a/ace/config-freebsd-pthread.h
+++ b/ace/config-freebsd-pthread.h
@@ -6,7 +6,7 @@
 
 // Notice that the threaded version of ACE is only supported for -current.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
diff --git a/ace/config-freebsd.h b/ace/config-freebsd.h
index a61424e57b8..d63a732c0e3 100644
--- a/ace/config-freebsd.h
+++ b/ace/config-freebsd.h
@@ -6,7 +6,7 @@
 // The following configuration file is designed to work for FreeBSD
 // platforms using GNU C++ but without the POSIX (pthread) threads package
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
diff --git a/ace/config-fsu-pthread.h b/ace/config-fsu-pthread.h
index 3b06089d813..62400b91f57 100644
--- a/ace/config-fsu-pthread.h
+++ b/ace/config-fsu-pthread.h
@@ -1,6 +1,6 @@
 // $Id$
 
-#if !defined (ACE_CONFIG_FSU_PTHREAD_H)
+#ifndef ACE_CONFIG_FSU_PTHREAD_H
 #define ACE_CONFIG_FSU_PTHREAD_H
 
 #define ACE_LACKS_CONST_TIMESPEC_PTR
diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h
index 0b3983b7a29..b29eea13e25 100644
--- a/ace/config-g++-common.h
+++ b/ace/config-g++-common.h
@@ -5,7 +5,7 @@
 // specific configuration file.  It provides config information common
 // to all g++ platforms, including egcs.
 
-#if !defined (ACE_GNUG_COMMON_H)
+#ifndef ACE_GNUG_COMMON_H
 #define ACE_GNUG_COMMON_H
 
 #if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 8)
diff --git a/ace/config-hpux-10.x-g++.h b/ace/config-hpux-10.x-g++.h
index 3a23357cd39..166e2124551 100644
--- a/ace/config-hpux-10.x-g++.h
+++ b/ace/config-hpux-10.x-g++.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for HP
 // platforms running HP/UX 10.x using G++.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #include "ace/config-g++-common.h"
diff --git a/ace/config-hpux-10.x-hpc++.h b/ace/config-hpux-10.x-hpc++.h
index 3cea6ab425f..e8d38b8e35f 100644
--- a/ace/config-hpux-10.x-hpc++.h
+++ b/ace/config-hpux-10.x-hpc++.h
@@ -6,7 +6,7 @@
 // This file contains compiler-specific settings, and uses the common
 // HP-UX file (config-hpux-10.x.h) for the platform information.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 // There are 2 compiler-specific sections, plus a 3rd for common to both.
diff --git a/ace/config-hpux-10.x.h b/ace/config-hpux-10.x.h
index 784d830d877..9d1714a895f 100644
--- a/ace/config-hpux-10.x.h
+++ b/ace/config-hpux-10.x.h
@@ -6,7 +6,7 @@
 // needed for HP-UX 10.x itself.  The compiler-specific information is in
 // config-hpux-10.x-<compiler>.h - they include this file.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #error "You need to use a compiler-specific .h file - they include this file"
 #endif
 
diff --git a/ace/config-hpux-11.x-hpc++.h b/ace/config-hpux-11.x-hpc++.h
index 61ed4a67538..4f887da00cd 100644
--- a/ace/config-hpux-11.x-hpc++.h
+++ b/ace/config-hpux-11.x-hpc++.h
@@ -10,7 +10,7 @@
 // support 64-bit or kernel threads.  So, though this file has the C++ info
 // in it, it's copied from the 10.x file and hasn't been verified.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 // There are 2 compiler-specific sections, plus a 3rd for common to both.
diff --git a/ace/config-hpux-9.x-orbix.h b/ace/config-hpux-9.x-orbix.h
index 35fc136edc2..d2f5ee56993 100644
--- a/ace/config-hpux-9.x-orbix.h
+++ b/ace/config-hpux-9.x-orbix.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for HP
 // platforms running HP/UX 9.x.  Dave added Orbix stuff
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 // Compiling for HPUX.
diff --git a/ace/config-hpux-9.x.h b/ace/config-hpux-9.x.h
index c155b89c1e9..e1f8e0168bc 100644
--- a/ace/config-hpux-9.x.h
+++ b/ace/config-hpux-9.x.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work
 // for HP platforms running HP/UX 9.x.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 // Compiling for HPUX.
diff --git a/ace/config-hpux11.h b/ace/config-hpux11.h
index ef2259b7ca2..adc08e35a7e 100644
--- a/ace/config-hpux11.h
+++ b/ace/config-hpux11.h
@@ -6,7 +6,7 @@
 // needed for HP-UX 11.x itself.  The compiler-specific information is in
 // config-hpux-11.x-<compiler>.h - they include this file.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #error "You need to use a compiler-specific .h file - they include this file"
 #endif
 
diff --git a/ace/config-irix5.2.h b/ace/config-irix5.2.h
index 274d9564d8d..b97fcaae624 100644
--- a/ace/config-irix5.2.h
+++ b/ace/config-irix5.2.h
@@ -5,7 +5,7 @@
 // Indigo2EX running Irix 5.2 platform using the gcc v2.6.x compiler
 // and libg++ v2.6.x.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 // Platform supports STREAM pipes (note that this is disabled by
diff --git a/ace/config-irix5.3-g++.h b/ace/config-irix5.3-g++.h
index 3311fa16e0a..f47390785ed 100644
--- a/ace/config-irix5.3-g++.h
+++ b/ace/config-irix5.3-g++.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for the SGI
 // Indigo2EX running Irix 5.3 platform using the GNU C++ Compiler
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #include "ace/config-g++-common.h"
diff --git a/ace/config-irix5.3-sgic++.h b/ace/config-irix5.3-sgic++.h
index 9a4df6a9389..a4d0efd74a0 100644
--- a/ace/config-irix5.3-sgic++.h
+++ b/ace/config-irix5.3-sgic++.h
@@ -5,7 +5,7 @@
 // for the SGI Indigo2EX running Irix 5.3 platform using 
 // the SGI C++ Compiler.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #define IRIX5
diff --git a/ace/config-irix6.x-g++.h b/ace/config-irix6.x-g++.h
index ac716212894..1eb008fca6e 100644
--- a/ace/config-irix6.x-g++.h
+++ b/ace/config-irix6.x-g++.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for the SGI
 // Indigo2EX running Irix 6.2 platform using the GNU C++ Compiler
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #include "ace/config-g++-common.h"
diff --git a/ace/config-irix6.x-sgic++-nothreads.h b/ace/config-irix6.x-sgic++-nothreads.h
index a2da083d00e..a87f057b16a 100644
--- a/ace/config-irix6.x-sgic++-nothreads.h
+++ b/ace/config-irix6.x-sgic++-nothreads.h
@@ -18,7 +18,7 @@
 
 // Since this files gets included from config-irix6.x-sgic++.h we
 // cannot use ACE_CONFIG_H here.
-#if !defined (ACE_CONFIG_IRIX6X_NTHR_H)
+#ifndef ACE_CONFIG_IRIX6X_NTHR_H
 #define ACE_CONFIG_IRIX6X_NTHR_H
 
 // Include this file to set the _MIPS_SIM*ABI* macros.
diff --git a/ace/config-irix6.x-sgic++.h b/ace/config-irix6.x-sgic++.h
index 442197f4279..3938e9f738b 100644
--- a/ace/config-irix6.x-sgic++.h
+++ b/ace/config-irix6.x-sgic++.h
@@ -4,7 +4,7 @@
 // Use this file for IRIX 6.[234] if you have the pthreads patches
 // installed.
 
-#if !defined (ACE_CONFIG_IRIX6X_H)
+#ifndef ACE_CONFIG_IRIX6X_H
 #define ACE_CONFIG_IRIX6X_H
 
 // Include basic (non-threaded) configuration
diff --git a/ace/config-kcc-common.h b/ace/config-kcc-common.h
index 67b978f36de..9f79ef66482 100644
--- a/ace/config-kcc-common.h
+++ b/ace/config-kcc-common.h
@@ -21,7 +21,7 @@
 //    breaksw
 //
 
-#if !defined (ACE_KCC_COMMON_H)
+#ifndef ACE_KCC_COMMON_H
 #define ACE_KCC_COMMON_H
 
 #if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE)
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h
index 78f164e4cdf..6dc4157a270 100644
--- a/ace/config-linux-common.h
+++ b/ace/config-linux-common.h
@@ -7,7 +7,7 @@
 // architecture, compiler (g++ or egcs), and libc (libc5 or glibc),
 // and configures based on those.
 
-#if !defined (ACE_LINUX_COMMON_H)
+#ifndef ACE_LINUX_COMMON_H
 #define ACE_LINUX_COMMON_H
 
 #define ACE_HAS_BYTESEX_H
diff --git a/ace/config-linux-lxpthreads.h b/ace/config-linux-lxpthreads.h
index 14a4620e2df..65e64591628 100644
--- a/ace/config-linux-lxpthreads.h
+++ b/ace/config-linux-lxpthreads.h
@@ -25,7 +25,7 @@
 	(They were a little out of date when I last was there
 	however.) */
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #include "ace/config-linux-common.h"
diff --git a/ace/config-linux-pthread.h b/ace/config-linux-pthread.h
index 4c592b26ba2..8fc27ea8eef 100644
--- a/ace/config-linux-pthread.h
+++ b/ace/config-linux-pthread.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for Linux
 // platforms using GNU C++ and the MIT threads package.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #include "ace/config-linux-common.h"
diff --git a/ace/config-linux.h b/ace/config-linux.h
index 2ff1d7a8906..b73a53589e1 100644
--- a/ace/config-linux.h
+++ b/ace/config-linux.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for Linux
 // platforms using GNU C++.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #include "ace/config-linux-common.h"
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index 4ea1b94dbc4..8f3b87a1ee7 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -3,7 +3,7 @@
 // The following configuration file is designed to work for LynxOS 2.50
 // platforms using the GNU g++ compiler (version 2.7.2 or later).
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
diff --git a/ace/config-m88k.h b/ace/config-m88k.h
index 9f8ca70f6a0..22b88e81b76 100644
--- a/ace/config-m88k.h
+++ b/ace/config-m88k.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for Motorola
 // 88k SVR4 platforms using pthreads from Florida State (ACE_HAS_FSU_PTHREADS).
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
diff --git a/ace/config-mit-pthread.h b/ace/config-mit-pthread.h
index 010b8f7c0ca..f3341669a74 100644
--- a/ace/config-mit-pthread.h
+++ b/ace/config-mit-pthread.h
@@ -1,6 +1,6 @@
 // $Id$
 
-#if !defined (ACE_CONFIG_MIT_PTHREAD_H)
+#ifndef ACE_CONFIG_MIT_PTHREAD_H
 #define ACE_CONFIG_MIT_PTHREAD_H
 
 // Platform uses int for select() rather than fd_set.
diff --git a/ace/config-mvs.h b/ace/config-mvs.h
index db047e88826..8c9057d2f79 100644
--- a/ace/config-mvs.h
+++ b/ace/config-mvs.h
@@ -3,7 +3,7 @@
 
 // Config file for MVS with OpenEdition
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 // The following #defines are hacks to get around things
diff --git a/ace/config-netbsd.h b/ace/config-netbsd.h
index cf2944dcbc1..ff9f00717f8 100644
--- a/ace/config-netbsd.h
+++ b/ace/config-netbsd.h
@@ -6,7 +6,7 @@
 // The following configuration file is designed to work for NetBSD
 // platforms using GNU g++.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
diff --git a/ace/config-osf1-3.2.h b/ace/config-osf1-3.2.h
index a7237d45846..a7fcfc04d9f 100644
--- a/ace/config-osf1-3.2.h
+++ b/ace/config-osf1-3.2.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for OSF1 3.2
 // platforms with the DEC 5.1 C++ compiler.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #define ACE_LACKS_SETSCHED
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index cffe7f15d3d..b39ad968310 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -10,7 +10,7 @@
 // the cxx -pthread or -threads option was specified.  By 4.0a the version
 // is meant that is called "V4.0 464" by uname -a.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #if !defined (__ACE_INLINE__)
diff --git a/ace/config-psos-diab.h b/ace/config-psos-diab.h
index 8ff98c7635b..1817db629a7 100644
--- a/ace/config-psos-diab.h
+++ b/ace/config-psos-diab.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for pSOSystem V2.2.1,
 // using the Diab Data D-C++ 4.2 p3 compiler (or a later version)
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 // #if ! defined (__ACE_INLINE__)
diff --git a/ace/config-psos-tm.h b/ace/config-psos-tm.h
index e28ddf45022..470d78d15b7 100644
--- a/ace/config-psos-tm.h
+++ b/ace/config-psos-tm.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for pSOSystem V2.2.1,
 // using the Diab Data D-C++ 4.1a compiler
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 // #if ! defined (__ACE_INLINE__)
diff --git a/ace/config-psosim-g++.h b/ace/config-psosim-g++.h
index 95d4979d7d1..4605aab9f70 100644
--- a/ace/config-psosim-g++.h
+++ b/ace/config-psosim-g++.h
@@ -34,7 +34,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 ////////////////////////////////////////////////////////////////
diff --git a/ace/config-sco-4.2-nothread.h b/ace/config-sco-4.2-nothread.h
index 467164c0040..d48a42b1c7e 100644
--- a/ace/config-sco-4.2-nothread.h
+++ b/ace/config-sco-4.2-nothread.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for SCO UNIX
 // version 4.2 without threads.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #if defined (__GNUG__)
diff --git a/ace/config-sco-5.0.0-CC-fsu-pthread.h b/ace/config-sco-5.0.0-CC-fsu-pthread.h
index 0a838351c93..628ae85ef7c 100644
--- a/ace/config-sco-5.0.0-CC-fsu-pthread.h
+++ b/ace/config-sco-5.0.0-CC-fsu-pthread.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #define ACE_HAS_BROKEN_ENUMS
diff --git a/ace/config-sco-5.0.0-fsu-pthread.h b/ace/config-sco-5.0.0-fsu-pthread.h
index 73052e4a5d9..17d8d49a1e5 100644
--- a/ace/config-sco-5.0.0-fsu-pthread.h
+++ b/ace/config-sco-5.0.0-fsu-pthread.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #include "ace/config-g++-common.h"
diff --git a/ace/config-sco-5.0.0-mit-pthread.h b/ace/config-sco-5.0.0-mit-pthread.h
index f5548091083..17924ddc8e8 100644
--- a/ace/config-sco-5.0.0-mit-pthread.h
+++ b/ace/config-sco-5.0.0-mit-pthread.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for SCO UNIX
 // version 5.0 with MIT pthreads.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #if !defined (__ACE_INLINE__)
diff --git a/ace/config-sco-5.0.0-nothread.h b/ace/config-sco-5.0.0-nothread.h
index fd16c2e655f..8ca6e712291 100644
--- a/ace/config-sco-5.0.0-nothread.h
+++ b/ace/config-sco-5.0.0-nothread.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #include "ace/config-g++-common.h"
diff --git a/ace/config-sco-5.0.0.h b/ace/config-sco-5.0.0.h
index 7c44835a7d1..e489e6b0cdb 100644
--- a/ace/config-sco-5.0.0.h
+++ b/ace/config-sco-5.0.0.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if !defined (ACE_CONFIG_SCO_5_0_0_H)
+#ifndef ACE_CONFIG_SCO_5_0_0_H
 #define ACE_CONFIG_SCO_5_0_0_H
 
 // Compiling for SCO.
diff --git a/ace/config-sunos4-g++.h b/ace/config-sunos4-g++.h
index 6a8fc87d27f..96678db4d3a 100644
--- a/ace/config-sunos4-g++.h
+++ b/ace/config-sunos4-g++.h
@@ -3,7 +3,7 @@
 
 // for SunOS4 platforms using the GNU g++ compiler
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
diff --git a/ace/config-sunos4-lucid3.2.h b/ace/config-sunos4-lucid3.2.h
index b934bdfd3fc..01b0ce1684f 100644
--- a/ace/config-sunos4-lucid3.2.h
+++ b/ace/config-sunos4-lucid3.2.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work
 // for SunOS4 platforms using the Lucid 3.2 compiler.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #define ACE_LACKS_GETPGID
diff --git a/ace/config-sunos4-sun3.x.h b/ace/config-sunos4-sun3.x.h
index e3aa932be7a..f57c51e447c 100644
--- a/ace/config-sunos4-sun3.x.h
+++ b/ace/config-sunos4-sun3.x.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for SunOS4
 // platforms using the SunC++ 3.0.x compiler.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 
 #define ACE_LACKS_GETPGID
 // Optimize ACE_Handle_Set for select().
diff --git a/ace/config-sunos4-sun4.1.4.h b/ace/config-sunos4-sun4.1.4.h
index 844f7a91024..1ba6a60fe44 100644
--- a/ace/config-sunos4-sun4.1.4.h
+++ b/ace/config-sunos4-sun4.1.4.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for SunOS4.1.4
 // platforms using the SunC++ 4.x compiler.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #define ACE_LACKS_GETPGID
diff --git a/ace/config-sunos4-sun4.x-orbix.h b/ace/config-sunos4-sun4.x-orbix.h
index 39ec76243b8..eb060c6902c 100644
--- a/ace/config-sunos4-sun4.x-orbix.h
+++ b/ace/config-sunos4-sun4.x-orbix.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work
 // for SunOS4 platforms using the SunC++ 4.x compiler.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #define ACE_LACKS_GETPGID
diff --git a/ace/config-sunos4-sun4.x.h b/ace/config-sunos4-sun4.x.h
index 7386292128a..e21b08bb893 100644
--- a/ace/config-sunos4-sun4.x.h
+++ b/ace/config-sunos4-sun4.x.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work
 // for SunOS4 platforms using the SunC++ 4.x compiler.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #define ACE_LACKS_SYSTIME_H
diff --git a/ace/config-sunos5.4-centerline-2.x.h b/ace/config-sunos5.4-centerline-2.x.h
index a01db680fc1..0abf2e31ce5 100644
--- a/ace/config-sunos5.4-centerline-2.x.h
+++ b/ace/config-sunos5.4-centerline-2.x.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for SunOS 5.4
 // platforms using the Centerline 2.x C++ compiler.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
diff --git a/ace/config-sunos5.4-g++.h b/ace/config-sunos5.4-g++.h
index bacd40eda3f..ed07a93c801 100644
--- a/ace/config-sunos5.4-g++.h
+++ b/ace/config-sunos5.4-g++.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for SunOS 5.4
 // platforms using the GNU g++ compiler.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
diff --git a/ace/config-sunos5.4-sunc++-4.x-orbix.h b/ace/config-sunos5.4-sunc++-4.x-orbix.h
index a613aefeed9..67a3b5c4fa0 100644
--- a/ace/config-sunos5.4-sunc++-4.x-orbix.h
+++ b/ace/config-sunos5.4-sunc++-4.x-orbix.h
@@ -5,7 +5,7 @@
 // platforms using the SunC++ 4.0.x compiler.  This works with the
 // MT-Orbix CORBA IDL compiler.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
diff --git a/ace/config-sunos5.4-sunc++-4.x.h b/ace/config-sunos5.4-sunc++-4.x.h
index dd7633bdfc9..a3e715b6fe8 100644
--- a/ace/config-sunos5.4-sunc++-4.x.h
+++ b/ace/config-sunos5.4-sunc++-4.x.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for SunOS 5.4
 // platforms using the SunC++ 4.0.x compiler.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index 8c2723fe501..a65510a5c8a 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -5,7 +5,7 @@
 // using the SunC++ 4.x or g++ (version 2.7.2 or later) compilers.  If
 // using SunC++, it's best to use version 4.2, patched as noted below.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 // Compiler version-specific settings:
diff --git a/ace/config-sunos5.6.h b/ace/config-sunos5.6.h
index d9b193afc57..3f393883a7c 100644
--- a/ace/config-sunos5.6.h
+++ b/ace/config-sunos5.6.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work for SunOS 5.6
 // platforms using the SunC++ 4.x or g++ compilers.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 
 // ACE_CONFIG_H is defined by one of the following #included headers.
 
diff --git a/ace/config-sunos5.x-sunc++-4.x-orbix.h b/ace/config-sunos5.x-sunc++-4.x-orbix.h
index 569fba8f078..350624e7e6b 100644
--- a/ace/config-sunos5.x-sunc++-4.x-orbix.h
+++ b/ace/config-sunos5.x-sunc++-4.x-orbix.h
@@ -5,11 +5,11 @@
 // 5.[56] platforms using the SunC++ 4.x compiler. This works with the
 // Orbix 2.x CORBA IDL compiler.
 
-#include "ace/config-sunos5.5-sunc++-4.x.h"
-
-#if !defined (ACE_CONFIG_ORBIX_H)
+#ifndef ACE_CONFIG_ORBIX_H
 #define ACE_CONFIG_ORBIX_H
 
+#include "ace/config-sunos5.5-sunc++-4.x.h"
+
 // Platform contains the Orbix CORBA implementation.
 #define ACE_HAS_ORBIX 1
 
diff --git a/ace/config-tandem.h b/ace/config-tandem.h
index 8098a26fb72..a7fe50c76ff 100644
--- a/ace/config-tandem.h
+++ b/ace/config-tandem.h
@@ -15,7 +15,7 @@
 // So this config is done to get things to start to work it isn't finished.
 // Janne (Jan.Perman@osd.Ericsson.se)
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
diff --git a/ace/config-unixware-2.01-g++.h b/ace/config-unixware-2.01-g++.h
index 366fb64f38a..3ca397b6fcf 100644
--- a/ace/config-unixware-2.01-g++.h
+++ b/ace/config-unixware-2.01-g++.h
@@ -3,7 +3,7 @@
 
 // The following configuration file is designed to work
 // for Unixware platforms running UnixWare 2.01.
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 // See README for what the ACE_HAS... and ACE_LACKS... macros mean
diff --git a/ace/config-unixware-2.1.2-g++.h b/ace/config-unixware-2.1.2-g++.h
index c18223c649e..a1c774118a7 100644
--- a/ace/config-unixware-2.1.2-g++.h
+++ b/ace/config-unixware-2.1.2-g++.h
@@ -4,7 +4,7 @@
 // The following configuration file is designed to work
 // for Unixware platforms running UnixWare 2.1.2 and gcc version 2.7.2.2
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 // See README for what the ACE_HAS... and ACE_LACKS... macros mean
diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h
index 5c6989ac8de..669bbffe9f0 100644
--- a/ace/config-vxworks5.x.h
+++ b/ace/config-vxworks5.x.h
@@ -6,7 +6,7 @@
 // 1) The GNU/Cygnus g++ compiler that is shipped with Tornado 1.0.1.
 // 2) The GreenHills 1.8.8 (not 1.8.7!!!!) compiler.
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #if ! defined (__ACE_INLINE__)
diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h
index 1bb9ba50b67..c5ebad7d8c1 100644
--- a/ace/config-win32-borland.h
+++ b/ace/config-win32-borland.h
@@ -4,7 +4,7 @@
 // The following configuration file contains the defines
 // common to all Borland compilers.
 
-#if !defined (ACE_WIN32_BORLAND_H)
+#ifndef ACE_WIN32_BORLAND_H
 #define ACE_WIN32_BORLAND_H
 
 #if defined(__BORLANDC__)
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index 4ffa57816c7..f7a54c77b46 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -4,7 +4,7 @@
 // The following configuration file contains the defines
 // common to all Win32/MSVC/MFC combinations.
 
-#if !defined (ACE_WIN32_COMMON_H)
+#ifndef ACE_WIN32_COMMON_H
 #define ACE_WIN32_COMMON_H
 
 // ---------------- platform features or lack of them -------------
diff --git a/ace/config-win32.h b/ace/config-win32.h
index 1fc5e7e2cda..3307cf1bf5b 100644
--- a/ace/config-win32.h
+++ b/ace/config-win32.h
@@ -5,7 +5,7 @@
 // Windows NT 3.51 and Windows NT 4.0 platforms using the Microsoft Visual C++
 // compilers 2.0, 4.0, 4.1, 4.2 and 5.0
 
-#if !defined (ACE_CONFIG_H)
+#ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
 #if defined (ACE_HAS_WINCE) || defined (UNDER_CE)
diff --git a/ace/gethrtime.cpp b/ace/gethrtime.cpp
index f6e0d6f6118..518d5172992 100644
--- a/ace/gethrtime.cpp
+++ b/ace/gethrtime.cpp
@@ -2,8 +2,8 @@
 //
 // Build this file with g++.  It can be linked in to a ACE application
 // that was compiled with GreenHills.  It wouldn't be necessary if I
-// knew a way to correctly move values from registers to a 64-bit variable
-// in GHS asm code.  That's easy with g++ asm.
+// knew a way to correctly move values from registers to a 64-bit
+// variable in GHS asm code.  That's easy with g++ asm.
 
 #include "ace/OS.h"
 
@@ -11,7 +11,7 @@ ACE_RCSID(ace, gethrtime, "$Id$")
 
 extern "C"
 ACE_hrtime_t
-ACE_gethrtime ()
+ACE_gethrtime (void)
 {
 #if defined (ACE_HAS_PENTIUM)
   // ACE_TRACE ("ACE_gethrtime");
@@ -22,11 +22,11 @@ ACE_gethrtime ()
   ACE_hrtime_t now;
 #endif /* ! ACE_LACKS_LONGLONG_T */
 
-  // See comments about the RDTSC Pentium instruction for the ACE_WIN32
-  // version of ACE_OS::gethrtime () in ace/OS.i.
+  // See comments about the RDTSC Pentium instruction for the
+  // ACE_WIN32 version of ACE_OS::gethrtime () in ace/OS.i.
   //
-  // Read the high-res tick counter directly into memory variable "now".
-  // The A constraint signifies a 64-bit int.
+  // Read the high-res tick counter directly into memory variable
+  // "now".  The A constraint signifies a 64-bit int.
 #if defined (__GNUG__)
   asm volatile ("rdtsc" : "=A" (now) : : "memory");
 // #elif defined (ghs)
diff --git a/ace/inc_user_config.h b/ace/inc_user_config.h
index 1eae8695807..dcc36f3e6d2 100644
--- a/ace/inc_user_config.h
+++ b/ace/inc_user_config.h
@@ -4,7 +4,7 @@
 // Use this file to include config.h instead of including
 // config.h directly.
 
-#if !defined (ACE_INC_USER_CONFIG_H)
+#ifndef ACE_INC_USER_CONFIG_H
 #define ACE_INC_USER_CONFIG_H
 
 #include "ace/config.h"
diff --git a/ace/iosfwd.h b/ace/iosfwd.h
index 789cdbb2a53..4d52b28e4ba 100644
--- a/ace/iosfwd.h
+++ b/ace/iosfwd.h
@@ -24,7 +24,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_IOSFWD_H)
+#ifndef ACE_IOSFWD_H
 #define ACE_IOSFWD_H
 
 #include "ace/inc_user_config.h"
diff --git a/ace/streams.h b/ace/streams.h
index bf585a7cfbc..da1fab22001 100644
--- a/ace/streams.h
+++ b/ace/streams.h
@@ -21,7 +21,7 @@
 //
 // ============================================================================
 
-#if !defined (ACE_STREAMS_H)
+#ifndef ACE_STREAMS_H
 #define ACE_STREAMS_H
 
 #include "ace/inc_user_config.h"