ICE-4782 Generate "#pragma once" for include-guards in generated C++ header files.

69 files changed, 77 insertions, 280 deletions

diff --git a/cpp/src/Ice/Acceptor.h b/cpp/src/Ice/Acceptor.h
index 27fdba1a1cb..bc6dba9c43c 100644
--- a/cpp/src/Ice/Acceptor.h
+++ b/cpp/src/Ice/Acceptor.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ACCEPTOR_H
-#define ICE_ACCEPTOR_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <Ice/AcceptorF.h>
@@ -34,5 +33,3 @@ public:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/AcceptorF.h b/cpp/src/Ice/AcceptorF.h
index 6e2bc1d60f8..d1dd06c669e 100644
--- a/cpp/src/Ice/AcceptorF.h
+++ b/cpp/src/Ice/AcceptorF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ACCEPTOR_F_H
-#define ICE_ACCEPTOR_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -22,5 +21,3 @@ ICE_API IceUtil::Shared* upCast(Acceptor*);
 typedef Handle<Acceptor> AcceptorPtr;
 
 }
-
-#endif
diff --git a/cpp/src/Ice/Base64.h b/cpp/src/Ice/Base64.h
index 64d16c04823..0de84d1b15c 100644
--- a/cpp/src/Ice/Base64.h
+++ b/cpp/src/Ice/Base64.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_BASE_64_H
-#define ICE_BASE_64_H
+#pragma once
 
 #include <Ice/Config.h>
 #include <string>
@@ -32,5 +31,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h
index 565a5ccecd6..dc5580180b2 100644
--- a/cpp/src/Ice/CommunicatorI.h
+++ b/cpp/src/Ice/CommunicatorI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_COMMUNICATOR_I_H
-#define ICE_COMMUNICATOR_I_H
+#pragma once
 
 #include <IceUtil/RecMutex.h>
 
@@ -98,5 +97,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h
index 491d5b6639a..35a9fe87216 100644
--- a/cpp/src/Ice/ConnectRequestHandler.h
+++ b/cpp/src/Ice/ConnectRequestHandler.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_CONNECT_REQUEST_HANDLER_H
-#define ICE_CONNECT_REQUEST_HANDLER_H
+#pragma once
 
 #include <IceUtil/Monitor.h>
 #include <IceUtil/Mutex.h>
@@ -89,5 +88,3 @@ private:
 typedef IceUtil::Handle<ConnectRequestHandler> ConnectRequestHandlerPtr;
 
 }
-
-#endif
diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h
index 846248b8e40..1ca9233a7bf 100644
--- a/cpp/src/Ice/ConnectionFactory.h
+++ b/cpp/src/Ice/ConnectionFactory.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_CONNECTION_FACTORY_H
-#define ICE_CONNECTION_FACTORY_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Monitor.h>
@@ -222,5 +221,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h
index 8648f8f302c..1f448693a38 100644
--- a/cpp/src/Ice/ConnectionI.h
+++ b/cpp/src/Ice/ConnectionI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_CONNECTION_I_H
-#define ICE_CONNECTION_I_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Monitor.h>
@@ -331,5 +330,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/ConnectionMonitor.h b/cpp/src/Ice/ConnectionMonitor.h
index 5f09f67405f..19e8a353280 100644
--- a/cpp/src/Ice/ConnectionMonitor.h
+++ b/cpp/src/Ice/ConnectionMonitor.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_CONNECTION_MONITOR_H
-#define ICE_CONNECTION_MONITOR_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Monitor.h>
@@ -47,5 +46,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/ConnectionRequestHandler.h b/cpp/src/Ice/ConnectionRequestHandler.h
index 45b5678d35f..c05f7d8bf5a 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.h
+++ b/cpp/src/Ice/ConnectionRequestHandler.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_CONNECTION_REQUEST_HANDLER_H
-#define ICE_CONNECTION_REQUEST_HANDLER_H
+#pragma once
 
 #include <Ice/RequestHandler.h>
 #include <Ice/ReferenceF.h>
@@ -43,5 +42,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/Connector.h b/cpp/src/Ice/Connector.h
index 58bd62bf900..79e7060421a 100644
--- a/cpp/src/Ice/Connector.h
+++ b/cpp/src/Ice/Connector.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_CONNECTOR_H
-#define ICE_CONNECTOR_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <Ice/ConnectorF.h>
@@ -32,5 +31,3 @@ public:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/ConnectorF.h b/cpp/src/Ice/ConnectorF.h
index 0e7872c4dbf..91318a048df 100644
--- a/cpp/src/Ice/ConnectorF.h
+++ b/cpp/src/Ice/ConnectorF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_CONNECTOR_F_H
-#define ICE_CONNECTOR_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -22,5 +21,3 @@ ICE_API IceUtil::Shared* upCast(Connector*);
 typedef Handle<Connector> ConnectorPtr;
 
 }
-
-#endif
diff --git a/cpp/src/Ice/DefaultsAndOverrides.h b/cpp/src/Ice/DefaultsAndOverrides.h
index ad8b8d3873b..d0b075e18d9 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.h
+++ b/cpp/src/Ice/DefaultsAndOverrides.h
@@ -8,8 +8,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_DEFAULTS_AND_OVERRIDES_H
-#define ICE_DEFAULTS_AND_OVERRIDES_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <Ice/DefaultsAndOverridesF.h>
@@ -45,5 +44,3 @@ public:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/DefaultsAndOverridesF.h b/cpp/src/Ice/DefaultsAndOverridesF.h
index 9d2b40287c4..845e2c0ca4a 100644
--- a/cpp/src/Ice/DefaultsAndOverridesF.h
+++ b/cpp/src/Ice/DefaultsAndOverridesF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_DEFAULTS_AND_OVERRIDES_F_H
-#define ICE_DEFAULTS_AND_OVERRIDES_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -22,5 +21,3 @@ IceUtil::Shared* upCast(DefaultsAndOverrides*);
 typedef Handle<DefaultsAndOverrides> DefaultsAndOverridesPtr;
 
 }
-
-#endif
diff --git a/cpp/src/Ice/EndpointFactoryManager.h b/cpp/src/Ice/EndpointFactoryManager.h
index 89bdc493cef..cc8e5fdb21a 100644
--- a/cpp/src/Ice/EndpointFactoryManager.h
+++ b/cpp/src/Ice/EndpointFactoryManager.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ENDPOINT_FACTORY_MANAGER_H
-#define ICE_ENDPOINT_FACTORY_MANAGER_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Mutex.h>
@@ -43,5 +42,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/EndpointFactoryManagerF.h b/cpp/src/Ice/EndpointFactoryManagerF.h
index 9123c7dec89..570249ed5e7 100644
--- a/cpp/src/Ice/EndpointFactoryManagerF.h
+++ b/cpp/src/Ice/EndpointFactoryManagerF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ENDPOINT_FACTORY_MANAGER_F_H
-#define ICE_ENDPOINT_FACTORY_MANAGER_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -22,5 +21,3 @@ IceUtil::Shared* upCast(EndpointFactoryManager*);
 typedef Handle<EndpointFactoryManager> EndpointFactoryManagerPtr;
 
 }
-
-#endif
diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h
index 1d170e9bb6d..e00f22bcf28 100644
--- a/cpp/src/Ice/EndpointI.h
+++ b/cpp/src/Ice/EndpointI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ENDPOINT_I_H
-#define ICE_ENDPOINT_I_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Shared.h>
@@ -198,5 +197,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h
index da1df3b93a4..3c7ece52a57 100644
--- a/cpp/src/Ice/EventHandler.h
+++ b/cpp/src/Ice/EventHandler.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_EVENT_HANDLER_H
-#define ICE_EVENT_HANDLER_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <Ice/EventHandlerF.h>
@@ -72,5 +71,3 @@ protected:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/EventHandlerF.h b/cpp/src/Ice/EventHandlerF.h
index 9b16cb492dc..3947e19ca6f 100644
--- a/cpp/src/Ice/EventHandlerF.h
+++ b/cpp/src/Ice/EventHandlerF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_EVENT_HANDLER_F_H
-#define ICE_EVENT_HANDLER_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -22,5 +21,3 @@ ICE_API IceUtil::Shared* upCast(EventHandler*);
 typedef Handle<EventHandler> EventHandlerPtr;
 
 }
-
-#endif
diff --git a/cpp/src/Ice/EventLoggerMsg.h b/cpp/src/Ice/EventLoggerMsg.h
index 5934c1f104f..be8c37e8213 100755
--- a/cpp/src/Ice/EventLoggerMsg.h
+++ b/cpp/src/Ice/EventLoggerMsg.h
@@ -1,11 +1,11 @@
- // **********************************************************************
- //
- // Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
- //
- // This copy of Ice is licensed to you under the terms described in the
- // ICE_LICENSE file included in this distribution.
- //
- // **********************************************************************
+// **********************************************************************
+//
+// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
 //
 //  Values are 32 bit values laid out as follows:
 //
diff --git a/cpp/src/Ice/GC.h b/cpp/src/Ice/GC.h
index 90a7072e958..a73d8ff722b 100644
--- a/cpp/src/Ice/GC.h
+++ b/cpp/src/Ice/GC.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GC_H
-#define ICE_GC_H
+#pragma once
 
 #include <Ice/Config.h>
 #include <IceUtil/Thread.h>
@@ -47,5 +46,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/HashUtil.h b/cpp/src/Ice/HashUtil.h
index fcc5644a99a..7b6c7f6a27b 100644
--- a/cpp/src/Ice/HashUtil.h
+++ b/cpp/src/Ice/HashUtil.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_HASH_UTIL_H
-#define ICE_HASH_UTIL_H
+#pragma once
 
 namespace IceInternal
 {
@@ -55,6 +54,3 @@ hashAdd(Ice::Int& hashCode, const std::map<K, V>& map)
 
 
 }
-
-#endif
-
diff --git a/cpp/src/Ice/ImplicitContextI.h b/cpp/src/Ice/ImplicitContextI.h
index 8125f7a92a3..b781db796bc 100644
--- a/cpp/src/Ice/ImplicitContextI.h
+++ b/cpp/src/Ice/ImplicitContextI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_IMPLICIT_CONTEXT_I_H
-#define ICE_IMPLICIT_CONTEXT_I_H
+#pragma once
 
 #include <Ice/ImplicitContext.h>
 
@@ -48,4 +47,3 @@ public:
 typedef IceInternal::Handle<ImplicitContextI> ImplicitContextIPtr;
 
 }
-#endif
diff --git a/cpp/src/Ice/IncomingRequest.h b/cpp/src/Ice/IncomingRequest.h
index b163c86a39a..2cb1ca7e785 100644
--- a/cpp/src/Ice/IncomingRequest.h
+++ b/cpp/src/Ice/IncomingRequest.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_INCOMING_REQUEST_H
-#define ICE_INCOMING_REQUEST_H
+#pragma once
 
 #include <Ice/Incoming.h>
 #include <Ice/Object.h>
@@ -34,5 +33,3 @@ public:
     Incoming& _in;
 };
 }
-
-#endif
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h
index b39e88ce838..91a97009de6 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_INSTANCE_H
-#define ICE_INSTANCE_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Shared.h>
@@ -159,5 +158,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h
index 13bbb2f98bc..7ec892f1626 100644
--- a/cpp/src/Ice/LocatorInfo.h
+++ b/cpp/src/Ice/LocatorInfo.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_LOCATOR_INFO_H
-#define ICE_LOCATOR_INFO_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Mutex.h>
@@ -181,5 +180,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/LocatorInfoF.h b/cpp/src/Ice/LocatorInfoF.h
index 3666e182700..817aa6cb651 100644
--- a/cpp/src/Ice/LocatorInfoF.h
+++ b/cpp/src/Ice/LocatorInfoF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_LOCATOR_INFO_F_H
-#define ICE_LOCATOR_INFO_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -30,5 +29,3 @@ IceUtil::Shared* upCast(LocatorTable*);
 typedef Handle<LocatorTable> LocatorTablePtr;
 
 }
-
-#endif
diff --git a/cpp/src/Ice/LoggerI.h b/cpp/src/Ice/LoggerI.h
index dfab4451764..6f1ce6457b0 100644
--- a/cpp/src/Ice/LoggerI.h
+++ b/cpp/src/Ice/LoggerI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_LOGGER_I_H
-#define ICE_LOGGER_I_H
+#pragma once
 
 #include <Ice/Logger.h>
 #include <IceUtil/FileUtil.h>
@@ -41,5 +40,3 @@ private:
 typedef IceUtil::Handle<LoggerI> LoggerIPtr;
 
 }
-
-#endif
diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h
index 66c700dbf23..b8e30a34876 100644
--- a/cpp/src/Ice/Network.h
+++ b/cpp/src/Ice/Network.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_NETWORK_H
-#define ICE_NETWORK_H
+#pragma once
 
 #ifdef __hpux
 #   define _XOPEN_SOURCE_EXTENDED
@@ -237,5 +236,3 @@ ICE_API void doConnectAsync(SOCKET, const Address&, AsyncInfo&);
 ICE_API void doFinishConnectAsync(SOCKET, AsyncInfo&);
 #endif
 }
-
-#endif
diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h
index 9523f65748f..dc7003e7950 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.h
+++ b/cpp/src/Ice/ObjectAdapterFactory.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_OBJECT_ADAPTER_FACTORY_H
-#define ICE_OBJECT_ADAPTER_FACTORY_H
+#pragma once
 
 #include <Ice/ObjectAdapterI.h>
 #include <IceUtil/RecMutex.h>
@@ -46,5 +45,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h
index d3eed147890..c74f8bec8ed 100644
--- a/cpp/src/Ice/ObjectAdapterI.h
+++ b/cpp/src/Ice/ObjectAdapterI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_OBJECT_ADAPTER_I_H
-#define ICE_OBJECT_ADAPTER_I_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/RecMutex.h>
@@ -141,5 +140,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/ObjectFactoryManager.h b/cpp/src/Ice/ObjectFactoryManager.h
index 424610d5131..0c963b509eb 100644
--- a/cpp/src/Ice/ObjectFactoryManager.h
+++ b/cpp/src/Ice/ObjectFactoryManager.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SERVANT_FACTORY_MANAGER_H
-#define ICE_SERVANT_FACTORY_MANAGER_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Mutex.h>
@@ -39,5 +38,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/ObjectFactoryManagerF.h b/cpp/src/Ice/ObjectFactoryManagerF.h
index 9223e8290e8..5befe55a0d0 100644
--- a/cpp/src/Ice/ObjectFactoryManagerF.h
+++ b/cpp/src/Ice/ObjectFactoryManagerF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SERVANT_FACTORY_MANAGER_F_H
-#define ICE_SERVANT_FACTORY_MANAGER_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -22,5 +21,3 @@ IceUtil::Shared* upCast(ObjectFactoryManager*);
 typedef Handle<ObjectFactoryManager> ObjectFactoryManagerPtr;
 
 }
-
-#endif
diff --git a/cpp/src/Ice/OpaqueEndpointI.h b/cpp/src/Ice/OpaqueEndpointI.h
index 6d9b4112667..2cdde0f745f 100644
--- a/cpp/src/Ice/OpaqueEndpointI.h
+++ b/cpp/src/Ice/OpaqueEndpointI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UNKNOWN_ENDPOINT_I_H
-#define ICE_UNKNOWN_ENDPOINT_I_H
+#pragma once
 
 #include <Ice/EndpointI.h>
 #include <Ice/EndpointFactory.h>
@@ -59,5 +58,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h
index 8918c3dfc33..ecb73fa3a43 100644
--- a/cpp/src/Ice/PluginManagerI.h
+++ b/cpp/src/Ice/PluginManagerI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PLUGIN_MANAGER_I_H
-#define ICE_PLUGIN_MANAGER_I_H
+#pragma once
 
 #include <Ice/Plugin.h>
 #include <Ice/InstanceF.h>
@@ -59,6 +58,3 @@ private:
 typedef IceUtil::Handle<PluginManagerI> PluginManagerIPtr;
 
 }
-
-
-#endif
diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h
index 79a94e7af37..ee6df06c1bb 100644
--- a/cpp/src/Ice/PropertiesI.h
+++ b/cpp/src/Ice/PropertiesI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PROPERTIES_I_H
-#define ICE_PROPERTIES_I_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <Ice/Properties.h>
@@ -89,5 +88,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 8867fa8948f..61f675e9675 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -12,8 +12,7 @@
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
-#ifndef ICE_INTERNAL_PropertyNames_H
-#define ICE_INTERNAL_PropertyNames_H
+#pragma once
 
 #include <Ice/Config.h>
 
@@ -75,5 +74,3 @@ public:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/ProxyFactory.h b/cpp/src/Ice/ProxyFactory.h
index 0c94420816c..80dcd548bb7 100644
--- a/cpp/src/Ice/ProxyFactory.h
+++ b/cpp/src/Ice/ProxyFactory.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PROXY_FACTORY_H
-#define ICE_PROXY_FACTORY_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Mutex.h>
@@ -53,5 +52,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index e0be9af7b3a..615275af993 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_REFERENCE_H
-#define ICE_REFERENCE_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/RecMutex.h>
@@ -294,5 +293,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/ReferenceFactory.h b/cpp/src/Ice/ReferenceFactory.h
index dd1982f96de..cafd428f07e 100644
--- a/cpp/src/Ice/ReferenceFactory.h
+++ b/cpp/src/Ice/ReferenceFactory.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_REFERENCE_FACTORY_H
-#define ICE_REFERENCE_FACTORY_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <Ice/ReferenceFactoryF.h>
@@ -76,5 +75,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/ReferenceFactoryF.h b/cpp/src/Ice/ReferenceFactoryF.h
index 52c8ea0a17c..4ed346064ca 100644
--- a/cpp/src/Ice/ReferenceFactoryF.h
+++ b/cpp/src/Ice/ReferenceFactoryF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_REFERENCE_FACTORY_F_H
-#define ICE_REFERENCE_FACTORY_F_H
+#pragma once
 
 #include <Ice/Handle.h>
 
@@ -20,5 +19,3 @@ IceUtil::Shared* upCast(ReferenceFactory*);
 typedef Handle<ReferenceFactory> ReferenceFactoryPtr;
 
 }
-
-#endif
diff --git a/cpp/src/Ice/ReplyStatus.h b/cpp/src/Ice/ReplyStatus.h
index 0f3dccad897..ff6929ca72a 100644
--- a/cpp/src/Ice/ReplyStatus.h
+++ b/cpp/src/Ice/ReplyStatus.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_REPLY_STATUS_H
-#define ICE_REPLY_STATUS_H
+#pragma once
 
 #include <Ice/Config.h>
 
@@ -25,5 +24,3 @@ static const Ice::Byte replyUnknownUserException = 6;
 static const Ice::Byte replyUnknownException = 7;
 
 }
-
-#endif
diff --git a/cpp/src/Ice/RequestHandler.h b/cpp/src/Ice/RequestHandler.h
index 3efd72108fb..1dd85e9ace3 100644
--- a/cpp/src/Ice/RequestHandler.h
+++ b/cpp/src/Ice/RequestHandler.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_REQUEST_HANDLER_H
-#define ICE_REQUEST_HANDLER_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -52,5 +51,3 @@ protected:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/RetryQueue.h b/cpp/src/Ice/RetryQueue.h
index fdfcaa1fe70..b0a875d1a32 100644
--- a/cpp/src/Ice/RetryQueue.h
+++ b/cpp/src/Ice/RetryQueue.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_RETRY_QUEUE_H
-#define ICE_RETRY_QUEUE_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Mutex.h>
@@ -57,6 +56,3 @@ private:
 };
 
 }
-
-#endif
-
diff --git a/cpp/src/Ice/RetryQueueF.h b/cpp/src/Ice/RetryQueueF.h
index 2cdea2a6c53..ca39e18b7e5 100644
--- a/cpp/src/Ice/RetryQueueF.h
+++ b/cpp/src/Ice/RetryQueueF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_RETRY_QUEUE_F_H
-#define ICE_RETRY_QUEUE_F_H
+#pragma once
 
 #include <Ice/Handle.h>
 
@@ -20,5 +19,3 @@ IceUtil::Shared* upCast(RetryQueue*);
 typedef Handle<RetryQueue> RetryQueuePtr;
 
 }
-
-#endif
diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h
index 9e94bee435f..52801b57651 100644
--- a/cpp/src/Ice/RouterInfo.h
+++ b/cpp/src/Ice/RouterInfo.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ROUTER_INFO_H
-#define ICE_ROUTER_INFO_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Mutex.h>
@@ -104,5 +103,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/RouterInfoF.h b/cpp/src/Ice/RouterInfoF.h
index ecdb4074873..e05324c01cf 100644
--- a/cpp/src/Ice/RouterInfoF.h
+++ b/cpp/src/Ice/RouterInfoF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ROUTER_INFO_F_H
-#define ICE_ROUTER_INFO_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -26,5 +25,3 @@ IceUtil::Shared* upCast(RouterInfo*);
 typedef Handle<RouterInfo> RouterInfoPtr;
 
 }
-
-#endif
diff --git a/cpp/src/Ice/Selector.h b/cpp/src/Ice/Selector.h
index 4ba45a9e4f3..cf3e152ff55 100644
--- a/cpp/src/Ice/Selector.h
+++ b/cpp/src/Ice/Selector.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SELECTOR_H
-#define ICE_SELECTOR_H
+#pragma once
 
 #include <IceUtil/StringUtil.h>
 
@@ -225,5 +224,3 @@ private:
 #endif
 
 }
-
-#endif
diff --git a/cpp/src/Ice/ServantManager.h b/cpp/src/Ice/ServantManager.h
index 5ee56eb4e02..3f2f63402e8 100644
--- a/cpp/src/Ice/ServantManager.h
+++ b/cpp/src/Ice/ServantManager.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SERVANT_MANAGER_H
-#define ICE_SERVANT_MANAGER_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Mutex.h>
@@ -70,5 +69,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/SharedContext.h b/cpp/src/Ice/SharedContext.h
index 48910f7270b..8e906d8527e 100644
--- a/cpp/src/Ice/SharedContext.h
+++ b/cpp/src/Ice/SharedContext.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SHARED_CONTEXT_H
-#define ICE_SHARED_CONTEXT_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
@@ -47,5 +46,3 @@ private:
 };
 typedef IceUtil::Handle<SharedContext> SharedContextPtr;
 }
-
-#endif
diff --git a/cpp/src/Ice/StreamI.h b/cpp/src/Ice/StreamI.h
index 066c2c6e32b..9356572ac49 100644
--- a/cpp/src/Ice/StreamI.h
+++ b/cpp/src/Ice/StreamI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_STREAM_I_H
-#define ICE_STREAM_I_H
+#pragma once
 
 #include <Ice/Stream.h>
 
@@ -218,5 +217,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/SysLoggerI.h b/cpp/src/Ice/SysLoggerI.h
index 5074f6af57f..7675fb77fe7 100644
--- a/cpp/src/Ice/SysLoggerI.h
+++ b/cpp/src/Ice/SysLoggerI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SYS_LOGGER_I_H
-#define ICE_SYS_LOGGER_I_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <Ice/Logger.h>
@@ -37,5 +36,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/TcpAcceptor.h b/cpp/src/Ice/TcpAcceptor.h
index c54ae4dbb27..8f4a8f78cc6 100644
--- a/cpp/src/Ice/TcpAcceptor.h
+++ b/cpp/src/Ice/TcpAcceptor.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_TCP_ACCEPTOR_H
-#define ICE_TCP_ACCEPTOR_H
+#pragma once
 
 #include <Ice/TransceiverF.h>
 #include <Ice/InstanceF.h>
@@ -64,5 +63,4 @@ private:
 };
 
 }
-#endif
 
diff --git a/cpp/src/Ice/TcpConnector.h b/cpp/src/Ice/TcpConnector.h
index 3b6862cc13b..29fd006ec71 100644
--- a/cpp/src/Ice/TcpConnector.h
+++ b/cpp/src/Ice/TcpConnector.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_TCP_CONNECTOR_H
-#define ICE_TCP_CONNECTOR_H
+#pragma once
 
 #include <Ice/TransceiverF.h>
 #include <Ice/InstanceF.h>
@@ -48,5 +47,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h
index 96c0e6a94e1..7060e23ec75 100644
--- a/cpp/src/Ice/TcpEndpointI.h
+++ b/cpp/src/Ice/TcpEndpointI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_TCP_ENDPOINT_I_H
-#define ICE_TCP_ENDPOINT_I_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <Ice/EndpointI.h>
@@ -84,5 +83,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/TcpTransceiver.h b/cpp/src/Ice/TcpTransceiver.h
index 82099820416..01fd7ac3d11 100644
--- a/cpp/src/Ice/TcpTransceiver.h
+++ b/cpp/src/Ice/TcpTransceiver.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_TCP_TRANSCEIVER_H
-#define ICE_TCP_TRANSCEIVER_H
+#pragma once
 
 #include <Ice/InstanceF.h>
 #include <Ice/TraceLevelsF.h>
@@ -81,5 +80,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h
index 3802d3a75e0..a3deceff4c2 100644
--- a/cpp/src/Ice/ThreadPool.h
+++ b/cpp/src/Ice/ThreadPool.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_THREAD_POOL_H
-#define ICE_THREAD_POOL_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Mutex.h>
@@ -356,6 +355,3 @@ private:
 #endif
 
 };
-
-
-#endif
diff --git a/cpp/src/Ice/ThreadPoolF.h b/cpp/src/Ice/ThreadPoolF.h
index 0c44f48db9a..a658181cf6c 100644
--- a/cpp/src/Ice/ThreadPoolF.h
+++ b/cpp/src/Ice/ThreadPoolF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_THREAD_POOL_F_H
-#define ICE_THREAD_POOL_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -28,5 +27,3 @@ typedef Handle<ThreadPoolWorkItem> ThreadPoolWorkItemPtr;
 class ThreadPoolCurrent;
 
 }
-
-#endif
diff --git a/cpp/src/Ice/TraceLevels.h b/cpp/src/Ice/TraceLevels.h
index c562c3e4be4..34841ab0a9f 100644
--- a/cpp/src/Ice/TraceLevels.h
+++ b/cpp/src/Ice/TraceLevels.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_TRACE_LEVELS_H
-#define ICE_TRACE_LEVELS_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <Ice/TraceLevelsF.h>
@@ -46,5 +45,3 @@ public:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/TraceLevelsF.h b/cpp/src/Ice/TraceLevelsF.h
index da3a12d0b98..42dc6fc5380 100644
--- a/cpp/src/Ice/TraceLevelsF.h
+++ b/cpp/src/Ice/TraceLevelsF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_TRACE_LEVELS_F_H
-#define ICE_TRACE_LEVELS_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -22,5 +21,3 @@ ICE_API IceUtil::Shared* upCast(TraceLevels*);
 typedef Handle<TraceLevels> TraceLevelsPtr;
 
 }
-
-#endif
diff --git a/cpp/src/Ice/TraceUtil.h b/cpp/src/Ice/TraceUtil.h
index c45cb8b01a0..c0b787a4921 100644
--- a/cpp/src/Ice/TraceUtil.h
+++ b/cpp/src/Ice/TraceUtil.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_TRACE_UTIL_H
-#define ICE_TRACE_UTIL_H
+#pragma once
 
 #include <Ice/LoggerF.h>
 #include <Ice/TraceLevelsF.h>
@@ -24,5 +23,3 @@ void trace(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const Trace
 void traceSlicing(const char*, const ::std::string&, const char *, const ::Ice::LoggerPtr&);
 
 }
-
-#endif
diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h
index 3cf9b9d867a..5c48034ab45 100644
--- a/cpp/src/Ice/Transceiver.h
+++ b/cpp/src/Ice/Transceiver.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_TRANSCEIVER_H
-#define ICE_TRANSCEIVER_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <Ice/TransceiverF.h>
@@ -42,5 +41,3 @@ public:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/TransceiverF.h b/cpp/src/Ice/TransceiverF.h
index 0c6eae51720..407540d0c9d 100644
--- a/cpp/src/Ice/TransceiverF.h
+++ b/cpp/src/Ice/TransceiverF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_TRANSCEIVER_F_H
-#define ICE_TRANSCEIVER_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -22,5 +21,3 @@ ICE_API IceUtil::Shared* upCast(Transceiver*);
 typedef Handle<Transceiver> TransceiverPtr;
 
 }
-
-#endif
diff --git a/cpp/src/Ice/UdpConnector.h b/cpp/src/Ice/UdpConnector.h
index 0055a75638c..abcc78a6f84 100644
--- a/cpp/src/Ice/UdpConnector.h
+++ b/cpp/src/Ice/UdpConnector.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UDP_CONNECTOR_H
-#define ICE_UDP_CONNECTOR_H
+#pragma once
 
 #include <Ice/TransceiverF.h>
 #include <Ice/InstanceF.h>
@@ -51,4 +50,3 @@ private:
 };
 
 }
-#endif
diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h
index 77cdc2a4827..63266da630e 100644
--- a/cpp/src/Ice/UdpEndpointI.h
+++ b/cpp/src/Ice/UdpEndpointI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UDP_ENDPOINT_I_H
-#define ICE_UDP_ENDPOINT_I_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <Ice/EndpointI.h>
@@ -91,5 +90,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h
index 0a1fc7155ba..a189f5263f9 100644
--- a/cpp/src/Ice/UdpTransceiver.h
+++ b/cpp/src/Ice/UdpTransceiver.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UDP_TRANSCEIVER_H
-#define ICE_UDP_TRANSCEIVER_H
+#pragma once
 
 #include <Ice/InstanceF.h>
 #include <Ice/TraceLevelsF.h>
@@ -117,4 +116,4 @@ private:
 };
 
 }
-#endif
+
diff --git a/cpp/src/Ice/winrt/StreamAcceptor.h b/cpp/src/Ice/winrt/StreamAcceptor.h
index d5f84422442..f18d5f3439e 100644
--- a/cpp/src/Ice/winrt/StreamAcceptor.h
+++ b/cpp/src/Ice/winrt/StreamAcceptor.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_STREAM_ACCEPTOR_H
-#define ICE_STREAM_ACCEPTOR_H
+#pragma once
 
 #include <Ice/TransceiverF.h>
 #include <Ice/InstanceF.h>
@@ -65,5 +64,3 @@ private:
 };
 
 }
-#endif
-
diff --git a/cpp/src/Ice/winrt/StreamConnector.h b/cpp/src/Ice/winrt/StreamConnector.h
index 88f8721083a..799adfc18c7 100644
--- a/cpp/src/Ice/winrt/StreamConnector.h
+++ b/cpp/src/Ice/winrt/StreamConnector.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_TCP_CONNECTOR_H
-#define ICE_TCP_CONNECTOR_H
+#pragma once
 
 #include <Ice/TransceiverF.h>
 #include <Ice/InstanceF.h>
@@ -49,5 +48,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/winrt/StreamEndpointI.h b/cpp/src/Ice/winrt/StreamEndpointI.h
index 6d102ff3647..cd7a4cc6549 100644
--- a/cpp/src/Ice/winrt/StreamEndpointI.h
+++ b/cpp/src/Ice/winrt/StreamEndpointI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_TCP_ENDPOINT_I_H
-#define ICE_TCP_ENDPOINT_I_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <Ice/EndpointI.h>
@@ -86,5 +85,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/Ice/winrt/StreamTransceiver.h b/cpp/src/Ice/winrt/StreamTransceiver.h
index 11d27eee6ff..ffab6874589 100644
--- a/cpp/src/Ice/winrt/StreamTransceiver.h
+++ b/cpp/src/Ice/winrt/StreamTransceiver.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_STREAM_TRANSCEIVER_H
-#define ICE_STREAM_TRANSCEIVER_H
+#pragma once
 
 #include <Ice/InstanceF.h>
 #include <Ice/TraceLevelsF.h>
@@ -89,5 +88,3 @@ private:
 };
 
 }
-
-#endif