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

50 files changed, 50 insertions, 198 deletions

diff --git a/cpp/src/IceGrid/Activator.h b/cpp/src/IceGrid/Activator.h
index 99af1b1fa84..3e0ecc14c6e 100644
--- a/cpp/src/IceGrid/Activator.h
+++ b/cpp/src/IceGrid/Activator.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_ACTIVATOR_H
-#define ICE_GRID_ACTIVATOR_H
+#pragma once
 
 #include <IceUtil/Thread.h>
 #include <IceGrid/Internal.h>
@@ -95,5 +94,3 @@ private:
 typedef IceUtil::Handle<Activator> ActivatorPtr;
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h
index 9a42d62b645..9a466b37933 100644
--- a/cpp/src/IceGrid/AdapterCache.h
+++ b/cpp/src/IceGrid/AdapterCache.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_ADAPTERCACHE_H
-#define ICE_GRID_ADAPTERCACHE_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Shared.h>
@@ -146,5 +145,3 @@ private:
 };
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/AdminCallbackRouter.h b/cpp/src/IceGrid/AdminCallbackRouter.h
index 1626ecc6718..0affceba9ef 100644
--- a/cpp/src/IceGrid/AdminCallbackRouter.h
+++ b/cpp/src/IceGrid/AdminCallbackRouter.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_ADMIN_CALLBACK_ROUTER_H
-#define ICE_GRID_ADMIN_CALLBACK_ROUTER_H
+#pragma once
 
 #include <Ice/Ice.h>
 #include <IceUtil/IceUtil.h>
@@ -42,4 +41,3 @@ private:
 
 typedef IceUtil::Handle<AdminCallbackRouter> AdminCallbackRouterPtr;
 }
-#endif
diff --git a/cpp/src/IceGrid/AdminI.h b/cpp/src/IceGrid/AdminI.h
index 14bb30ea639..5ed1c5ee11c 100644
--- a/cpp/src/IceGrid/AdminI.h
+++ b/cpp/src/IceGrid/AdminI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_ADMIN_I_H
-#define ICE_GRID_ADMIN_I_H
+#pragma once
 
 #include <IceGrid/Admin.h>
 
@@ -102,5 +101,3 @@ private:
 typedef IceUtil::Handle<AdminI> AdminIPtr;
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/AdminSessionI.h b/cpp/src/IceGrid/AdminSessionI.h
index ff234953ab3..65a699fa3fd 100644
--- a/cpp/src/IceGrid/AdminSessionI.h
+++ b/cpp/src/IceGrid/AdminSessionI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICEGRID_ADMINSESSIONI_H
-#define ICEGRID_ADMINSESSIONI_H
+#pragma once
 
 #include <IceGrid/SessionI.h>
 #include <IceGrid/Topics.h>
@@ -147,5 +146,3 @@ private:
 };
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/Allocatable.h b/cpp/src/IceGrid/Allocatable.h
index bcbc018053e..12f1bd25f91 100644
--- a/cpp/src/IceGrid/Allocatable.h
+++ b/cpp/src/IceGrid/Allocatable.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_ALLOCATABLE_H
-#define ICE_GRID_ALLOCATABLE_H
+#pragma once
 
 #include <IceUtil/Handle.h>
 #include <IceUtil/Mutex.h>
@@ -113,5 +112,3 @@ protected:
 };
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/AllocatableObjectCache.h b/cpp/src/IceGrid/AllocatableObjectCache.h
index ef304e712ea..a00c1dd24c6 100644
--- a/cpp/src/IceGrid/AllocatableObjectCache.h
+++ b/cpp/src/IceGrid/AllocatableObjectCache.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_ALLOCATABLEOBJECTCACHE_H
-#define ICE_GRID_ALLOCATABLEOBJECTCACHE_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <Ice/CommunicatorF.h>
@@ -114,5 +113,3 @@ private:
 };
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/Cache.h b/cpp/src/IceGrid/Cache.h
index 6e85ed1044c..e1bf02705e3 100644
--- a/cpp/src/IceGrid/Cache.h
+++ b/cpp/src/IceGrid/Cache.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_CACHE_H
-#define ICE_GRID_CACHE_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Shared.h>
@@ -155,5 +154,3 @@ public:
 };
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/DB.h b/cpp/src/IceGrid/DB.h
index 0615f25eecc..eb9607b33f4 100644
--- a/cpp/src/IceGrid/DB.h
+++ b/cpp/src/IceGrid/DB.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef DATABASE_CACHE_H
-#define DATABASE_CACHE_H
+#pragma once
 
 #include <Ice/Plugin.h>
 #include <IceDB/IceDB.h>
@@ -58,6 +57,3 @@ public:
 typedef IceUtil::Handle<DatabasePlugin> DatabasePluginPtr;
 
 }
-
-
-#endif
diff --git a/cpp/src/IceGrid/Database.h b/cpp/src/IceGrid/Database.h
index 18c0b337fe5..bd437619dcf 100644
--- a/cpp/src/IceGrid/Database.h
+++ b/cpp/src/IceGrid/Database.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_DATABASE_H
-#define ICE_GRID_DATABASE_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Shared.h>
@@ -237,5 +236,3 @@ private:
 typedef IceUtil::Handle<Database> DatabasePtr;
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/DescriptorBuilder.h b/cpp/src/IceGrid/DescriptorBuilder.h
index 8472e4bf4fd..3ce9b7ab64b 100644
--- a/cpp/src/IceGrid/DescriptorBuilder.h
+++ b/cpp/src/IceGrid/DescriptorBuilder.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_DESCRIPTOR_BUILDER_H
-#define ICE_GRID_DESCRIPTOR_BUILDER_H
+#pragma once
 
 #include <Ice/Logger.h>
 #include <IceXML/Parser.h>
@@ -311,5 +310,3 @@ private:
 };
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/DescriptorHelper.h b/cpp/src/IceGrid/DescriptorHelper.h
index dbc72e919c9..b2b012c5e49 100644
--- a/cpp/src/IceGrid/DescriptorHelper.h
+++ b/cpp/src/IceGrid/DescriptorHelper.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_DESCRIPTOR_HELPER_H
-#define ICE_GRID_DESCRIPTOR_HELPER_H
+#pragma once
 
 #include <IceUtil/OutputUtil.h>
 #include <IceXML/Parser.h>
@@ -344,5 +343,3 @@ bool descriptorEqual(const ServerDescriptorPtr&, const ServerDescriptorPtr&);
 ServerHelperPtr createHelper(const ServerDescriptorPtr&);
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/DescriptorParser.h b/cpp/src/IceGrid/DescriptorParser.h
index ed808d01ad3..3404a87f7cb 100644
--- a/cpp/src/IceGrid/DescriptorParser.h
+++ b/cpp/src/IceGrid/DescriptorParser.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICEGRID_DESCRIPTOR_PARSER_H
-#define ICEGRID_DESCRIPTOR_PARSER_H
+#pragma once
 
 namespace IceGrid
 {
@@ -28,5 +27,3 @@ public:
 };
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/FileCache.h b/cpp/src/IceGrid/FileCache.h
index eeded1132a2..70de97d1d09 100644
--- a/cpp/src/IceGrid/FileCache.h
+++ b/cpp/src/IceGrid/FileCache.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_FILE_CACHE_H
-#define ICE_GRID_FILE_CACHE_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <Ice/BuiltinSequences.h>
@@ -33,5 +32,3 @@ private:
 typedef IceUtil::Handle<FileCache> FileCachePtr;
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/FileParserI.h b/cpp/src/IceGrid/FileParserI.h
index 811236ed729..11c2b63f407 100644
--- a/cpp/src/IceGrid/FileParserI.h
+++ b/cpp/src/IceGrid/FileParserI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_FILE_PARSERI_H
-#define ICE_GRID_FILE_PARSERI_H
+#pragma once
 
 #include <IceGrid/FileParser.h>
 
@@ -19,5 +18,3 @@ public:
     IceGrid::ApplicationDescriptor
     parse(const std::string& file, const IceGrid::AdminPrx& admin, const Ice::Current&);
 };
-
-#endif
diff --git a/cpp/src/IceGrid/FileUserAccountMapperI.h b/cpp/src/IceGrid/FileUserAccountMapperI.h
index f2e978ab102..4112621bd88 100644
--- a/cpp/src/IceGrid/FileUserAccountMapperI.h
+++ b/cpp/src/IceGrid/FileUserAccountMapperI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_FILEUSERACCOUNTMAPPERI_H
-#define ICE_GRID_FILEUSERACCOUNTMAPPERI_H
+#pragma once
 
 #include <IceGrid/UserAccountMapper.h>
 
@@ -29,5 +28,3 @@ private:
 };
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/FreezeDB/FreezeDB.h b/cpp/src/IceGrid/FreezeDB/FreezeDB.h
index e86c5bd3e69..47bcbb9fc22 100644
--- a/cpp/src/IceGrid/FreezeDB/FreezeDB.h
+++ b/cpp/src/IceGrid/FreezeDB/FreezeDB.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef FREEZE_DATABASE_CACHE_H
-#define FREEZE_DATABASE_CACHE_H
+#pragma once
 
 #include <IceDB/FreezeTypes.h>
 
@@ -48,5 +47,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/InternalRegistryI.h b/cpp/src/IceGrid/InternalRegistryI.h
index 613bbef367c..42400f346b3 100644
--- a/cpp/src/IceGrid/InternalRegistryI.h
+++ b/cpp/src/IceGrid/InternalRegistryI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_INTERNALREGISTRYI_H
-#define ICE_GRID_INTERNALREGISTRYI_H
+#pragma once
 
 #include <IceGrid/Registry.h>
 #include <IceGrid/Internal.h>
@@ -73,5 +72,3 @@ private:
 };
     
 };
-
-#endif
diff --git a/cpp/src/IceGrid/LocatorI.h b/cpp/src/IceGrid/LocatorI.h
index 6e5fb87618b..1ea9447380e 100644
--- a/cpp/src/IceGrid/LocatorI.h
+++ b/cpp/src/IceGrid/LocatorI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_LOCATOR_I_H
-#define ICE_GRID_LOCATOR_I_H
+#pragma once
 
 #include <IceGrid/Internal.h>
 #include <IceGrid/Locator.h>
@@ -80,5 +79,3 @@ protected:
 };
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/LocatorRegistryI.h b/cpp/src/IceGrid/LocatorRegistryI.h
index 7d4065034d8..44bc8e7007d 100644
--- a/cpp/src/IceGrid/LocatorRegistryI.h
+++ b/cpp/src/IceGrid/LocatorRegistryI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_LOCATOR_REGISTRY_I_H
-#define ICE_GRID_LOCATOR_REGISTRY_I_H
+#pragma once
 
 #include <IceGrid/Internal.h>
 #include <Ice/Locator.h>
@@ -55,5 +54,3 @@ private:
 typedef IceUtil::Handle<LocatorRegistryI> LocatorRegistryIPtr;
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/NodeCache.h b/cpp/src/IceGrid/NodeCache.h
index a00f2ce3ba2..03b3a1a914d 100644
--- a/cpp/src/IceGrid/NodeCache.h
+++ b/cpp/src/IceGrid/NodeCache.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_NODECACHE_H
-#define ICE_GRID_NODECACHE_H
+#pragma once
 
 #include <IceUtil/RecMutex.h>
 #include <IceUtil/Shared.h>
@@ -104,5 +103,3 @@ private:
 };
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/NodeI.h b/cpp/src/IceGrid/NodeI.h
index fa9a90c09f0..4d29d853147 100644
--- a/cpp/src/IceGrid/NodeI.h
+++ b/cpp/src/IceGrid/NodeI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_NODE_I_H
-#define ICE_GRID_NODE_I_H
+#pragma once
 
 #include <IceUtil/Timer.h>
 #include <IcePatch2/FileServer.h>
@@ -175,5 +174,3 @@ private:
 typedef IceUtil::Handle<NodeI> NodeIPtr;
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/NodeServerAdminRouter.h b/cpp/src/IceGrid/NodeServerAdminRouter.h
index c649a874152..744e13af22d 100644
--- a/cpp/src/IceGrid/NodeServerAdminRouter.h
+++ b/cpp/src/IceGrid/NodeServerAdminRouter.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_NODE_SERVER_ADMIN_ROUTER_H
-#define ICE_GRID_NODE_SERVER_ADMIN_ROUTER_H
+#pragma once
 
 #include <IceGrid/NodeI.h>
 
@@ -29,4 +28,3 @@ private:
     NodeIPtr _node;
 };
 }
-#endif
diff --git a/cpp/src/IceGrid/NodeSessionI.h b/cpp/src/IceGrid/NodeSessionI.h
index 4e813f26332..55c18fc8e81 100644
--- a/cpp/src/IceGrid/NodeSessionI.h
+++ b/cpp/src/IceGrid/NodeSessionI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICEGRID_NODE_SESSION_H
-#define ICEGRID_NODE_SESSION_H
+#pragma once
 
 #include <IceGrid/Internal.h>
 #include <set>
@@ -101,5 +100,3 @@ private:
 typedef IceUtil::Handle<NodeSessionI> NodeSessionIPtr;
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/NodeSessionManager.h b/cpp/src/IceGrid/NodeSessionManager.h
index 71bd1d032ea..2d8c4694345 100644
--- a/cpp/src/IceGrid/NodeSessionManager.h
+++ b/cpp/src/IceGrid/NodeSessionManager.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_NODE_SESSION_MANAGER_H
-#define ICE_GRID_NODE_SESSION_MANAGER_H
+#pragma once
 
 #include <IceUtil/Handle.h>
 #include <IceUtil/Mutex.h>
@@ -137,5 +136,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/ObjectCache.h b/cpp/src/IceGrid/ObjectCache.h
index 523b90f231e..c1e77dd5e9c 100644
--- a/cpp/src/IceGrid/ObjectCache.h
+++ b/cpp/src/IceGrid/ObjectCache.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_OBJECTCACHE_H
-#define ICE_GRID_OBJECTCACHE_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <Ice/CommunicatorF.h>
@@ -81,5 +80,3 @@ private:
 };
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/Parser.h b/cpp/src/IceGrid/Parser.h
index f53b3a94002..fb5491a2c36 100644
--- a/cpp/src/IceGrid/Parser.h
+++ b/cpp/src/IceGrid/Parser.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_PARSER_H
-#define ICE_GRID_PARSER_H
+#pragma once
 
 #include <IceUtil/Handle.h>
 #include <IceGrid/Admin.h>
@@ -165,5 +164,3 @@ private:
 extern Parser* parser; // The current parser for bison/flex
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/PlatformInfo.h b/cpp/src/IceGrid/PlatformInfo.h
index 1afc7bdb932..1eece75e606 100644
--- a/cpp/src/IceGrid/PlatformInfo.h
+++ b/cpp/src/IceGrid/PlatformInfo.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_PLATFORM_INFO_H
-#define ICE_GRID_PLATFORM_INFO_H
+#pragma once
 
 #include <IceUtil/Thread.h>
 #include <IceGrid/Internal.h>
@@ -88,5 +87,3 @@ private:
 
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/QueryI.h b/cpp/src/IceGrid/QueryI.h
index b64e5cceaac..b1b8baa26c0 100644
--- a/cpp/src/IceGrid/QueryI.h
+++ b/cpp/src/IceGrid/QueryI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_QUERY_I_H
-#define ICE_GRID_QUERY_I_H
+#pragma once
 
 #include <IceGrid/Query.h>
 #include <Ice/CommunicatorF.h>
@@ -44,5 +43,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/ReapThread.h b/cpp/src/IceGrid/ReapThread.h
index 9d4322dd3d6..2e7906cb6af 100644
--- a/cpp/src/IceGrid/ReapThread.h
+++ b/cpp/src/IceGrid/ReapThread.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICEGRID_REAPER_THREAD_H
-#define ICEGRID_REAPER_THREAD_H
+#pragma once
 
 #include <IceUtil/Thread.h>
 #include <IceUtil/Mutex.h>
@@ -113,5 +112,3 @@ private:
 typedef IceUtil::Handle<ReapThread> ReapThreadPtr;
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/RegistryI.h b/cpp/src/IceGrid/RegistryI.h
index a17dbb729f9..aa9c7fcb68c 100644
--- a/cpp/src/IceGrid/RegistryI.h
+++ b/cpp/src/IceGrid/RegistryI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_REGISTRYI_H
-#define ICE_GRID_REGISTRYI_H
+#pragma once
 
 #include <IceUtil/Timer.h>
 #include <IceGrid/Registry.h>
@@ -133,5 +132,3 @@ private:
 typedef IceUtil::Handle<RegistryI> RegistryIPtr;
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/RegistryServerAdminRouter.h b/cpp/src/IceGrid/RegistryServerAdminRouter.h
index 15ed8161626..e8bb41b7c91 100644
--- a/cpp/src/IceGrid/RegistryServerAdminRouter.h
+++ b/cpp/src/IceGrid/RegistryServerAdminRouter.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_REGISTRY_SERVER_ADMIN_ROUTER_H
-#define ICE_GRID_REGISTRY_SERVER_ADMIN_ROUTER_H
+#pragma once
 
 #include <IceGrid/Database.h>
 
@@ -31,4 +30,3 @@ private:
 };
 
 }
-#endif
diff --git a/cpp/src/IceGrid/ReplicaCache.h b/cpp/src/IceGrid/ReplicaCache.h
index 76c9fa5481e..2eaa7c38229 100644
--- a/cpp/src/IceGrid/ReplicaCache.h
+++ b/cpp/src/IceGrid/ReplicaCache.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_REPLICACACHE_H
-#define ICE_GRID_REPLICACACHE_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Shared.h>
@@ -74,5 +73,3 @@ private:
 };
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/ReplicaSessionI.h b/cpp/src/IceGrid/ReplicaSessionI.h
index 9ca0ead61ac..27dfd08ee68 100644
--- a/cpp/src/IceGrid/ReplicaSessionI.h
+++ b/cpp/src/IceGrid/ReplicaSessionI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICEGRID_REPLICA_SESSION_H
-#define ICEGRID_REPLICA_SESSION_H
+#pragma once
 
 #include <IceGrid/Registry.h>
 #include <IceGrid/Internal.h>
@@ -72,5 +71,3 @@ private:
 typedef IceUtil::Handle<ReplicaSessionI> ReplicaSessionIPtr;
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/ReplicaSessionManager.h b/cpp/src/IceGrid/ReplicaSessionManager.h
index 84d9da6aa61..28f626a45a0 100644
--- a/cpp/src/IceGrid/ReplicaSessionManager.h
+++ b/cpp/src/IceGrid/ReplicaSessionManager.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_REPLICA_SESSION_MANAGER_H
-#define ICE_GRID_REPLICA_SESSION_MANAGER_H
+#pragma once
 
 #include <IceUtil/Handle.h>
 #include <IceUtil/Mutex.h>
@@ -109,5 +108,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/ServerAdapterI.h b/cpp/src/IceGrid/ServerAdapterI.h
index db4ce4cc3fb..c2ad30f8c9b 100644
--- a/cpp/src/IceGrid/ServerAdapterI.h
+++ b/cpp/src/IceGrid/ServerAdapterI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_SERVER_ADAPTER_I_H
-#define ICE_GRID_SERVER_ADAPTER_I_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <IceGrid/Internal.h>
@@ -56,5 +55,3 @@ private:
 typedef IceUtil::Handle<ServerAdapterI> ServerAdapterIPtr;
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/ServerCache.h b/cpp/src/IceGrid/ServerCache.h
index c7986a9813e..f1db17fa9b6 100644
--- a/cpp/src/IceGrid/ServerCache.h
+++ b/cpp/src/IceGrid/ServerCache.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_SERVERCACHE_H
-#define ICE_GRID_SERVERCACHE_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Shared.h>
@@ -143,5 +142,3 @@ private:
 };
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/ServerI.h b/cpp/src/IceGrid/ServerI.h
index 591e78854c1..f033a4d8bec 100644
--- a/cpp/src/IceGrid/ServerI.h
+++ b/cpp/src/IceGrid/ServerI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_SERVER_I_H
-#define ICE_GRID_SERVER_I_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Timer.h>
@@ -320,5 +319,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/SessionI.h b/cpp/src/IceGrid/SessionI.h
index e7ca6f3b863..b1660792e13 100644
--- a/cpp/src/IceGrid/SessionI.h
+++ b/cpp/src/IceGrid/SessionI.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICEGRID_SESSIONI_H
-#define ICEGRID_SESSIONI_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Timer.h>
@@ -157,5 +156,3 @@ private:
 };
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/SessionManager.h b/cpp/src/IceGrid/SessionManager.h
index e23ed3aee6a..756c564cea5 100644
--- a/cpp/src/IceGrid/SessionManager.h
+++ b/cpp/src/IceGrid/SessionManager.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_SESSION_MANAGER_H
-#define ICE_GRID_SESSION_MANAGER_H
+#pragma once
 
 #include <IceUtil/Handle.h>
 #include <IceUtil/Mutex.h>
@@ -314,5 +313,3 @@ protected:
 };
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/SessionServantManager.h b/cpp/src/IceGrid/SessionServantManager.h
index 76dfd1f801a..411b9bde459 100644
--- a/cpp/src/IceGrid/SessionServantManager.h
+++ b/cpp/src/IceGrid/SessionServantManager.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_SESSIONSERVANTLOCATOR_H
-#define ICE_GRID_SESSIONSERVANTLOCATOR_H
+#pragma once
 
 #include <IceGrid/AdminCallbackRouter.h>
 #include <IceUtil/Mutex.h>
@@ -84,5 +83,3 @@ private:
 typedef IceUtil::Handle<SessionServantManager> SessionServantManagerPtr;
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/SqlDB/SqlDB.h b/cpp/src/IceGrid/SqlDB/SqlDB.h
index e3b9d77895c..33809d8082c 100644
--- a/cpp/src/IceGrid/SqlDB/SqlDB.h
+++ b/cpp/src/IceGrid/SqlDB/SqlDB.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef SQL_DATABASE_CACHE_H
-#define SQL_DATABASE_CACHE_H
+#pragma once
 
 #include <IceGrid/DB.h>
 
@@ -63,5 +62,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/SqlDB/SqlIdentityObjectInfoDict.h b/cpp/src/IceGrid/SqlDB/SqlIdentityObjectInfoDict.h
index effb29dff56..dbe90d6509a 100644
--- a/cpp/src/IceGrid/SqlDB/SqlIdentityObjectInfoDict.h
+++ b/cpp/src/IceGrid/SqlDB/SqlIdentityObjectInfoDict.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef SQL_IDENTITY_OBJECT_INFO_DICT_H
-#define SQL_IDENTITY_OBJECT_INFO_DICT_H
+#pragma once
 
 #include <Ice/CommunicatorF.h>
 #include <IceGrid/Admin.h>
@@ -43,5 +42,3 @@ private:
 typedef IceUtil::Handle<SqlIdentityObjectInfoDict> SqlIdentityObjectInfoDictPtr;
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/SqlDB/SqlStringAdapterInfoDict.h b/cpp/src/IceGrid/SqlDB/SqlStringAdapterInfoDict.h
index ab846be3d1f..e30395789b9 100644
--- a/cpp/src/IceGrid/SqlDB/SqlStringAdapterInfoDict.h
+++ b/cpp/src/IceGrid/SqlDB/SqlStringAdapterInfoDict.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef SQL_STRING_ADAPTER_INFO_DICT_H
-#define SQL_STRING_ADAPTER_INFO_DICT_H
+#pragma once
 
 #include <Ice/CommunicatorF.h>
 #include <IceGrid/Admin.h>
@@ -43,5 +42,3 @@ private:
 typedef IceUtil::Handle<SqlStringAdapterInfoDict> SqlStringAdapterInfoDictPtr;
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/SqlDB/SqlStringApplicationInfoDict.h b/cpp/src/IceGrid/SqlDB/SqlStringApplicationInfoDict.h
index c92d3eb807a..f7452ab9ec0 100644
--- a/cpp/src/IceGrid/SqlDB/SqlStringApplicationInfoDict.h
+++ b/cpp/src/IceGrid/SqlDB/SqlStringApplicationInfoDict.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef SQL_STRING_APPLICATION_INFO_DICT_H
-#define SQL_STRING_APPLICATION_INFO_DICT_H
+#pragma once
 
 #include <Ice/CommunicatorF.h>
 #include <IceGrid/Admin.h>
@@ -42,5 +41,3 @@ private:
 typedef IceUtil::Handle<SqlStringApplicationInfoDict> SqlStringApplicationInfoDictPtr;
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/Topics.h b/cpp/src/IceGrid/Topics.h
index 7399457d35e..2ee85df44bb 100644
--- a/cpp/src/IceGrid/Topics.h
+++ b/cpp/src/IceGrid/Topics.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICEGRID_TOPICS_H
-#define ICEGRID_TOPICS_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <IceStorm/IceStorm.h>
@@ -161,5 +160,3 @@ private:
 typedef IceUtil::Handle<ObjectObserverTopic> ObjectObserverTopicPtr;
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/TraceLevels.h b/cpp/src/IceGrid/TraceLevels.h
index a3f687b0ebf..127f378fcec 100644
--- a/cpp/src/IceGrid/TraceLevels.h
+++ b/cpp/src/IceGrid/TraceLevels.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_TRACE_LEVELS_H
-#define ICE_GRID_TRACE_LEVELS_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <Ice/CommunicatorF.h>
@@ -60,5 +59,3 @@ public:
 typedef IceUtil::Handle<TraceLevels> TraceLevelsPtr;
 
 } // End namespace IceGrid
-
-#endif
diff --git a/cpp/src/IceGrid/Util.h b/cpp/src/IceGrid/Util.h
index 9ba84619693..c15ec35e0c3 100755
--- a/cpp/src/IceGrid/Util.h
+++ b/cpp/src/IceGrid/Util.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_UTIL_H
-#define ICE_GRID_UTIL_H
+#pragma once
 
 #include <IceGrid/Descriptor.h>
 #include <IceUtil/StringUtil.h>
@@ -118,5 +117,3 @@ inline getMatchingKeys(const T& m, const std::string& expression)
 }
 
 };
-
-#endif
diff --git a/cpp/src/IceGrid/WaitQueue.h b/cpp/src/IceGrid/WaitQueue.h
index 09691c9c04b..83345b2f171 100644
--- a/cpp/src/IceGrid/WaitQueue.h
+++ b/cpp/src/IceGrid/WaitQueue.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_WAIT_QUEUE_H
-#define ICE_GRID_WAIT_QUEUE_H
+#pragma once
 
 #include <IceUtil/Thread.h>
 #include <IceUtil/Monitor.h>
@@ -58,5 +57,3 @@ private:
 typedef IceUtil::Handle<WaitQueue> WaitQueuePtr;
 
 }
-
-#endif
diff --git a/cpp/src/IceGrid/WellKnownObjectsManager.h b/cpp/src/IceGrid/WellKnownObjectsManager.h
index 5ef741840b4..fd1661150fc 100644
--- a/cpp/src/IceGrid/WellKnownObjectsManager.h
+++ b/cpp/src/IceGrid/WellKnownObjectsManager.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_WELL_KNOWN_OBJECTS_MANAGER_H
-#define ICE_GRID_WELL_KNOWN_OBJECTS_MANAGER_H
+#pragma once
 
 #include <IceGrid/Internal.h>
 
@@ -47,5 +46,3 @@ private:
 typedef IceUtil::Handle<WellKnownObjectsManager> WellKnownObjectsManagerPtr;
 
 };
-
-#endif