Undo pragma-once-in-header enhancement

117 files changed, 469 insertions, 121 deletions

diff --git a/cpp/include/Freeze/Freeze.h b/cpp/include/Freeze/Freeze.h
index 9165f30d948..1e1c6df5f32 100644
--- a/cpp/include/Freeze/Freeze.h
+++ b/cpp/include/Freeze/Freeze.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef FREEZE_FREEZE_H
+#define FREEZE_FREEZE_H
 
 #include <Freeze/Initialize.h>
 #include <Freeze/BackgroundSaveEvictor.h>
@@ -16,3 +17,4 @@
 #include <Freeze/TransactionHolder.h>
 #include <Freeze/Catalog.h>
 
+#endif
diff --git a/cpp/include/Freeze/Index.h b/cpp/include/Freeze/Index.h
index cb05a198ec0..7c15bcad8c6 100644
--- a/cpp/include/Freeze/Index.h
+++ b/cpp/include/Freeze/Index.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef FREEZE_INDEX_H
+#define FREEZE_INDEX_H
 
 #include <Ice/Ice.h>
 #include <Freeze/DB.h>
@@ -55,3 +56,6 @@ private:
 
 typedef IceUtil::Handle<Index> IndexPtr;
 }
+
+#endif
+
diff --git a/cpp/include/Freeze/Initialize.h b/cpp/include/Freeze/Initialize.h
index a81407e23a2..6ea3278112f 100644
--- a/cpp/include/Freeze/Initialize.h
+++ b/cpp/include/Freeze/Initialize.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef FREEZE_INITIALIZE_H
+#define FREEZE_INITIALIZE_H
 
 #include <Ice/Ice.h>
 #include <Freeze/EvictorF.h>
@@ -99,3 +100,5 @@ typedef void (*FatalErrorCallback)(const BackgroundSaveEvictorPtr&, const Ice::C
 FREEZE_API FatalErrorCallback registerFatalErrorCallback(FatalErrorCallback);
 
 }
+
+#endif
diff --git a/cpp/include/Freeze/Map.h b/cpp/include/Freeze/Map.h
index bed7f7efad4..abd6912306f 100644
--- a/cpp/include/Freeze/Map.h
+++ b/cpp/include/Freeze/Map.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef FREEZE_MAP_H
+#define FREEZE_MAP_H
 
 #include <Ice/Ice.h>
 #include <iterator>
@@ -1160,5 +1161,7 @@ protected:
     Ice::EncodingVersion _encoding;
 };
 
-
 }
+
+#endif
+
diff --git a/cpp/include/Freeze/TransactionHolder.h b/cpp/include/Freeze/TransactionHolder.h
index d3fec8c675c..84e973150a2 100644
--- a/cpp/include/Freeze/TransactionHolder.h
+++ b/cpp/include/Freeze/TransactionHolder.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef FREEZE_TRANSACTION_HOLDER_H
+#define FREEZE_TRANSACTION_HOLDER_H
 
 #include <Freeze/Connection.h>
 #include <Freeze/Transaction.h>
@@ -43,3 +44,5 @@ private:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Glacier2/Application.h b/cpp/include/Glacier2/Application.h
index edbe14f31c6..6d2846e4443 100644
--- a/cpp/include/Glacier2/Application.h
+++ b/cpp/include/Glacier2/Application.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef GLACIER2_APPLICATION_H
+#define GLACIER2_APPLICATION_H
 
 #include <Ice/Application.h>
 
@@ -216,3 +217,5 @@ private:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Glacier2/Glacier2.h b/cpp/include/Glacier2/Glacier2.h
index f0490cdad44..a970ac4d11a 100644
--- a/cpp/include/Glacier2/Glacier2.h
+++ b/cpp/include/Glacier2/Glacier2.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
-
+#ifndef GLACIER2_H
+#define GLACIER2_H
 #include <IceUtil/Config.h>
 #include <Glacier2/Router.h>
 #include <Glacier2/Session.h>
@@ -17,3 +17,5 @@
 #   include <Glacier2/Application.h>
 #endif
 #include <Glacier2/SessionHelper.h>
+
+#endif
diff --git a/cpp/include/Glacier2/SessionHelper.h b/cpp/include/Glacier2/SessionHelper.h
index 41dac3a908e..687c680ce04 100644
--- a/cpp/include/Glacier2/SessionHelper.h
+++ b/cpp/include/Glacier2/SessionHelper.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef GLACIER2_SESSION_HELPER_H
+#define GLACIER2_SESSION_HELPER_H
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
@@ -111,3 +112,5 @@ private:
 typedef IceUtil::Handle<SessionFactoryHelper> SessionFactoryHelperPtr;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h
index d5d41de58e9..448c88eb97d 100644
--- a/cpp/include/Ice/Application.h
+++ b/cpp/include/Ice/Application.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_APPLICATION_H
+#define ICE_APPLICATION_H
 
 #include <Ice/Ice.h>
 
@@ -151,3 +152,5 @@ protected:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h
index be0fc033ef1..f9ab44f1049 100644
--- a/cpp/include/Ice/BasicStream.h
+++ b/cpp/include/Ice/BasicStream.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_BASIC_STREAM_H
+#define ICE_BASIC_STREAM_H
 
 #include <Ice/InstanceF.h>
 #include <Ice/ObjectF.h>
@@ -1134,3 +1135,5 @@ private:
 };
 
 } // End namespace IceInternal
+
+#endif
diff --git a/cpp/include/Ice/Buffer.h b/cpp/include/Ice/Buffer.h
index 8c1c4339023..37f69eb3725 100644
--- a/cpp/include/Ice/Buffer.h
+++ b/cpp/include/Ice/Buffer.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICEE_BUFFER_H
+#define ICEE_BUFFER_H
 
 #include <Ice/Config.h>
 
@@ -149,3 +150,5 @@ public:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Ice/CommunicatorAsync.h b/cpp/include/Ice/CommunicatorAsync.h
index cb7dfeb288c..9f0381a2b43 100644
--- a/cpp/include/Ice/CommunicatorAsync.h
+++ b/cpp/include/Ice/CommunicatorAsync.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_COMMUNICATOR_ASYNC_H
+#define ICE_COMMUNICATOR_ASYNC_H
 
 #include <Ice/Communicator.h>
 
@@ -140,3 +141,5 @@ newCallback_Communicator_flushBatchRequests(T* instance, void (T::*excb)(const :
 }
 
 }
+
+#endif
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h
index bb3231c3a76..5322bb31717 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/Config.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_CONFIG_H
+#define ICE_CONFIG_H
 
 #include <IceUtil/Config.h>
 
@@ -77,3 +78,5 @@ inline int getSystemErrno() { return errno; }
 #endif
 
 }
+
+#endif
diff --git a/cpp/include/Ice/ConnectionAsync.h b/cpp/include/Ice/ConnectionAsync.h
index 4a27138aa53..e374d859306 100644
--- a/cpp/include/Ice/ConnectionAsync.h
+++ b/cpp/include/Ice/ConnectionAsync.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_CONNECTION_ASYNC_H
+#define ICE_CONNECTION_ASYNC_H
 
 #include <Ice/Connection.h>
 
@@ -139,3 +140,5 @@ newCallback_Connection_flushBatchRequests(T* instance, void (T::*excb)(const ::I
 }
 
 }
+
+#endif
diff --git a/cpp/include/Ice/ConnectionFactoryF.h b/cpp/include/Ice/ConnectionFactoryF.h
index 8e2d62712c3..5a5b3c123a1 100644
--- a/cpp/include/Ice/ConnectionFactoryF.h
+++ b/cpp/include/Ice/ConnectionFactoryF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_CONNECTION_FACTORY_F_H
+#define ICE_CONNECTION_FACTORY_F_H
 
 #include <IceUtil/Shared.h>
 
@@ -25,3 +26,5 @@ ICE_API IceUtil::Shared* upCast(IncomingConnectionFactory*);
 typedef IceInternal::Handle<IncomingConnectionFactory> IncomingConnectionFactoryPtr;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/ConnectionIF.h b/cpp/include/Ice/ConnectionIF.h
index 114bc0f8a5f..2c3b922edaa 100644
--- a/cpp/include/Ice/ConnectionIF.h
+++ b/cpp/include/Ice/ConnectionIF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_CONNECTIONI_F_H
+#define ICE_CONNECTIONI_F_H
 
 #include <Ice/Handle.h>
 #include <Ice/LocalObject.h>
@@ -32,3 +33,5 @@ enum AsyncStatus
 };
 
 }
+
+#endif
diff --git a/cpp/include/Ice/ConnectionMonitorF.h b/cpp/include/Ice/ConnectionMonitorF.h
index 5c61810e5a5..ebf80a9f02c 100644
--- a/cpp/include/Ice/ConnectionMonitorF.h
+++ b/cpp/include/Ice/ConnectionMonitorF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_CONNECTION_MONITOR_F_H
+#define ICE_CONNECTION_MONITOR_F_H
 
 #include <IceUtil/Shared.h>
 
@@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(ConnectionMonitor*);
 typedef IceInternal::Handle<ConnectionMonitor> ConnectionMonitorPtr;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/Direct.h b/cpp/include/Ice/Direct.h
index fde47a9e6cc..90a8944689f 100644
--- a/cpp/include/Ice/Direct.h
+++ b/cpp/include/Ice/Direct.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_DIRECT_H
+#define ICE_DIRECT_H
 
 #include <Ice/ServantLocatorF.h>
 #include <Ice/ReferenceF.h>
@@ -54,3 +55,5 @@ private:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Ice/DispatchInterceptor.h b/cpp/include/Ice/DispatchInterceptor.h
index 0515161c9c5..1949e810983 100644
--- a/cpp/include/Ice/DispatchInterceptor.h
+++ b/cpp/include/Ice/DispatchInterceptor.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_DISPATCH_INTERCEPTOR_H
+#define ICE_DISPATCH_INTERCEPTOR_H
 
 #include <Ice/Object.h>
 
@@ -31,3 +32,5 @@ public:
 typedef IceInternal::Handle<DispatchInterceptor> DispatchInterceptorPtr;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/Dispatcher.h b/cpp/include/Ice/Dispatcher.h
index 5ad42625215..70a6436a72e 100644
--- a/cpp/include/Ice/Dispatcher.h
+++ b/cpp/include/Ice/Dispatcher.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_DISPATCHER_H
+#define ICE_DISPATCHER_H
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Shared.h>
@@ -73,4 +74,6 @@ newDispatcher(const ::std::function<void (const ::Ice::DispatcherCallPtr&, const
 }
 
 }
+
+#endif
 #endif
diff --git a/cpp/include/Ice/DynamicLibrary.h b/cpp/include/Ice/DynamicLibrary.h
index dd1aa9f9526..d499b4f7cdb 100644
--- a/cpp/include/Ice/DynamicLibrary.h
+++ b/cpp/include/Ice/DynamicLibrary.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_DYNAMIC_LIBRARY_H
+#define ICE_DYNAMIC_LIBRARY_H
 
 #include <Ice/DynamicLibraryF.h>
 #include <Ice/StringConverter.h>
@@ -103,3 +104,4 @@ private:
 
 }
 
+#endif
diff --git a/cpp/include/Ice/DynamicLibraryF.h b/cpp/include/Ice/DynamicLibraryF.h
index 184b15a8e57..32b9a01f8d1 100644
--- a/cpp/include/Ice/DynamicLibraryF.h
+++ b/cpp/include/Ice/DynamicLibraryF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_DYNAMIC_LIBRARY_F_H
+#define ICE_DYNAMIC_LIBRARY_F_H
 
 #include <IceUtil/Shared.h>
 
@@ -25,4 +26,4 @@ ICE_API IceUtil::Shared* upCast(DynamicLibraryList*);
 typedef Handle<DynamicLibraryList> DynamicLibraryListPtr;
 
 }
-
+#endif
diff --git a/cpp/include/Ice/EndpointFactory.h b/cpp/include/Ice/EndpointFactory.h
index 6f344587828..61734728d8c 100644
--- a/cpp/include/Ice/EndpointFactory.h
+++ b/cpp/include/Ice/EndpointFactory.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_ENDPOINT_FACTORY_H
+#define ICE_ENDPOINT_FACTORY_H
 
 #include <IceUtil/Shared.h>
 #include <Ice/EndpointIF.h>
@@ -37,3 +38,5 @@ protected:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Ice/EndpointFactoryF.h b/cpp/include/Ice/EndpointFactoryF.h
index dc8bbfdb72f..b5a03c4c35a 100644
--- a/cpp/include/Ice/EndpointFactoryF.h
+++ b/cpp/include/Ice/EndpointFactoryF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_ENDPOINT_FACTORY_F_H
+#define ICE_ENDPOINT_FACTORY_F_H
 
 #include <IceUtil/Shared.h>
 
@@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(EndpointFactory*);
 typedef Handle<EndpointFactory> EndpointFactoryPtr;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/EndpointIF.h b/cpp/include/Ice/EndpointIF.h
index d1da6324f2a..4e9c69d1b8b 100644
--- a/cpp/include/Ice/EndpointIF.h
+++ b/cpp/include/Ice/EndpointIF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_ENDPOINT_I_F_H
+#define ICE_ENDPOINT_I_F_H
 
 #include <Ice/Handle.h>
 #include <Ice/LocalObject.h>
@@ -24,3 +25,5 @@ ICE_API IceUtil::Shared* upCast(EndpointHostResolver*);
 typedef Handle<EndpointHostResolver> EndpointHostResolverPtr;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h
index 9ed187dae90..7d0d85656ea 100644
--- a/cpp/include/Ice/Exception.h
+++ b/cpp/include/Ice/Exception.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_EXCEPTION_H
+#define ICE_EXCEPTION_H
 
 #include <IceUtil/Exception.h>
 #include <Ice/Config.h>
@@ -98,3 +99,5 @@ ICE_API std::ostream& operator<<(std::ostream&, const SystemException&);
 #endif
 
 }
+
+#endif
diff --git a/cpp/include/Ice/FactoryTable.h b/cpp/include/Ice/FactoryTable.h
index fe71694cfb2..1350c39db14 100644
--- a/cpp/include/Ice/FactoryTable.h
+++ b/cpp/include/Ice/FactoryTable.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_FACTORYTABLE_H
+#define ICE_FACTORYTABLE_H
 
 #include <IceUtil/Mutex.h>
 #include <Ice/UserExceptionFactory.h>
@@ -44,3 +45,5 @@ private:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Ice/FactoryTableInit.h b/cpp/include/Ice/FactoryTableInit.h
index 09a18ee8429..2e793e0c980 100644
--- a/cpp/include/Ice/FactoryTableInit.h
+++ b/cpp/include/Ice/FactoryTableInit.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_FACTORYTABLEINIT_H
+#define ICE_FACTORYTABLEINIT_H
 
 #include <Ice/FactoryTable.h>
 
@@ -27,3 +28,5 @@ static FactoryTableInit factoryTableInitializer;    // Dummy variable to force i
 extern ICE_API FactoryTable* factoryTable;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/Functional.h b/cpp/include/Ice/Functional.h
index 28926302e9b..6349a1d371a 100644
--- a/cpp/include/Ice/Functional.h
+++ b/cpp/include/Ice/Functional.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_FUNCTIONAL_H
+#define ICE_FUNCTIONAL_H
 
 #include <IceUtil/Functional.h>
 #include <Ice/Handle.h>
@@ -133,3 +134,5 @@ secondConstVoidMemFun1(void (T::*p)(A) const)
 }
 
 }
+
+#endif
diff --git a/cpp/include/Ice/GCCountMap.h b/cpp/include/Ice/GCCountMap.h
index a27f9465c1a..fded894b317 100644
--- a/cpp/include/Ice/GCCountMap.h
+++ b/cpp/include/Ice/GCCountMap.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_GCCOUNTMAP_H
+#define ICE_GCCOUNTMAP_H
 
 #include <map>
 
@@ -19,3 +20,5 @@ class GCShared;
 typedef ::std::map<GCShared*, int> GCCountMap;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/GCShared.h b/cpp/include/Ice/GCShared.h
index 3edcf98ee33..e83332c1649 100644
--- a/cpp/include/Ice/GCShared.h
+++ b/cpp/include/Ice/GCShared.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_GC_SHARED_H
+#define ICE_GC_SHARED_H
 
 #include <IceUtil/Shared.h>
 #include <Ice/Config.h>
@@ -48,3 +49,5 @@ protected:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Ice/Handle.h b/cpp/include/Ice/Handle.h
index 1d1703d36c7..57239b36ba8 100644
--- a/cpp/include/Ice/Handle.h
+++ b/cpp/include/Ice/Handle.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_HANDLE_H
+#define ICE_HANDLE_H
 
 #include <IceUtil/Handle.h>
 #include <Ice/Config.h>
@@ -187,3 +188,5 @@ public:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index 9c4b8ad74f4..9195f124add 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_ICE_H
+#define ICE_ICE_H
 
 #include <IceUtil/Config.h>
 #include <Ice/Initialize.h>
@@ -45,3 +46,5 @@
 #ifndef _WIN32
 #   include <Ice/IconvStringConverter.h>
 #endif
+
+#endif
diff --git a/cpp/include/Ice/IconvStringConverter.h b/cpp/include/Ice/IconvStringConverter.h
index 5df0dacf802..2ab569ebbb4 100644
--- a/cpp/include/Ice/IconvStringConverter.h
+++ b/cpp/include/Ice/IconvStringConverter.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_ICONV_STRING_CONVERTER
+#define ICE_ICONV_STRING_CONVERTER
 
 #include <Ice/StringConverter.h>
 #include <Ice/UndefSysMacros.h>
@@ -367,3 +368,5 @@ IconvStringConverter<charT>::fromUTF8(const Ice::Byte* sourceStart, const Ice::B
 }
 
 }
+
+#endif
diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h
index 83a47c17b48..8fa63fddd6d 100644
--- a/cpp/include/Ice/Incoming.h
+++ b/cpp/include/Ice/Incoming.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_INCOMING_H
+#define ICE_INCOMING_H
 
 #include <Ice/InstanceF.h>
 #include <Ice/ConnectionIF.h>
@@ -121,3 +122,5 @@ private:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h
index bbb94ac183f..9f9480bfdec 100644
--- a/cpp/include/Ice/IncomingAsync.h
+++ b/cpp/include/Ice/IncomingAsync.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_INCOMING_ASYNC_H
+#define ICE_INCOMING_ASYNC_H
 
 #include <Ice/IncomingAsyncF.h>
 #include <Ice/Incoming.h>
@@ -103,3 +104,5 @@ public:
 }
 
 }
+
+#endif
diff --git a/cpp/include/Ice/IncomingAsyncF.h b/cpp/include/Ice/IncomingAsyncF.h
index 7e7087f1dc3..5b0d0790745 100644
--- a/cpp/include/Ice/IncomingAsyncF.h
+++ b/cpp/include/Ice/IncomingAsyncF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_INCOMING_ASYNC_F_H
+#define ICE_INCOMING_ASYNC_F_H
 
 #include <IceUtil/Shared.h>
 
@@ -30,3 +31,5 @@ ICE_API IceUtil::Shared* upCast(::Ice::AMD_Object_ice_invoke*);
 typedef IceInternal::Handle<AMD_Object_ice_invoke> AMD_Object_ice_invokePtr;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h
index 0979547366d..57a0fc55a56 100644
--- a/cpp/include/Ice/Initialize.h
+++ b/cpp/include/Ice/Initialize.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_INITIALIZE_H
+#define ICE_INITIALIZE_H
 
 #include <Ice/CommunicatorF.h>
 #include <Ice/PropertiesF.h>
@@ -120,3 +121,5 @@ namespace IceInternal
 ICE_API InstancePtr getInstance(const ::Ice::CommunicatorPtr&);
 
 }
+
+#endif
diff --git a/cpp/include/Ice/InstanceF.h b/cpp/include/Ice/InstanceF.h
index 2e1dd7dedc1..9ce92354595 100644
--- a/cpp/include/Ice/InstanceF.h
+++ b/cpp/include/Ice/InstanceF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_INSTANCE_F_H
+#define ICE_INSTANCE_F_H
 
 #include <IceUtil/Shared.h>
 
@@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(Instance*);
 typedef IceInternal::Handle<Instance> InstancePtr;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h
index 39d9cb2aca1..657136182b2 100644
--- a/cpp/include/Ice/LocalObject.h
+++ b/cpp/include/Ice/LocalObject.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_LOCAL_OBJECT_H
+#define ICE_LOCAL_OBJECT_H
 
 #include <IceUtil/Shared.h>
 #include <Ice/LocalObjectF.h>
@@ -37,3 +38,5 @@ public:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Ice/LocalObjectF.h b/cpp/include/Ice/LocalObjectF.h
index 4c87038d5a6..c8591c24352 100644
--- a/cpp/include/Ice/LocalObjectF.h
+++ b/cpp/include/Ice/LocalObjectF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_LOCAL_OBJECT_F_H
+#define ICE_LOCAL_OBJECT_F_H
 
 #include <IceUtil/Shared.h>
 
@@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(::Ice::LocalObject*);
 typedef IceInternal::Handle< LocalObject > LocalObjectPtr;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/LoggerUtil.h b/cpp/include/Ice/LoggerUtil.h
index ab056984b9b..fec7e79f75b 100644
--- a/cpp/include/Ice/LoggerUtil.h
+++ b/cpp/include/Ice/LoggerUtil.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_LOGGER_UTIL_H
+#define ICE_LOGGER_UTIL_H
 
 #include <Ice/LoggerF.h>
 #include <Ice/CommunicatorF.h>
@@ -118,3 +119,5 @@ public:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h
index d91d1acc5bb..831842c6ad8 100644
--- a/cpp/include/Ice/Object.h
+++ b/cpp/include/Ice/Object.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_OBJECT_H
+#define ICE_OBJECT_H
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Shared.h>
@@ -172,3 +173,5 @@ ICE_API void ice_writeObject(const OutputStreamPtr&, const ObjectPtr&);
 ICE_API void ice_readObject(const InputStreamPtr&, ObjectPtr&);
 
 }
+
+#endif
diff --git a/cpp/include/Ice/ObjectAdapterFactoryF.h b/cpp/include/Ice/ObjectAdapterFactoryF.h
index 145ec884c15..7e2a937cadd 100644
--- a/cpp/include/Ice/ObjectAdapterFactoryF.h
+++ b/cpp/include/Ice/ObjectAdapterFactoryF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_OBJECT_ADAPTER_FACTORY_F_H
+#define ICE_OBJECT_ADAPTER_FACTORY_F_H
 
 #include <IceUtil/Shared.h>
 
@@ -21,3 +22,5 @@ IceUtil::Shared* upCast(ObjectAdapterFactory*);
 typedef IceInternal::Handle<ObjectAdapterFactory> ObjectAdapterFactoryPtr;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/ObjectF.h b/cpp/include/Ice/ObjectF.h
index c4953df3d44..5946be23dd0 100644
--- a/cpp/include/Ice/ObjectF.h
+++ b/cpp/include/Ice/ObjectF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_OBJECT_F_H
+#define ICE_OBJECT_F_H
 
 #include <IceUtil/Shared.h>
 #include <Ice/Handle.h>
@@ -21,3 +22,5 @@ typedef IceInternal::Handle< Object > ObjectPtr;
 ICE_API void __patch(ObjectPtr&, ObjectPtr&);
 
 }
+
+#endif
diff --git a/cpp/include/Ice/Outgoing.h b/cpp/include/Ice/Outgoing.h
index 37fdd9f248c..1bcc5fa9d5b 100644
--- a/cpp/include/Ice/Outgoing.h
+++ b/cpp/include/Ice/Outgoing.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_OUTGOING_H
+#define ICE_OUTGOING_H
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Monitor.h>
@@ -196,3 +197,5 @@ private:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
index 2b482e4bae5..9c27f0f9a6d 100644
--- a/cpp/include/Ice/OutgoingAsync.h
+++ b/cpp/include/Ice/OutgoingAsync.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_OUTGOING_ASYNC_H
+#define ICE_OUTGOING_ASYNC_H
 
 #include <IceUtil/Monitor.h>
 #include <IceUtil/Mutex.h>
@@ -594,3 +595,5 @@ public:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Ice/OutgoingAsyncF.h b/cpp/include/Ice/OutgoingAsyncF.h
index 1feb42cead2..5b6f4daa1e4 100644
--- a/cpp/include/Ice/OutgoingAsyncF.h
+++ b/cpp/include/Ice/OutgoingAsyncF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_OUTGOING_ASYNC_F_H
+#define ICE_OUTGOING_ASYNC_F_H
 
 #include <IceUtil/Shared.h>
 
@@ -50,3 +51,5 @@ ICE_API IceUtil::Shared* upCast(CommunicatorBatchOutgoingAsync*);
 typedef IceInternal::Handle<CommunicatorBatchOutgoingAsync> CommunicatorBatchOutgoingAsyncPtr;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/Protocol.h b/cpp/include/Ice/Protocol.h
index 0a83c4ddbac..cf14d1b85a8 100644
--- a/cpp/include/Ice/Protocol.h
+++ b/cpp/include/Ice/Protocol.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_PROTOCOL_H
+#define ICE_PROTOCOL_H
 
 #include <Ice/Config.h>
 #include <Ice/Version.h>
@@ -187,3 +188,5 @@ checkSupportedEncoding(const Ice::EncodingVersion& v)
 }
 
 }
+
+#endif
diff --git a/cpp/include/Ice/ProtocolPluginFacade.h b/cpp/include/Ice/ProtocolPluginFacade.h
index c4283e3b03a..7290cfdf115 100644
--- a/cpp/include/Ice/ProtocolPluginFacade.h
+++ b/cpp/include/Ice/ProtocolPluginFacade.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_PROTOCOL_PLUGIN_FACADE_H
+#define ICE_PROTOCOL_PLUGIN_FACADE_H
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Shared.h>
@@ -88,3 +89,5 @@ private:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Ice/ProtocolPluginFacadeF.h b/cpp/include/Ice/ProtocolPluginFacadeF.h
index 02e2e8ea999..9e8f0d1c7c1 100644
--- a/cpp/include/Ice/ProtocolPluginFacadeF.h
+++ b/cpp/include/Ice/ProtocolPluginFacadeF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_PROTOCOL_PLUGIN_FACADE_F_H
+#define ICE_PROTOCOL_PLUGIN_FACADE_F_H
 
 #include <IceUtil/Shared.h>
 
@@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(ProtocolPluginFacade*);
 typedef Handle<ProtocolPluginFacade> ProtocolPluginFacadePtr;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index b459e2dc6d8..90a68843869 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_PROXY_H
+#define ICE_PROXY_H
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Mutex.h>
@@ -2635,3 +2636,5 @@ newCallback_Object_ice_flushBatchRequests(T* instance,
 }
 
 }
+
+#endif
diff --git a/cpp/include/Ice/ProxyF.h b/cpp/include/Ice/ProxyF.h
index 108cdee7447..82bf18c497e 100644
--- a/cpp/include/Ice/ProxyF.h
+++ b/cpp/include/Ice/ProxyF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_PROXY_F_H
+#define ICE_PROXY_F_H
 
 #include <IceUtil/Shared.h>
 
@@ -72,3 +73,6 @@ namespace Ice
 typedef IceInternal::ProxyHandle< ::IceProxy::Ice::Object> ObjectPrx;
 
 }
+
+
+#endif
diff --git a/cpp/include/Ice/ProxyFactoryF.h b/cpp/include/Ice/ProxyFactoryF.h
index c915ffaa6ee..a450f9e4c99 100644
--- a/cpp/include/Ice/ProxyFactoryF.h
+++ b/cpp/include/Ice/ProxyFactoryF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_PROXY_FACTORY_F_H
+#define ICE_PROXY_FACTORY_F_H
 
 #include <IceUtil/Shared.h>
 
@@ -21,3 +22,5 @@ IceUtil::Shared* upCast(ProxyFactory*);
 typedef IceInternal::Handle<ProxyFactory> ProxyFactoryPtr;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/ProxyHandle.h b/cpp/include/Ice/ProxyHandle.h
index b23958d26d5..07d623cb8d9 100644
--- a/cpp/include/Ice/ProxyHandle.h
+++ b/cpp/include/Ice/ProxyHandle.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_PROXY_HANDLE_H
+#define ICE_PROXY_HANDLE_H
 
 #include <IceUtil/Handle.h>
 #include <Ice/Config.h>
@@ -320,3 +321,5 @@ std::ostream& operator<<(std::ostream& os, ::IceInternal::ProxyHandle<Y> p)
 {
     return os << (p ? p->ice_toString() : std::string(""));
 }
+
+#endif
diff --git a/cpp/include/Ice/ReferenceF.h b/cpp/include/Ice/ReferenceF.h
index 99af2a09af2..80f4d87d08d 100644
--- a/cpp/include/Ice/ReferenceF.h
+++ b/cpp/include/Ice/ReferenceF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_REFERENCE_F_H
+#define ICE_REFERENCE_F_H
 
 #include <IceUtil/Shared.h>
 
@@ -29,3 +30,5 @@ ICE_API IceUtil::Shared* upCast(RoutableReference*);
 typedef IceInternal::Handle<RoutableReference> RoutableReferencePtr;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/RequestHandlerF.h b/cpp/include/Ice/RequestHandlerF.h
index d637da51f10..cc5df85be4a 100644
--- a/cpp/include/Ice/RequestHandlerF.h
+++ b/cpp/include/Ice/RequestHandlerF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_REQUEST_HANDLER_F_H
+#define ICE_REQUEST_HANDLER_F_H
 
 #include <IceUtil/Shared.h>
 #include <Ice/Handle.h>
@@ -20,3 +21,5 @@ ICE_API IceUtil::Shared* upCast(RequestHandler*);
 typedef IceInternal::Handle<RequestHandler> RequestHandlerPtr;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/ServantManagerF.h b/cpp/include/Ice/ServantManagerF.h
index 395349506bd..4ae03595ad5 100644
--- a/cpp/include/Ice/ServantManagerF.h
+++ b/cpp/include/Ice/ServantManagerF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_SERVANT_MANAGER_F_H
+#define ICE_SERVANT_MANAGER_F_H
 
 #include <IceUtil/Shared.h>
 
@@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(ServantManager*);
 typedef Handle<ServantManager> ServantManagerPtr;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/Service.h b/cpp/include/Ice/Service.h
index c124d371e1e..a36f8c130df 100644
--- a/cpp/include/Ice/Service.h
+++ b/cpp/include/Ice/Service.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_SERVICE_H
+#define ICE_SERVICE_H
 
 #include <IceUtil/Config.h>
 #include <Ice/Ice.h>
@@ -246,3 +247,5 @@ public:
 };
 
 } // End of namespace Ice
+
+#endif
diff --git a/cpp/include/Ice/SliceChecksums.h b/cpp/include/Ice/SliceChecksums.h
index 8fec4b60c86..cfbdc7c997f 100644
--- a/cpp/include/Ice/SliceChecksums.h
+++ b/cpp/include/Ice/SliceChecksums.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_SLICE_CHECKSUM_H
+#define ICE_SLICE_CHECKSUM_H
 
 #include <Ice/SliceChecksumDict.h>
 
@@ -29,3 +30,5 @@ public:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/Stream.h
index a1876f32bcf..8e4e4b61afb 100644
--- a/cpp/include/Ice/Stream.h
+++ b/cpp/include/Ice/Stream.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_STREAM_H
+#define ICE_STREAM_H
 
 #include <Ice/StreamF.h>
 #include <Ice/CommunicatorF.h>
@@ -436,3 +437,5 @@ protected:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Ice/StreamF.h b/cpp/include/Ice/StreamF.h
index 92ad61869cf..9fec3ce1d71 100644
--- a/cpp/include/Ice/StreamF.h
+++ b/cpp/include/Ice/StreamF.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_STREAM_F_H
+#define ICE_STREAM_F_H
 
 #include <IceUtil/Shared.h>
 
@@ -25,3 +26,5 @@ ICE_API IceUtil::Shared* upCast(::Ice::OutputStream*);
 typedef IceInternal::Handle< OutputStream > OutputStreamPtr;
 
 }
+
+#endif
diff --git a/cpp/include/Ice/StringConverter.h b/cpp/include/Ice/StringConverter.h
index 7452b90c845..28ee9bb3b9b 100644
--- a/cpp/include/Ice/StringConverter.h
+++ b/cpp/include/Ice/StringConverter.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_STRING_CONVERTER_H
+#define ICE_STRING_CONVERTER_H
 
 #include <Ice/Config.h>
 #include <Ice/CommunicatorF.h>
@@ -156,3 +157,5 @@ ICE_API std::string
 UTF8ToNative(const Ice::CommunicatorPtr&, const std::string&);
 
 }
+
+#endif
diff --git a/cpp/include/Ice/UndefSysMacros.h b/cpp/include/Ice/UndefSysMacros.h
index 32ccd926258..d412fd1b26d 100644
--- a/cpp/include/Ice/UndefSysMacros.h
+++ b/cpp/include/Ice/UndefSysMacros.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UNDEF_SYS_MACROS_H
+#define ICE_UNDEF_SYS_MACROS_H
 
 //
 // This header includes macros that can end up being dragged into
@@ -37,3 +38,5 @@
 #ifdef max
 #undef max
 #endif
+
+#endif
diff --git a/cpp/include/Ice/UserExceptionFactory.h b/cpp/include/Ice/UserExceptionFactory.h
index 2fa176d3d68..fd0e97f1cae 100644
--- a/cpp/include/Ice/UserExceptionFactory.h
+++ b/cpp/include/Ice/UserExceptionFactory.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_USER_EXCEPTION_FACTORY_H
+#define ICE_USER_EXCEPTION_FACTORY_H
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
@@ -27,3 +28,5 @@ public:
 typedef ::IceUtil::Handle<UserExceptionFactory> UserExceptionFactoryPtr;
 
 };
+
+#endif
diff --git a/cpp/include/IceGrid/IceGrid.h b/cpp/include/IceGrid/IceGrid.h
index e2f87bf9d43..34e1ed0d854 100644
--- a/cpp/include/IceGrid/IceGrid.h
+++ b/cpp/include/IceGrid/IceGrid.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICEGRID_H
+#define ICEGRID_H
 
 #include <IceGrid/Admin.h>
 #include <IceGrid/Descriptor.h>
@@ -19,3 +20,5 @@
 #include <IceGrid/Registry.h>
 #include <IceGrid/Session.h>
 #include <IceGrid/UserAccountMapper.h>
+
+#endif
diff --git a/cpp/include/IcePatch2/ClientUtil.h b/cpp/include/IcePatch2/ClientUtil.h
index 4e110f301d1..917abc28f2e 100644
--- a/cpp/include/IcePatch2/ClientUtil.h
+++ b/cpp/include/IcePatch2/ClientUtil.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_PATCH2_CLIENT_UTIL_H
+#define ICE_PATCH2_CLIENT_UTIL_H
 
 #include <Ice/Ice.h>
 #include <IceUtil/Thread.h>
@@ -160,3 +161,5 @@ private:
 typedef IceUtil::Handle<Patcher> PatcherPtr;
 
 }
+
+#endif
diff --git a/cpp/include/IcePatch2/Util.h b/cpp/include/IcePatch2/Util.h
index 3813d675bc1..8b92ba88afe 100644
--- a/cpp/include/IcePatch2/Util.h
+++ b/cpp/include/IcePatch2/Util.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_PATCH2_UTIL_H
+#define ICE_PATCH2_UTIL_H
 
 #include <Ice/Ice.h>
 #include <IcePatch2/FileInfo.h>
@@ -187,3 +188,5 @@ struct FileTree0
 ICE_PATCH2_API void getFileTree0(const FileInfoSeq&, FileTree0&);
 
 }
+
+#endif
diff --git a/cpp/include/IceSSL/IceSSL.h b/cpp/include/IceSSL/IceSSL.h
index 450e3c2b34e..8ffa97c6618 100644
--- a/cpp/include/IceSSL/IceSSL.h
+++ b/cpp/include/IceSSL/IceSSL.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_SSL_ICE_SSL_H
+#define ICE_SSL_ICE_SSL_H
 
 #include <IceUtil/Config.h>
 #ifndef ICE_OS_WINRT
@@ -15,3 +16,5 @@
 #endif
 #include <IceSSL/EndpointInfo.h>
 #include <IceSSL/ConnectionInfo.h>
+
+#endif
diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h
index 80772366690..bdc73a7740d 100644
--- a/cpp/include/IceSSL/Plugin.h
+++ b/cpp/include/IceSSL/Plugin.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_SSL_PLUGIN_H
+#define ICE_SSL_PLUGIN_H
 
 #include <IceUtil/Time.h>
 #include <Ice/Plugin.h>
@@ -453,3 +454,5 @@ public:
 typedef IceUtil::Handle<Plugin> PluginPtr;
 
 }
+
+#endif
diff --git a/cpp/include/IceUtil/AbstractMutex.h b/cpp/include/IceUtil/AbstractMutex.h
index c0805160a1e..84f992e87b5 100644
--- a/cpp/include/IceUtil/AbstractMutex.h
+++ b/cpp/include/IceUtil/AbstractMutex.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_ABSTRACT_MUTEX_H
+#define ICE_UTIL_ABSTRACT_MUTEX_H
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Lock.h>
@@ -113,3 +114,5 @@ public:
 
 
 }
+
+#endif
diff --git a/cpp/include/IceUtil/ArgVector.h b/cpp/include/IceUtil/ArgVector.h
index 0cf29c4de9e..813f7c873d0 100644
--- a/cpp/include/IceUtil/ArgVector.h
+++ b/cpp/include/IceUtil/ArgVector.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_ARGVECTOR_H
+#define ICE_UTIL_ARGVECTOR_H
 
 #include <IceUtil/Config.h>
 #include <vector>
@@ -36,3 +37,5 @@ private:
 };
 
 }
+
+#endif
diff --git a/cpp/include/IceUtil/Cache.h b/cpp/include/IceUtil/Cache.h
index 4c698585072..44899f2c9cf 100644
--- a/cpp/include/IceUtil/Cache.h
+++ b/cpp/include/IceUtil/Cache.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_CACHE_H
+#define ICE_UTIL_CACHE_H
 
 #include <IceUtil/Handle.h>
 #include <IceUtil/Mutex.h>
@@ -357,3 +358,5 @@ Cache<Key, Value>::pinImpl(const Key& key, const Handle<Value>& newObj)
 }
 
 }
+
+#endif
diff --git a/cpp/include/IceUtil/Cond.h b/cpp/include/IceUtil/Cond.h
index bf94fc04d7f..29388ddbeec 100644
--- a/cpp/include/IceUtil/Cond.h
+++ b/cpp/include/IceUtil/Cond.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_COND_H
+#define ICE_UTIL_COND_H
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Time.h>
@@ -318,3 +319,5 @@ Cond::timedWaitImpl(const M& mutex, const Time& timeout) const
 #endif
 
 } // End namespace IceUtil
+
+#endif
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index 06ec81a729f..1ea2dc144ed 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_CONFIG_H
+#define ICE_UTIL_CONFIG_H
 
 //
 // Endianness
@@ -189,3 +190,4 @@ typedef long long Int64;
 #define ICE_STRING_VERSION "3.4.2" // "A.B.C", with A=major, B=minor, C=patch
 #define ICE_INT_VERSION 30402      // AABBCC, with AA=major, BB=minor, CC=patch
 
+#endif
diff --git a/cpp/include/IceUtil/CountDownLatch.h b/cpp/include/IceUtil/CountDownLatch.h
index bb6305224ef..ef0d774abd4 100644
--- a/cpp/include/IceUtil/CountDownLatch.h
+++ b/cpp/include/IceUtil/CountDownLatch.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_COUNT_DOWN_LATCH_H
+#define ICE_UTIL_COUNT_DOWN_LATCH_H
 
 #include <IceUtil/Config.h>
 
@@ -45,3 +46,5 @@ private:
 };
 
 }
+
+#endif
diff --git a/cpp/include/IceUtil/CtrlCHandler.h b/cpp/include/IceUtil/CtrlCHandler.h
index 24d2012df33..1ae7cc85eb7 100644
--- a/cpp/include/IceUtil/CtrlCHandler.h
+++ b/cpp/include/IceUtil/CtrlCHandler.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_CTRL_C_HANDLER_H
+#define ICE_UTIL_CTRL_C_HANDLER_H
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Exception.h>
@@ -66,3 +67,4 @@ public:
 
 }
 
+#endif
diff --git a/cpp/include/IceUtil/DisableWarnings.h b/cpp/include/IceUtil/DisableWarnings.h
index 83fd59fdcb0..184961a0ac4 100644
--- a/cpp/include/IceUtil/DisableWarnings.h
+++ b/cpp/include/IceUtil/DisableWarnings.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_DISABLEWARNINGS_H
+#define ICE_UTIL_DISABLEWARNINGS_H
 
 //
 // This header file disables various annoying compiler warnings that
@@ -28,3 +29,5 @@
 #       pragma warning( 4 : 4355 ) // C4355 'this' : used in base member initializer list
 #    endif
 #endif
+
+#endif
diff --git a/cpp/include/IceUtil/Exception.h b/cpp/include/IceUtil/Exception.h
index fdeb01372e6..ac7c3b3c5f1 100644
--- a/cpp/include/IceUtil/Exception.h
+++ b/cpp/include/IceUtil/Exception.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_EXCEPTION_H
+#define ICE_UTIL_EXCEPTION_H
 
 #include <IceUtil/Config.h>
 
@@ -134,3 +135,5 @@ private:
 };
 
 }
+
+#endif
diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h
index c8973c31884..1e76c62d8fe 100644
--- a/cpp/include/IceUtil/FileUtil.h
+++ b/cpp/include/IceUtil/FileUtil.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_FILE_UTIL_H
+#define ICE_FILE_UTIL_H
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Shared.h>
@@ -143,3 +144,4 @@ private:
 };
 
 }
+#endif
diff --git a/cpp/include/IceUtil/Functional.h b/cpp/include/IceUtil/Functional.h
index 3f57ae4b293..ccc78655940 100644
--- a/cpp/include/IceUtil/Functional.h
+++ b/cpp/include/IceUtil/Functional.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_FUNCTIONAL_H
+#define ICE_UTIL_FUNCTIONAL_H
 
 #include <IceUtil/Handle.h>
 #include <functional>
@@ -383,3 +384,6 @@ secondConstVoidMemFun1(void (T::*p)(A) const)
 }
 
 }
+
+#endif
+
diff --git a/cpp/include/IceUtil/Handle.h b/cpp/include/IceUtil/Handle.h
index 8e75db3bae4..fe86b9c73ec 100644
--- a/cpp/include/IceUtil/Handle.h
+++ b/cpp/include/IceUtil/Handle.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_HANDLE_H
+#define ICE_UTIL_HANDLE_H
 
 #include <IceUtil/Exception.h>
 #include <algorithm>
@@ -261,3 +262,5 @@ public:
 };
 
 }
+
+#endif
diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h
index 87459b1d6f2..783bcb6f945 100644
--- a/cpp/include/IceUtil/IceUtil.h
+++ b/cpp/include/IceUtil/IceUtil.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_ICE_UTIL_H
+#define ICE_UTIL_ICE_UTIL_H
 
 //
 // This file must include *all* other headers of IceUtil, except
@@ -37,3 +38,5 @@
 #include <IceUtil/Timer.h>
 #include <IceUtil/UUID.h>
 #include <IceUtil/Unicode.h>
+
+#endif
diff --git a/cpp/include/IceUtil/InputUtil.h b/cpp/include/IceUtil/InputUtil.h
index 5428b4754d5..4bbe0f08780 100644
--- a/cpp/include/IceUtil/InputUtil.h
+++ b/cpp/include/IceUtil/InputUtil.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_INPUT_UTIL_H
+#define ICE_UTIL_INPUT_UTIL_H
 
 #include <IceUtil/Config.h>
 #include <string>
@@ -42,3 +43,5 @@ ICE_UTIL_API IceUtil::Int64 strToInt64(const char*, char**, int);
 ICE_UTIL_API  bool stringToInt64(const std::string&, IceUtil::Int64&);
 
 }
+
+#endif
diff --git a/cpp/include/IceUtil/Iterator.h b/cpp/include/IceUtil/Iterator.h
index e64446121b8..c3cc6222a35 100644
--- a/cpp/include/IceUtil/Iterator.h
+++ b/cpp/include/IceUtil/Iterator.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_ITERATOR_H
+#define ICE_UTIL_ITERATOR_H
 
 #include <iterator>
 
@@ -32,3 +33,4 @@ distance(ForwardIterator first, ForwardIterator last)
 }
 
 }
+#endif
diff --git a/cpp/include/IceUtil/Lock.h b/cpp/include/IceUtil/Lock.h
index 573ee546653..cf5ba793e0b 100644
--- a/cpp/include/IceUtil/Lock.h
+++ b/cpp/include/IceUtil/Lock.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_LOCK_H
+#define ICE_UTIL_LOCK_H
 
 #include <IceUtil/Config.h>
 #include <IceUtil/ThreadException.h>
@@ -130,3 +131,5 @@ public:
 };
 
 } // End namespace IceUtil
+
+#endif
diff --git a/cpp/include/IceUtil/Monitor.h b/cpp/include/IceUtil/Monitor.h
index 2b3404aedf1..48733926cce 100644
--- a/cpp/include/IceUtil/Monitor.h
+++ b/cpp/include/IceUtil/Monitor.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_MONITOR_H
+#define ICE_UTIL_MONITOR_H
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Lock.h>
@@ -244,3 +245,5 @@ IceUtil::Monitor<T>::notifyImpl(int nnotify) const
         }
     }
 }
+
+#endif
diff --git a/cpp/include/IceUtil/Mutex.h b/cpp/include/IceUtil/Mutex.h
index 76f2fbdc52f..59b1e42d406 100644
--- a/cpp/include/IceUtil/Mutex.h
+++ b/cpp/include/IceUtil/Mutex.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_MUTEX_H
+#define ICE_UTIL_MUTEX_H
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Lock.h>
@@ -340,3 +341,5 @@ Mutex::willUnlock() const
 }
 
 } // End namespace IceUtil
+
+#endif
diff --git a/cpp/include/IceUtil/MutexProtocol.h b/cpp/include/IceUtil/MutexProtocol.h
index 61a956a4b00..a74589f468a 100644
--- a/cpp/include/IceUtil/MutexProtocol.h
+++ b/cpp/include/IceUtil/MutexProtocol.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_MUTEX_PROTOCOL_H
+#define ICE_UTIL_MUTEX_PROTOCOL_H
 
 #include <IceUtil/Config.h>
 
@@ -23,3 +24,5 @@ enum MutexProtocol
 ICE_UTIL_API MutexProtocol getDefaultMutexProtocol();
 
 } // End namespace IceUtil
+
+#endif
diff --git a/cpp/include/IceUtil/MutexPtrLock.h b/cpp/include/IceUtil/MutexPtrLock.h
index c2e4a389c5c..3574a95a442 100644
--- a/cpp/include/IceUtil/MutexPtrLock.h
+++ b/cpp/include/IceUtil/MutexPtrLock.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_MUTEX_PTR_LOCK_H
+#define ICE_UTIL_MUTEX_PTR_LOCK_H
 
 #include <IceUtil/Config.h>
 #include <IceUtil/ThreadException.h>
@@ -78,3 +79,5 @@ private:
 };
 
 } // End namespace IceUtilInternal
+
+#endif
diff --git a/cpp/include/IceUtil/MutexPtrTryLock.h b/cpp/include/IceUtil/MutexPtrTryLock.h
index c4b81d47ce7..7eb64d242c8 100644
--- a/cpp/include/IceUtil/MutexPtrTryLock.h
+++ b/cpp/include/IceUtil/MutexPtrTryLock.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_MUTEX_PTR_TRY_LOCK_H
+#define ICE_UTIL_MUTEX_PTR_TRY_LOCK_H
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Mutex.h>
@@ -77,3 +78,5 @@ private:
 };
 
 } // End namespace IceUtilInternal
+
+#endif
diff --git a/cpp/include/IceUtil/Options.h b/cpp/include/IceUtil/Options.h
index 2bc37c5fdff..fb30332a0cb 100644
--- a/cpp/include/IceUtil/Options.h
+++ b/cpp/include/IceUtil/Options.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_OPTIONS_H
+#define ICE_UTIL_OPTIONS_H
 
 #include <IceUtil/Config.h>
 #include <IceUtil/RecMutex.h>
@@ -136,3 +137,5 @@ private:
 };
 
 }
+
+#endif
diff --git a/cpp/include/IceUtil/OutputUtil.h b/cpp/include/IceUtil/OutputUtil.h
index 85954127caf..06bfcca556a 100644
--- a/cpp/include/IceUtil/OutputUtil.h
+++ b/cpp/include/IceUtil/OutputUtil.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_OUTPUT_UTIL_H
+#define ICE_UTIL_OUTPUT_UTIL_H
 
 #include <IceUtil/Config.h>
 #include <fstream>
@@ -357,3 +358,5 @@ operator<<(XMLOutput& o, const EndEscapes&)
 ICE_UTIL_API XMLOutput& operator<<(XMLOutput&, std::ios_base& (*)(std::ios_base&));
 
 }
+
+#endif
diff --git a/cpp/include/IceUtil/Random.h b/cpp/include/IceUtil/Random.h
index 9bdd9caad53..eb9b2ca0051 100644
--- a/cpp/include/IceUtil/Random.h
+++ b/cpp/include/IceUtil/Random.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_RANDOM_H
+#define ICE_UTIL_RANDOM_H
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Exception.h>
@@ -19,3 +20,5 @@ ICE_UTIL_API void generateRandom(char*, int);
 ICE_UTIL_API unsigned int random(int = 0);
 
 }
+
+#endif
diff --git a/cpp/include/IceUtil/ScannerConfig.h b/cpp/include/IceUtil/ScannerConfig.h
index dee5caeb80f..3186bee7334 100644
--- a/cpp/include/IceUtil/ScannerConfig.h
+++ b/cpp/include/IceUtil/ScannerConfig.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_SCANNER_CONFIG_H
+#define ICE_UTIL_SCANNER_CONFIG_H
 
 #include <IceUtil/Config.h> // Required by generated Scanners.
 
@@ -22,4 +23,6 @@
 //
 #if defined(_MSC_VER) && (_MSC_VER >= 1600)
 #   include <stdint.h>
-#endif
\ No newline at end of file
+#endif
+
+#endif
diff --git a/cpp/include/IceUtil/ScopedArray.h b/cpp/include/IceUtil/ScopedArray.h
index 15571b22b0e..8e1d0d0ddf0 100644
--- a/cpp/include/IceUtil/ScopedArray.h
+++ b/cpp/include/IceUtil/ScopedArray.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_SCOPED_ARRAY_H
+#define ICE_UTIL_SCOPED_ARRAY_H
 
 #include <IceUtil/Config.h>
 
@@ -85,3 +86,5 @@ private:
 };
 
 } // End of namespace IceUtil
+
+#endif
diff --git a/cpp/include/IceUtil/Shared.h b/cpp/include/IceUtil/Shared.h
index 5b3e1b610c4..2412ec1210c 100644
--- a/cpp/include/IceUtil/Shared.h
+++ b/cpp/include/IceUtil/Shared.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_SHARED_H
+#define ICE_UTIL_SHARED_H
 
 #include <IceUtil/Config.h>
 
@@ -143,3 +144,5 @@ protected:
 };
 
 }
+
+#endif
diff --git a/cpp/include/IceUtil/StringUtil.h b/cpp/include/IceUtil/StringUtil.h
index 3439d040e36..f2786340b4c 100644
--- a/cpp/include/IceUtil/StringUtil.h
+++ b/cpp/include/IceUtil/StringUtil.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_STRING_UTIL_H
+#define ICE_STRING_UTIL_H
 
 #include <IceUtil/Config.h>
 #include <vector>
@@ -86,3 +87,5 @@ ICE_UTIL_API bool isDigit(char);
 ICE_UTIL_API std::string removeWhitespace(const std::string&);
 
 }
+
+#endif
diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h
index e75adf60476..6658ef8740f 100644
--- a/cpp/include/IceUtil/Thread.h
+++ b/cpp/include/IceUtil/Thread.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_THREAD_H
+#define ICE_UTIL_THREAD_H
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
@@ -160,3 +161,6 @@ private:
 typedef Handle<Thread> ThreadPtr;
     
 }
+
+#endif
+
diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h
index b723ff4d4fe..2535fed96c0 100644
--- a/cpp/include/IceUtil/ThreadException.h
+++ b/cpp/include/IceUtil/ThreadException.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_THREAD_EXCEPTION_H
+#define ICE_UTIL_THREAD_EXCEPTION_H
 
 #include <IceUtil/Exception.h>
 #include <IceUtil/Time.h>
@@ -102,3 +103,6 @@ private:
 };
     
 }
+
+#endif
+
diff --git a/cpp/include/IceUtil/Time.h b/cpp/include/IceUtil/Time.h
index 8dcd0699d4f..d987ca3cd00 100644
--- a/cpp/include/IceUtil/Time.h
+++ b/cpp/include/IceUtil/Time.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_TIME_H
+#define ICE_UTIL_TIME_H
 
 #include <IceUtil/Config.h>
 
@@ -204,3 +205,5 @@ private:
 ICE_UTIL_API std::ostream& operator<<(std::ostream&, const Time&);
 
 } // End namespace IceUtil
+
+#endif
diff --git a/cpp/include/IceUtil/Timer.h b/cpp/include/IceUtil/Timer.h
index f6eed95058e..00087365b33 100644
--- a/cpp/include/IceUtil/Timer.h
+++ b/cpp/include/IceUtil/Timer.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_TIMER_H
+#define ICE_UTIL_TIMER_H
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Thread.h>
@@ -136,3 +137,6 @@ Timer::Token::operator<(const Timer::Token& r) const
 }
 
 }
+
+#endif
+
diff --git a/cpp/include/IceUtil/UUID.h b/cpp/include/IceUtil/UUID.h
index 838b97d8e4e..4cc1d85f87a 100644
--- a/cpp/include/IceUtil/UUID.h
+++ b/cpp/include/IceUtil/UUID.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_UUID_H
+#define ICE_UTIL_UUID_H
 
 #include <IceUtil/Config.h>
 
@@ -17,3 +18,5 @@ namespace IceUtil
 ICE_UTIL_API std::string generateUUID();
 
 }
+
+#endif
diff --git a/cpp/include/IceUtil/Unicode.h b/cpp/include/IceUtil/Unicode.h
index 4921a5b27ea..7d8df3feff0 100644
--- a/cpp/include/IceUtil/Unicode.h
+++ b/cpp/include/IceUtil/Unicode.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_UTIL_UNICODE_H
+#define ICE_UTIL_UNICODE_H
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Exception.h>
@@ -90,3 +91,5 @@ convertUTF8ToUTFWstring(const IceUtil::Byte*& sourceStart, const IceUtil::Byte*
                         std::wstring& target, IceUtil::ConversionFlags flags);
 
 }
+
+#endif
diff --git a/cpp/include/IceXML/Parser.h b/cpp/include/IceXML/Parser.h
index 28a48daf367..e67478b899d 100644
--- a/cpp/include/IceXML/Parser.h
+++ b/cpp/include/IceXML/Parser.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_XML_PARSER_H
+#define ICE_XML_PARSER_H
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
@@ -152,3 +153,5 @@ public:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h
index dae79c161ec..f738f5036c3 100644
--- a/cpp/include/Slice/CPlusPlusUtil.h
+++ b/cpp/include/Slice/CPlusPlusUtil.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef C_PLUS_PLUS_UTIL_H
+#define C_PLUS_PLUS_UTIL_H
 
 #include <Slice/Parser.h>
 #include <IceUtil/OutputUtil.h>
@@ -60,3 +61,5 @@ SLICE_API bool inWstringModule(const SequencePtr&);
 
 SLICE_API std::string getDataMemberRef(const DataMemberPtr&);
 }
+
+#endif
diff --git a/cpp/include/Slice/Checksum.h b/cpp/include/Slice/Checksum.h
index c874595512f..0a758f5c8a4 100644
--- a/cpp/include/Slice/Checksum.h
+++ b/cpp/include/Slice/Checksum.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef SLICE_CHECKSUM_H
+#define SLICE_CHECKSUM_H
 
 #include <Slice/Parser.h>
 #include <map>
@@ -21,3 +22,5 @@ typedef std::map<std::string, std::vector<unsigned char> > ChecksumMap;
 SLICE_API ChecksumMap createChecksums(const UnitPtr&);
 
 }
+
+#endif
diff --git a/cpp/include/Slice/CsUtil.h b/cpp/include/Slice/CsUtil.h
index 35f21b09094..052ae75dfa7 100644
--- a/cpp/include/Slice/CsUtil.h
+++ b/cpp/include/Slice/CsUtil.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef CS_UTIL_H
+#define CS_UTIL_H
 
 #include <Slice/Parser.h>
 #include <IceUtil/OutputUtil.h>
@@ -84,3 +85,5 @@ private:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Slice/DotNetNames.h b/cpp/include/Slice/DotNetNames.h
index 43bab7155c0..88e74c378be 100644
--- a/cpp/include/Slice/DotNetNames.h
+++ b/cpp/include/Slice/DotNetNames.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef DOTNETNAMES_H
+#define DOTNETNAMES_H
 
 #include <string>
 
@@ -29,3 +30,5 @@ std::string mangleName(const std::string&, int baseTypes = 0);
 }
 
 }
+
+#endif
diff --git a/cpp/include/Slice/FileTracker.h b/cpp/include/Slice/FileTracker.h
index ba12335da7d..e6dbabdd573 100644
--- a/cpp/include/Slice/FileTracker.h
+++ b/cpp/include/Slice/FileTracker.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef FILE_TRACKER_H
+#define FILE_TRACKER_H
 
 #include <IceUtil/Shared.h>
 #include <Slice/Parser.h>
@@ -66,3 +67,5 @@ private:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Slice/JavaUtil.h b/cpp/include/Slice/JavaUtil.h
index d7023490b78..c8bb6a71f85 100644
--- a/cpp/include/Slice/JavaUtil.h
+++ b/cpp/include/Slice/JavaUtil.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef JAVA_UTIL_H
+#define JAVA_UTIL_H
 
 #include <Slice/Parser.h>
 #include <IceUtil/OutputUtil.h>
@@ -266,3 +267,5 @@ private:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Slice/PHPUtil.h b/cpp/include/Slice/PHPUtil.h
index 200cdf57e86..8e0322ffaee 100644
--- a/cpp/include/Slice/PHPUtil.h
+++ b/cpp/include/Slice/PHPUtil.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef SLICE_PHP_UTIL_H
+#define SLICE_PHP_UTIL_H
 
 #include <Slice/Parser.h>
 
@@ -45,3 +46,5 @@ SLICE_API std::string escapeName(const std::string&);
 
 }
 }
+
+#endif
diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h
index 51fb288b318..e5d2d156be5 100644
--- a/cpp/include/Slice/Parser.h
+++ b/cpp/include/Slice/Parser.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef SLICE_PARSER_H
+#define SLICE_PARSER_H
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
@@ -1070,3 +1071,5 @@ private:
 extern SLICE_API Unit* unit; // The current parser for bison/flex
 
 }
+
+#endif
diff --git a/cpp/include/Slice/Preprocessor.h b/cpp/include/Slice/Preprocessor.h
index ee58e8f312c..aa3164e442e 100644
--- a/cpp/include/Slice/Preprocessor.h
+++ b/cpp/include/Slice/Preprocessor.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef PREPROCESSOR_H
+#define PREPROCESSOR_H
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
@@ -63,3 +64,5 @@ private:
 };
 
 }
+
+#endif
diff --git a/cpp/include/Slice/PythonUtil.h b/cpp/include/Slice/PythonUtil.h
index 5201b7f1c49..91501cb7f50 100644
--- a/cpp/include/Slice/PythonUtil.h
+++ b/cpp/include/Slice/PythonUtil.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef SLICE_PYTHON_UTIL_H
+#define SLICE_PYTHON_UTIL_H
 
 #include <Slice/Parser.h>
 #include <IceUtil/OutputUtil.h>
@@ -57,3 +58,5 @@ SLICE_API void printHeader(IceUtilInternal::Output&);
 
 }
 }
+
+#endif
diff --git a/cpp/include/Slice/RubyUtil.h b/cpp/include/Slice/RubyUtil.h
index acf93455fed..d8cd8ead8b8 100644
--- a/cpp/include/Slice/RubyUtil.h
+++ b/cpp/include/Slice/RubyUtil.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef SLICE_RUBY_UTIL_H
+#define SLICE_RUBY_UTIL_H
 
 #include <Slice/Parser.h>
 #include <IceUtil/OutputUtil.h>
@@ -47,3 +48,5 @@ SLICE_API void printHeader(IceUtilInternal::Output&);
 
 }
 }
+
+#endif
diff --git a/cpp/include/Slice/Util.h b/cpp/include/Slice/Util.h
index c4267590cc2..340f3eb6caa 100644
--- a/cpp/include/Slice/Util.h
+++ b/cpp/include/Slice/Util.h
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef SLICE_UTIL_H
+#define SLICE_UTIL_H
 
 #include <Slice/Parser.h>
 #include <IceUtil/OutputUtil.h>
@@ -28,3 +29,5 @@ SLICE_API std::vector<std::string> filterMcppWarnings(const std::string&);
 SLICE_API void printGeneratedHeader(IceUtilInternal::Output& out, const std::string&, const std::string& commentStyle = "//");
 
 }
+
+#endif