5 files changed, 14 insertions, 4 deletions
diff --git a/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h b/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h
index 73c3195c4fe..8198739eff4 100644
--- a/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h
+++ b/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h
@@ -13,7 +13,7 @@
 //
 // ============================================================================
 
-#if !defined (_NESTEDUPCALLS_I_H)
+#ifndef _NESTEDUPCALLS_I_H
 #define _NESTEDUPCALLS_I_H
 
 //#include "cubitS.h"
diff --git a/TAO/tests/NestedUpcall/Reactor/client.h b/TAO/tests/NestedUpcall/Reactor/client.h
index 706a4d9105a..5e2f2fbc187 100644
--- a/TAO/tests/NestedUpcall/Reactor/client.h
+++ b/TAO/tests/NestedUpcall/Reactor/client.h
@@ -18,6 +18,11 @@
 // ============================================================================
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/corba.h"
 #include "reactor_i.h"
 #include "ace/Auto_Ptr.h"
diff --git a/TAO/tests/NestedUpcall/Reactor/eh_i.h b/TAO/tests/NestedUpcall/Reactor/eh_i.h
index c8443da0bcb..c3b0a729696 100644
--- a/TAO/tests/NestedUpcall/Reactor/eh_i.h
+++ b/TAO/tests/NestedUpcall/Reactor/eh_i.h
@@ -1,7 +1,7 @@
 // -*- c++ -*-
 // $Id$
 
-#if !defined (EVENTHANDLER_I_H)
+#ifndef EVENTHANDLER_I_H
 #  define EVENTHANDLER_I_H
 
 #include "ReactorS.h"
diff --git a/TAO/tests/NestedUpcall/Reactor/reactor_i.h b/TAO/tests/NestedUpcall/Reactor/reactor_i.h
index 3d4ede734c9..bc7b11c391a 100644
--- a/TAO/tests/NestedUpcall/Reactor/reactor_i.h
+++ b/TAO/tests/NestedUpcall/Reactor/reactor_i.h
@@ -1,7 +1,7 @@
 // -*- c++ -*-
 // $Id$
 
-#if !defined (REACTOR_I_H)
+#ifndef REACTOR_I_H
 #  define REACTOR_I_H
 
 #include "ReactorS.h"
diff --git a/TAO/tests/NestedUpcall/Reactor/server.h b/TAO/tests/NestedUpcall/Reactor/server.h
index cb02f84b701..73acff90fcf 100644
--- a/TAO/tests/NestedUpcall/Reactor/server.h
+++ b/TAO/tests/NestedUpcall/Reactor/server.h
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (_NUC_SERVER_H)
+#ifndef _NUC_SERVER_H
 #define _NUC_SERVER_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Log_Msg.h"
 #include "tao/TAO.h"
 #include "orbsvcs/CosNamingC.h"