Merge remote-tracking branch 'origin/master' into encoding11

Conflicts:
	cpp/include/Ice/Stream.h
	cpp/include/Slice/Preprocessor.h
	rb/ruby/Makefile.mak

117 files changed, 139 insertions, 571 deletions

diff --git a/cpp/include/Freeze/Freeze.h b/cpp/include/Freeze/Freeze.h
index 1e1c6df5f32..9165f30d948 100644
--- a/cpp/include/Freeze/Freeze.h
+++ b/cpp/include/Freeze/Freeze.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef FREEZE_FREEZE_H
-#define FREEZE_FREEZE_H
+#pragma once
 
 #include <Freeze/Initialize.h>
 #include <Freeze/BackgroundSaveEvictor.h>
@@ -17,4 +16,3 @@
 #include <Freeze/TransactionHolder.h>
 #include <Freeze/Catalog.h>
 
-#endif
diff --git a/cpp/include/Freeze/Index.h b/cpp/include/Freeze/Index.h
index 7c15bcad8c6..cb05a198ec0 100644
--- a/cpp/include/Freeze/Index.h
+++ b/cpp/include/Freeze/Index.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef FREEZE_INDEX_H
-#define FREEZE_INDEX_H
+#pragma once
 
 #include <Ice/Ice.h>
 #include <Freeze/DB.h>
@@ -56,6 +55,3 @@ private:
 
 typedef IceUtil::Handle<Index> IndexPtr;
 }
-
-#endif
-
diff --git a/cpp/include/Freeze/Initialize.h b/cpp/include/Freeze/Initialize.h
index f355c80f5fa..29a165e5506 100644
--- a/cpp/include/Freeze/Initialize.h
+++ b/cpp/include/Freeze/Initialize.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef FREEZE_INITIALIZE_H
-#define FREEZE_INITIALIZE_H
+#pragma once
 
 #include <Ice/Ice.h>
 #include <Freeze/EvictorF.h>
@@ -108,5 +107,3 @@ 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 10e3ec57771..61cc6a66ed7 100644
--- a/cpp/include/Freeze/Map.h
+++ b/cpp/include/Freeze/Map.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef FREEZE_MAP_H
-#define FREEZE_MAP_H
+#pragma once
 
 #include <Ice/Ice.h>
 #include <iterator>
@@ -1235,5 +1234,3 @@ inline ptrdiff_t* distance_type(const Freeze::IteratorBase&) { return (ptrdiff_t
 }
 
 #endif
-
-#endif
diff --git a/cpp/include/Freeze/TransactionHolder.h b/cpp/include/Freeze/TransactionHolder.h
index 84e973150a2..d3fec8c675c 100644
--- a/cpp/include/Freeze/TransactionHolder.h
+++ b/cpp/include/Freeze/TransactionHolder.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef FREEZE_TRANSACTION_HOLDER_H
-#define FREEZE_TRANSACTION_HOLDER_H
+#pragma once
 
 #include <Freeze/Connection.h>
 #include <Freeze/Transaction.h>
@@ -44,5 +43,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Glacier2/Application.h b/cpp/include/Glacier2/Application.h
index 1cabe12b7c8..6bf8334af94 100644
--- a/cpp/include/Glacier2/Application.h
+++ b/cpp/include/Glacier2/Application.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef GLACIER2_APPLICATION_H
-#define GLACIER2_APPLICATION_H
+#pragma once
 
 #include <Ice/Application.h>
 
@@ -217,5 +216,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Glacier2/Glacier2.h b/cpp/include/Glacier2/Glacier2.h
index a970ac4d11a..f0490cdad44 100644
--- a/cpp/include/Glacier2/Glacier2.h
+++ b/cpp/include/Glacier2/Glacier2.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef GLACIER2_H
-#define GLACIER2_H
+#pragma once
+
 #include <IceUtil/Config.h>
 #include <Glacier2/Router.h>
 #include <Glacier2/Session.h>
@@ -17,5 +17,3 @@
 #   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 687c680ce04..41dac3a908e 100644
--- a/cpp/include/Glacier2/SessionHelper.h
+++ b/cpp/include/Glacier2/SessionHelper.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef GLACIER2_SESSION_HELPER_H
-#define GLACIER2_SESSION_HELPER_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
@@ -112,5 +111,3 @@ private:
 typedef IceUtil::Handle<SessionFactoryHelper> SessionFactoryHelperPtr;
 
 }
-
-#endif
diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h
index 448c88eb97d..d5d41de58e9 100644
--- a/cpp/include/Ice/Application.h
+++ b/cpp/include/Ice/Application.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_APPLICATION_H
-#define ICE_APPLICATION_H
+#pragma once
 
 #include <Ice/Ice.h>
 
@@ -152,5 +151,3 @@ protected:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h
index 595b8895aa4..0ac688ab381 100644
--- a/cpp/include/Ice/BasicStream.h
+++ b/cpp/include/Ice/BasicStream.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_BASIC_STREAM_H
-#define ICE_BASIC_STREAM_H
+#pragma once
 
 #include <Ice/InstanceF.h>
 #include <Ice/ObjectF.h>
@@ -1138,5 +1137,3 @@ private:
 };
 
 } // End namespace IceInternal
-
-#endif
diff --git a/cpp/include/Ice/Buffer.h b/cpp/include/Ice/Buffer.h
index 37f69eb3725..8c1c4339023 100644
--- a/cpp/include/Ice/Buffer.h
+++ b/cpp/include/Ice/Buffer.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_BUFFER_H
-#define ICEE_BUFFER_H
+#pragma once
 
 #include <Ice/Config.h>
 
@@ -150,5 +149,3 @@ public:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Ice/CommunicatorAsync.h b/cpp/include/Ice/CommunicatorAsync.h
index 301daa893f4..e1cd14ac7df 100644
--- a/cpp/include/Ice/CommunicatorAsync.h
+++ b/cpp/include/Ice/CommunicatorAsync.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_COMMUNICATOR_ASYNC_H
-#define ICE_COMMUNICATOR_ASYNC_H
+#pragma once
 
 #include <Ice/Communicator.h>
 
@@ -120,5 +119,3 @@ 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 5322bb31717..bb3231c3a76 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/Config.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_CONFIG_H
-#define ICE_CONFIG_H
+#pragma once
 
 #include <IceUtil/Config.h>
 
@@ -78,5 +77,3 @@ inline int getSystemErrno() { return errno; }
 #endif
 
 }
-
-#endif
diff --git a/cpp/include/Ice/ConnectionAsync.h b/cpp/include/Ice/ConnectionAsync.h
index f33569f083d..a53fe50e002 100644
--- a/cpp/include/Ice/ConnectionAsync.h
+++ b/cpp/include/Ice/ConnectionAsync.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_CONNECTION_ASYNC_H
-#define ICE_CONNECTION_ASYNC_H
+#pragma once
 
 #include <Ice/Connection.h>
 
@@ -120,5 +119,3 @@ 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 5a5b3c123a1..8e2d62712c3 100644
--- a/cpp/include/Ice/ConnectionFactoryF.h
+++ b/cpp/include/Ice/ConnectionFactoryF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_CONNECTION_FACTORY_F_H
-#define ICE_CONNECTION_FACTORY_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -26,5 +25,3 @@ 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 2c3b922edaa..114bc0f8a5f 100644
--- a/cpp/include/Ice/ConnectionIF.h
+++ b/cpp/include/Ice/ConnectionIF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_CONNECTIONI_F_H
-#define ICE_CONNECTIONI_F_H
+#pragma once
 
 #include <Ice/Handle.h>
 #include <Ice/LocalObject.h>
@@ -33,5 +32,3 @@ enum AsyncStatus
 };
 
 }
-
-#endif
diff --git a/cpp/include/Ice/ConnectionMonitorF.h b/cpp/include/Ice/ConnectionMonitorF.h
index ebf80a9f02c..5c61810e5a5 100644
--- a/cpp/include/Ice/ConnectionMonitorF.h
+++ b/cpp/include/Ice/ConnectionMonitorF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_CONNECTION_MONITOR_F_H
-#define ICE_CONNECTION_MONITOR_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -22,5 +21,3 @@ 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 90a8944689f..fde47a9e6cc 100644
--- a/cpp/include/Ice/Direct.h
+++ b/cpp/include/Ice/Direct.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_DIRECT_H
-#define ICE_DIRECT_H
+#pragma once
 
 #include <Ice/ServantLocatorF.h>
 #include <Ice/ReferenceF.h>
@@ -55,5 +54,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Ice/DispatchInterceptor.h b/cpp/include/Ice/DispatchInterceptor.h
index 1949e810983..0515161c9c5 100644
--- a/cpp/include/Ice/DispatchInterceptor.h
+++ b/cpp/include/Ice/DispatchInterceptor.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_DISPATCH_INTERCEPTOR_H
-#define ICE_DISPATCH_INTERCEPTOR_H
+#pragma once
 
 #include <Ice/Object.h>
 
@@ -32,5 +31,3 @@ public:
 typedef IceInternal::Handle<DispatchInterceptor> DispatchInterceptorPtr;
 
 }
-
-#endif
diff --git a/cpp/include/Ice/Dispatcher.h b/cpp/include/Ice/Dispatcher.h
index cc1126f64e2..323ca7afa68 100644
--- a/cpp/include/Ice/Dispatcher.h
+++ b/cpp/include/Ice/Dispatcher.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_DISPATCHER_H
-#define ICE_DISPATCHER_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
@@ -38,5 +37,3 @@ public:
 typedef IceUtil::Handle<Dispatcher> DispatcherPtr;
 
 }
-
-#endif
diff --git a/cpp/include/Ice/DynamicLibrary.h b/cpp/include/Ice/DynamicLibrary.h
index 3a1d79de0a8..dd1aa9f9526 100644
--- a/cpp/include/Ice/DynamicLibrary.h
+++ b/cpp/include/Ice/DynamicLibrary.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_DYNAMIC_LIBRARY_H
-#define ICE_DYNAMIC_LIBRARY_H
+#pragma once
 
 #include <Ice/DynamicLibraryF.h>
 #include <Ice/StringConverter.h>
@@ -87,7 +86,6 @@ private:
 #else
     void* _hnd;
 #endif
-
     std::string _err;
     const Ice::StringConverterPtr _stringConverter;
 };
@@ -105,4 +103,3 @@ private:
 
 }
 
-#endif
diff --git a/cpp/include/Ice/DynamicLibraryF.h b/cpp/include/Ice/DynamicLibraryF.h
index 32b9a01f8d1..184b15a8e57 100644
--- a/cpp/include/Ice/DynamicLibraryF.h
+++ b/cpp/include/Ice/DynamicLibraryF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_DYNAMIC_LIBRARY_F_H
-#define ICE_DYNAMIC_LIBRARY_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -26,4 +25,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 61734728d8c..6f344587828 100644
--- a/cpp/include/Ice/EndpointFactory.h
+++ b/cpp/include/Ice/EndpointFactory.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ENDPOINT_FACTORY_H
-#define ICE_ENDPOINT_FACTORY_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <Ice/EndpointIF.h>
@@ -38,5 +37,3 @@ protected:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Ice/EndpointFactoryF.h b/cpp/include/Ice/EndpointFactoryF.h
index b5a03c4c35a..dc8bbfdb72f 100644
--- a/cpp/include/Ice/EndpointFactoryF.h
+++ b/cpp/include/Ice/EndpointFactoryF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ENDPOINT_FACTORY_F_H
-#define ICE_ENDPOINT_FACTORY_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -22,5 +21,3 @@ 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 4e9c69d1b8b..d1da6324f2a 100644
--- a/cpp/include/Ice/EndpointIF.h
+++ b/cpp/include/Ice/EndpointIF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ENDPOINT_I_F_H
-#define ICE_ENDPOINT_I_F_H
+#pragma once
 
 #include <Ice/Handle.h>
 #include <Ice/LocalObject.h>
@@ -25,5 +24,3 @@ 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 cdc6bb8155c..f0a57f27e4b 100644
--- a/cpp/include/Ice/Exception.h
+++ b/cpp/include/Ice/Exception.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_EXCEPTION_H
-#define ICE_EXCEPTION_H
+#pragma once
 
 #include <IceUtil/Exception.h>
 #include <Ice/Config.h>
@@ -99,5 +98,3 @@ 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 1350c39db14..fe71694cfb2 100644
--- a/cpp/include/Ice/FactoryTable.h
+++ b/cpp/include/Ice/FactoryTable.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_FACTORYTABLE_H
-#define ICE_FACTORYTABLE_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <Ice/UserExceptionFactory.h>
@@ -45,5 +44,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Ice/FactoryTableInit.h b/cpp/include/Ice/FactoryTableInit.h
index 2e793e0c980..09a18ee8429 100644
--- a/cpp/include/Ice/FactoryTableInit.h
+++ b/cpp/include/Ice/FactoryTableInit.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_FACTORYTABLEINIT_H
-#define ICE_FACTORYTABLEINIT_H
+#pragma once
 
 #include <Ice/FactoryTable.h>
 
@@ -28,5 +27,3 @@ 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 6349a1d371a..28926302e9b 100644
--- a/cpp/include/Ice/Functional.h
+++ b/cpp/include/Ice/Functional.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_FUNCTIONAL_H
-#define ICE_FUNCTIONAL_H
+#pragma once
 
 #include <IceUtil/Functional.h>
 #include <Ice/Handle.h>
@@ -134,5 +133,3 @@ secondConstVoidMemFun1(void (T::*p)(A) const)
 }
 
 }
-
-#endif
diff --git a/cpp/include/Ice/GCCountMap.h b/cpp/include/Ice/GCCountMap.h
index fded894b317..a27f9465c1a 100644
--- a/cpp/include/Ice/GCCountMap.h
+++ b/cpp/include/Ice/GCCountMap.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GCCOUNTMAP_H
-#define ICE_GCCOUNTMAP_H
+#pragma once
 
 #include <map>
 
@@ -20,5 +19,3 @@ class GCShared;
 typedef ::std::map<GCShared*, int> GCCountMap;
 
 }
-
-#endif
diff --git a/cpp/include/Ice/GCShared.h b/cpp/include/Ice/GCShared.h
index e83332c1649..3edcf98ee33 100644
--- a/cpp/include/Ice/GCShared.h
+++ b/cpp/include/Ice/GCShared.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GC_SHARED_H
-#define ICE_GC_SHARED_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <Ice/Config.h>
@@ -49,5 +48,3 @@ protected:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Ice/Handle.h b/cpp/include/Ice/Handle.h
index e38a02ffb61..1d1703d36c7 100644
--- a/cpp/include/Ice/Handle.h
+++ b/cpp/include/Ice/Handle.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_HANDLE_H
-#define ICE_HANDLE_H
+#pragma once
 
 #include <IceUtil/Handle.h>
 #include <Ice/Config.h>
@@ -36,17 +35,6 @@ template<typename T>
 class Handle : public ::IceUtil::HandleBase<T>
 {
 public:
-    
-#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
-    //
-    // C++Builder 2009 does not allow setting Ptr to 0.
-    //
-    Handle(int p)
-    {
-        assert(p == 0);
-        this->_ptr = 0;
-    }
-#endif
 
     Handle(T* p = 0)
     {
@@ -183,21 +171,13 @@ public:
     template<class Y>
     static Handle dynamicCast(const ::IceUtil::HandleBase<Y>& r)
     {
-#ifdef __BCPLUSPLUS__
-        return Handle<T>(dynamic_cast<T*>(r._ptr));
-#else
         return Handle(dynamic_cast<T*>(r._ptr));
-#endif
     }
 
     template<class Y>
     static Handle dynamicCast(Y* p)
     {
-#ifdef __BCPLUSPLUS__
-        return Handle<T>(dynamic_cast<T*>(p));
-#else
         return Handle(dynamic_cast<T*>(p));
-#endif
     }
 
     void __clearHandleUnsafe()
@@ -207,5 +187,3 @@ public:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index 27cdf17dcd6..6fc7f119645 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ICE_H
-#define ICE_ICE_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <Ice/Initialize.h>
@@ -44,5 +43,3 @@
 #ifndef _WIN32
 #include <Ice/IconvStringConverter.h>
 #endif
-
-#endif
diff --git a/cpp/include/Ice/IconvStringConverter.h b/cpp/include/Ice/IconvStringConverter.h
index 2ab569ebbb4..5df0dacf802 100644
--- a/cpp/include/Ice/IconvStringConverter.h
+++ b/cpp/include/Ice/IconvStringConverter.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ICONV_STRING_CONVERTER
-#define ICE_ICONV_STRING_CONVERTER
+#pragma once
 
 #include <Ice/StringConverter.h>
 #include <Ice/UndefSysMacros.h>
@@ -368,5 +367,3 @@ 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 6c1530bc8a4..635ed3709b4 100644
--- a/cpp/include/Ice/Incoming.h
+++ b/cpp/include/Ice/Incoming.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_INCOMING_H
-#define ICE_INCOMING_H
+#pragma once
 
 #include <Ice/InstanceF.h>
 #include <Ice/ConnectionIF.h>
@@ -121,5 +120,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h
index b8ec39eb61c..7c29f4ff243 100644
--- a/cpp/include/Ice/IncomingAsync.h
+++ b/cpp/include/Ice/IncomingAsync.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_INCOMING_ASYNC_H
-#define ICE_INCOMING_ASYNC_H
+#pragma once
 
 #include <Ice/IncomingAsyncF.h>
 #include <Ice/Incoming.h>
@@ -104,5 +103,3 @@ public:
 }
 
 }
-
-#endif
diff --git a/cpp/include/Ice/IncomingAsyncF.h b/cpp/include/Ice/IncomingAsyncF.h
index 5b0d0790745..7e7087f1dc3 100644
--- a/cpp/include/Ice/IncomingAsyncF.h
+++ b/cpp/include/Ice/IncomingAsyncF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_INCOMING_ASYNC_F_H
-#define ICE_INCOMING_ASYNC_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -31,5 +30,3 @@ 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 57a0fc55a56..0979547366d 100644
--- a/cpp/include/Ice/Initialize.h
+++ b/cpp/include/Ice/Initialize.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_INITIALIZE_H
-#define ICE_INITIALIZE_H
+#pragma once
 
 #include <Ice/CommunicatorF.h>
 #include <Ice/PropertiesF.h>
@@ -121,5 +120,3 @@ 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 9ce92354595..2e1dd7dedc1 100644
--- a/cpp/include/Ice/InstanceF.h
+++ b/cpp/include/Ice/InstanceF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_INSTANCE_F_H
-#define ICE_INSTANCE_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -22,5 +21,3 @@ 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 657136182b2..39d9cb2aca1 100644
--- a/cpp/include/Ice/LocalObject.h
+++ b/cpp/include/Ice/LocalObject.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_LOCAL_OBJECT_H
-#define ICE_LOCAL_OBJECT_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <Ice/LocalObjectF.h>
@@ -38,5 +37,3 @@ public:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Ice/LocalObjectF.h b/cpp/include/Ice/LocalObjectF.h
index c8591c24352..4c87038d5a6 100644
--- a/cpp/include/Ice/LocalObjectF.h
+++ b/cpp/include/Ice/LocalObjectF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_LOCAL_OBJECT_F_H
-#define ICE_LOCAL_OBJECT_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -22,5 +21,3 @@ 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 fec7e79f75b..ab056984b9b 100644
--- a/cpp/include/Ice/LoggerUtil.h
+++ b/cpp/include/Ice/LoggerUtil.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_LOGGER_UTIL_H
-#define ICE_LOGGER_UTIL_H
+#pragma once
 
 #include <Ice/LoggerF.h>
 #include <Ice/CommunicatorF.h>
@@ -119,5 +118,3 @@ public:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h
index 831842c6ad8..d91d1acc5bb 100644
--- a/cpp/include/Ice/Object.h
+++ b/cpp/include/Ice/Object.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_OBJECT_H
-#define ICE_OBJECT_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Shared.h>
@@ -173,5 +172,3 @@ 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 7e2a937cadd..145ec884c15 100644
--- a/cpp/include/Ice/ObjectAdapterFactoryF.h
+++ b/cpp/include/Ice/ObjectAdapterFactoryF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_OBJECT_ADAPTER_FACTORY_F_H
-#define ICE_OBJECT_ADAPTER_FACTORY_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -22,5 +21,3 @@ 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 5946be23dd0..c4953df3d44 100644
--- a/cpp/include/Ice/ObjectF.h
+++ b/cpp/include/Ice/ObjectF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_OBJECT_F_H
-#define ICE_OBJECT_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <Ice/Handle.h>
@@ -22,5 +21,3 @@ 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 ca1d25161fd..58e0dc28d66 100644
--- a/cpp/include/Ice/Outgoing.h
+++ b/cpp/include/Ice/Outgoing.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_OUTGOING_H
-#define ICE_OUTGOING_H
+#pragma once
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Monitor.h>
@@ -197,5 +196,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
index b391c456a35..ab8e59d8ea1 100644
--- a/cpp/include/Ice/OutgoingAsync.h
+++ b/cpp/include/Ice/OutgoingAsync.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_OUTGOING_ASYNC_H
-#define ICE_OUTGOING_ASYNC_H
+#pragma once
 
 #include <IceUtil/Monitor.h>
 #include <IceUtil/Mutex.h>
@@ -463,5 +462,3 @@ public:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Ice/OutgoingAsyncF.h b/cpp/include/Ice/OutgoingAsyncF.h
index 5b6f4daa1e4..1feb42cead2 100644
--- a/cpp/include/Ice/OutgoingAsyncF.h
+++ b/cpp/include/Ice/OutgoingAsyncF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_OUTGOING_ASYNC_F_H
-#define ICE_OUTGOING_ASYNC_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -51,5 +50,3 @@ 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 cf14d1b85a8..0a83c4ddbac 100644
--- a/cpp/include/Ice/Protocol.h
+++ b/cpp/include/Ice/Protocol.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PROTOCOL_H
-#define ICE_PROTOCOL_H
+#pragma once
 
 #include <Ice/Config.h>
 #include <Ice/Version.h>
@@ -188,5 +187,3 @@ checkSupportedEncoding(const Ice::EncodingVersion& v)
 }
 
 }
-
-#endif
diff --git a/cpp/include/Ice/ProtocolPluginFacade.h b/cpp/include/Ice/ProtocolPluginFacade.h
index 7290cfdf115..c4283e3b03a 100644
--- a/cpp/include/Ice/ProtocolPluginFacade.h
+++ b/cpp/include/Ice/ProtocolPluginFacade.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PROTOCOL_PLUGIN_FACADE_H
-#define ICE_PROTOCOL_PLUGIN_FACADE_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Shared.h>
@@ -89,5 +88,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Ice/ProtocolPluginFacadeF.h b/cpp/include/Ice/ProtocolPluginFacadeF.h
index 9e8f0d1c7c1..02e2e8ea999 100644
--- a/cpp/include/Ice/ProtocolPluginFacadeF.h
+++ b/cpp/include/Ice/ProtocolPluginFacadeF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PROTOCOL_PLUGIN_FACADE_F_H
-#define ICE_PROTOCOL_PLUGIN_FACADE_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -22,5 +21,3 @@ 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 2293194980b..ca179a1d89d 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PROXY_H
-#define ICE_PROXY_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Mutex.h>
@@ -2201,5 +2200,3 @@ newCallback_Object_ice_flushBatchRequests(T* instance,
 }
 
 }
-
-#endif
diff --git a/cpp/include/Ice/ProxyF.h b/cpp/include/Ice/ProxyF.h
index 82bf18c497e..108cdee7447 100644
--- a/cpp/include/Ice/ProxyF.h
+++ b/cpp/include/Ice/ProxyF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PROXY_F_H
-#define ICE_PROXY_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -73,6 +72,3 @@ 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 a450f9e4c99..c915ffaa6ee 100644
--- a/cpp/include/Ice/ProxyFactoryF.h
+++ b/cpp/include/Ice/ProxyFactoryF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PROXY_FACTORY_F_H
-#define ICE_PROXY_FACTORY_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -22,5 +21,3 @@ 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 2d245f44674..b23958d26d5 100644
--- a/cpp/include/Ice/ProxyHandle.h
+++ b/cpp/include/Ice/ProxyHandle.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PROXY_HANDLE_H
-#define ICE_PROXY_HANDLE_H
+#pragma once
 
 #include <IceUtil/Handle.h>
 #include <Ice/Config.h>
@@ -114,17 +113,6 @@ template<typename T>
 class ProxyHandle : public ::IceUtil::HandleBase<T>
 {
 public:
-
-#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
-    //
-    // C++Builder 2009 does not allow setting Prx to 0.
-    //
-    ProxyHandle(int p)
-    {
-	assert(p == 0);
-        this->_ptr = 0;
-    }
-#endif
     
     ProxyHandle(T* p = 0)
     {
@@ -332,5 +320,3 @@ 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 80f4d87d08d..99af2a09af2 100644
--- a/cpp/include/Ice/ReferenceF.h
+++ b/cpp/include/Ice/ReferenceF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_REFERENCE_F_H
-#define ICE_REFERENCE_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -30,5 +29,3 @@ 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 cc5df85be4a..d637da51f10 100644
--- a/cpp/include/Ice/RequestHandlerF.h
+++ b/cpp/include/Ice/RequestHandlerF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_REQUEST_HANDLER_F_H
-#define ICE_REQUEST_HANDLER_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <Ice/Handle.h>
@@ -21,5 +20,3 @@ 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 4ae03595ad5..395349506bd 100644
--- a/cpp/include/Ice/ServantManagerF.h
+++ b/cpp/include/Ice/ServantManagerF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SERVANT_MANAGER_F_H
-#define ICE_SERVANT_MANAGER_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -22,5 +21,3 @@ 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 77108a14db5..8b24f58e192 100644
--- a/cpp/include/Ice/Service.h
+++ b/cpp/include/Ice/Service.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SERVICE_H
-#define ICE_SERVICE_H
+#pragma once
 
 #include <Ice/Ice.h>
 
@@ -262,5 +261,3 @@ public:
 };
 
 } // End of namespace Ice
-
-#endif
diff --git a/cpp/include/Ice/SliceChecksums.h b/cpp/include/Ice/SliceChecksums.h
index cfbdc7c997f..8fec4b60c86 100644
--- a/cpp/include/Ice/SliceChecksums.h
+++ b/cpp/include/Ice/SliceChecksums.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SLICE_CHECKSUM_H
-#define ICE_SLICE_CHECKSUM_H
+#pragma once
 
 #include <Ice/SliceChecksumDict.h>
 
@@ -30,5 +29,3 @@ public:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/Stream.h
index 4244be03899..b4b75516213 100644
--- a/cpp/include/Ice/Stream.h
+++ b/cpp/include/Ice/Stream.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_STREAM_H
-#define ICE_STREAM_H
+#pragma once
 
 #include <Ice/StreamF.h>
 #include <Ice/CommunicatorF.h>
@@ -98,18 +97,6 @@ public:
     virtual void sliceObjects(bool) = 0;
 
     //
-    // COMPILERFIX: BCC2010 doesn't allow use of full specialization over
-    // partial specialization.
-    //
-#ifdef __BCPLUSPLUS__
-    void
-    read(::std::_Vb_reference<unsigned int, int> v)
-    {
-        v = readBool();
-    }
-#endif
-
-    //
     // Sequences of bool are handled specifically because C++
     // optimizations for vector<bool> prevent us from reading vector
     // of bools the same way as other sequences.
@@ -434,5 +421,3 @@ protected:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Ice/StreamF.h b/cpp/include/Ice/StreamF.h
index 9fec3ce1d71..92ad61869cf 100644
--- a/cpp/include/Ice/StreamF.h
+++ b/cpp/include/Ice/StreamF.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_STREAM_F_H
-#define ICE_STREAM_F_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 
@@ -26,5 +25,3 @@ 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 28ee9bb3b9b..7452b90c845 100644
--- a/cpp/include/Ice/StringConverter.h
+++ b/cpp/include/Ice/StringConverter.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_STRING_CONVERTER_H
-#define ICE_STRING_CONVERTER_H
+#pragma once
 
 #include <Ice/Config.h>
 #include <Ice/CommunicatorF.h>
@@ -157,5 +156,3 @@ 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 d412fd1b26d..32ccd926258 100644
--- a/cpp/include/Ice/UndefSysMacros.h
+++ b/cpp/include/Ice/UndefSysMacros.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UNDEF_SYS_MACROS_H
-#define ICE_UNDEF_SYS_MACROS_H
+#pragma once
 
 //
 // This header includes macros that can end up being dragged into
@@ -38,5 +37,3 @@
 #ifdef max
 #undef max
 #endif
-
-#endif
diff --git a/cpp/include/Ice/UserExceptionFactory.h b/cpp/include/Ice/UserExceptionFactory.h
index fd0e97f1cae..2fa176d3d68 100644
--- a/cpp/include/Ice/UserExceptionFactory.h
+++ b/cpp/include/Ice/UserExceptionFactory.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_USER_EXCEPTION_FACTORY_H
-#define ICE_USER_EXCEPTION_FACTORY_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
@@ -28,5 +27,3 @@ public:
 typedef ::IceUtil::Handle<UserExceptionFactory> UserExceptionFactoryPtr;
 
 };
-
-#endif
diff --git a/cpp/include/IceGrid/IceGrid.h b/cpp/include/IceGrid/IceGrid.h
index 34e1ed0d854..e2f87bf9d43 100644
--- a/cpp/include/IceGrid/IceGrid.h
+++ b/cpp/include/IceGrid/IceGrid.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICEGRID_H
-#define ICEGRID_H
+#pragma once
 
 #include <IceGrid/Admin.h>
 #include <IceGrid/Descriptor.h>
@@ -20,5 +19,3 @@
 #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 917abc28f2e..4e110f301d1 100644
--- a/cpp/include/IcePatch2/ClientUtil.h
+++ b/cpp/include/IcePatch2/ClientUtil.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PATCH2_CLIENT_UTIL_H
-#define ICE_PATCH2_CLIENT_UTIL_H
+#pragma once
 
 #include <Ice/Ice.h>
 #include <IceUtil/Thread.h>
@@ -161,5 +160,3 @@ private:
 typedef IceUtil::Handle<Patcher> PatcherPtr;
 
 }
-
-#endif
diff --git a/cpp/include/IcePatch2/Util.h b/cpp/include/IcePatch2/Util.h
index 8b92ba88afe..3813d675bc1 100644
--- a/cpp/include/IcePatch2/Util.h
+++ b/cpp/include/IcePatch2/Util.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PATCH2_UTIL_H
-#define ICE_PATCH2_UTIL_H
+#pragma once
 
 #include <Ice/Ice.h>
 #include <IcePatch2/FileInfo.h>
@@ -188,5 +187,3 @@ 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 8ffa97c6618..450e3c2b34e 100644
--- a/cpp/include/IceSSL/IceSSL.h
+++ b/cpp/include/IceSSL/IceSSL.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_ICE_SSL_H
-#define ICE_SSL_ICE_SSL_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #ifndef ICE_OS_WINRT
@@ -16,5 +15,3 @@
 #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 b9cf292a41b..ff67ba55a43 100644
--- a/cpp/include/IceSSL/Plugin.h
+++ b/cpp/include/IceSSL/Plugin.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_PLUGIN_H
-#define ICE_SSL_PLUGIN_H
+#pragma once
 
 #include <IceUtil/Time.h>
 #include <Ice/Plugin.h>
@@ -454,5 +453,3 @@ public:
 typedef IceUtil::Handle<Plugin> PluginPtr;
 
 }
-
-#endif
diff --git a/cpp/include/IceUtil/AbstractMutex.h b/cpp/include/IceUtil/AbstractMutex.h
index 13fd6855234..c0805160a1e 100644
--- a/cpp/include/IceUtil/AbstractMutex.h
+++ b/cpp/include/IceUtil/AbstractMutex.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_ABSTRACT_MUTEX_H
-#define ICE_UTIL_ABSTRACT_MUTEX_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Lock.h>
@@ -36,10 +35,8 @@ class AbstractMutexI : public AbstractMutex, public T
 {
 public:
 
-#ifndef __BCPLUSPLUS__
     typedef LockT<AbstractMutexI> Lock;
     typedef TryLockT<AbstractMutexI> TryLock;
-#endif
 
     virtual void lock() const
     {
@@ -65,10 +62,8 @@ class AbstractMutexReadI : public AbstractMutex, public T
 {
 public:
 
-#ifndef __BCPLUSPLUS__
     typedef LockT<AbstractMutexReadI> Lock;
     typedef TryLockT<AbstractMutexReadI> TryLock;
-#endif
 
     virtual void lock() const
     {
@@ -94,10 +89,8 @@ class AbstractMutexWriteI : public AbstractMutex, public T
 {
 public:
 
-#ifndef __BCPLUSPLUS__
     typedef LockT<AbstractMutexWriteI> Lock;
     typedef TryLockT<AbstractMutexWriteI> TryLock;
-#endif
 
     virtual void lock() const
     {
@@ -120,5 +113,3 @@ public:
 
 
 }
-
-#endif
diff --git a/cpp/include/IceUtil/ArgVector.h b/cpp/include/IceUtil/ArgVector.h
index 813f7c873d0..0cf29c4de9e 100644
--- a/cpp/include/IceUtil/ArgVector.h
+++ b/cpp/include/IceUtil/ArgVector.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_ARGVECTOR_H
-#define ICE_UTIL_ARGVECTOR_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <vector>
@@ -37,5 +36,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/include/IceUtil/Cache.h b/cpp/include/IceUtil/Cache.h
index e11830ead39..31d6e7cc460 100644
--- a/cpp/include/IceUtil/Cache.h
+++ b/cpp/include/IceUtil/Cache.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_CACHE_H
-#define ICE_UTIL_CACHE_H
+#pragma once
 
 #include <IceUtil/Handle.h>
 #include <IceUtil/Mutex.h>
@@ -175,7 +174,7 @@ Cache<Key, Value>::pin(const Key& key, const Handle<Value>& obj)
     std::pair<typename CacheMap::iterator, bool> ir =
 #endif 
 
-#if defined(_MSC_VER)
+#ifdef _MSC_VER
        _map.insert(CacheMap::value_type(key, CacheValue(obj)));
 #else
        _map.insert(typename CacheMap::value_type(key, CacheValue(obj)));
@@ -229,7 +228,7 @@ Cache<Key, Value>::pinImpl(const Key& key, const Handle<Value>& newObj)
             std::pair<typename CacheMap::iterator, bool> ir =
 #endif          
             
-#if defined(_MSC_VER) || defined(__BCPLUSPLUS__)
+#if defined(_MSC_VER)
                 _map.insert(CacheMap::value_type(key, CacheValue(0)));
 #else
                 _map.insert(typename CacheMap::value_type(key, CacheValue(0)));
@@ -368,5 +367,3 @@ 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 901b779ebc1..ff4aa2a4f4d 100644
--- a/cpp/include/IceUtil/Cond.h
+++ b/cpp/include/IceUtil/Cond.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_COND_H
-#define ICE_UTIL_COND_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Time.h>
@@ -268,5 +267,3 @@ 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 643408d5c6c..d6e89cdf7fe 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_CONFIG_H
-#define ICE_UTIL_CONFIG_H
+#pragma once
 
 //
 // Endianness
@@ -66,7 +65,7 @@
 //
 // TODO: more macros to support IBM Visual Age _Export syntax as well.
 //
-#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && !defined(ICE_STATIC_LIBS)) || \
+#if (defined(_MSC_VER) && !defined(ICE_STATIC_LIBS)) || \
     (defined(__HP_aCC) && defined(__HP_WINDLL))
 #   define ICE_DECLSPEC_EXPORT __declspec(dllexport)
 #   define ICE_DECLSPEC_IMPORT __declspec(dllimport)
@@ -103,7 +102,7 @@
 // TODO: figure out why IceUtil does not compile with _SLTP_DEBUG using
 // the Intel compiler.
 //
-#if !defined(NDEBUG) && !defined(_STLP_DEBUG) && !defined(__INTEL_COMPILER) && !defined(__BCPLUSPLUS__)
+#if !defined(NDEBUG) && !defined(_STLP_DEBUG) && !defined(__INTEL_COMPILER)
 #   define _STLP_DEBUG
 #endif
 
@@ -199,7 +198,7 @@ private:
 //
 // Int64 typedef
 //
-#if defined(__BCPLUSPLUS__) || defined(_MSC_VER)
+#ifdef _MSC_VER
 //
 // On Windows, long is always 32-bit
 //
@@ -215,7 +214,7 @@ typedef long long Int64;
 //
 // ICE_INT64: macro for Int64 literal values
 //
-#if defined(__BCPLUSPLUS__) || defined(_MSC_VER)
+#if defined(_MSC_VER)
 #   define ICE_INT64(n) n##i64
 #elif defined(ICE_64)
 #   define ICE_INT64(n) n##L
@@ -229,25 +228,3 @@ 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
 
-#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
-//
-// Dummy class used in work around for bug in C++Builder 2009
-// http://qc.embarcadero/wc/qcmain.aspx?d=71611
-//
-namespace IceUtil
-{
-
-class DummyBCC
-{
-public:
-
-    ~DummyBCC() 
-    {
-    }
-};
-
-}
-#endif
-
-#endif
-
diff --git a/cpp/include/IceUtil/CountDownLatch.h b/cpp/include/IceUtil/CountDownLatch.h
index ef0d774abd4..bb6305224ef 100644
--- a/cpp/include/IceUtil/CountDownLatch.h
+++ b/cpp/include/IceUtil/CountDownLatch.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_COUNT_DOWN_LATCH_H
-#define ICE_UTIL_COUNT_DOWN_LATCH_H
+#pragma once
 
 #include <IceUtil/Config.h>
 
@@ -46,5 +45,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/include/IceUtil/CtrlCHandler.h b/cpp/include/IceUtil/CtrlCHandler.h
index 5770bbaec79..6614b601c58 100644
--- a/cpp/include/IceUtil/CtrlCHandler.h
+++ b/cpp/include/IceUtil/CtrlCHandler.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_CTRL_C_HANDLER_H
-#define ICE_UTIL_CTRL_C_HANDLER_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Exception.h>
@@ -67,4 +66,3 @@ public:
 
 }
 
-#endif
diff --git a/cpp/include/IceUtil/DisableWarnings.h b/cpp/include/IceUtil/DisableWarnings.h
index a8041ef9b49..cf27472aa3c 100644
--- a/cpp/include/IceUtil/DisableWarnings.h
+++ b/cpp/include/IceUtil/DisableWarnings.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_DISABLEWARNINGS_H
-#define ICE_UTIL_DISABLEWARNINGS_H
+#pragma once
 
 //
 // This header file disables various annoying compiler warnings that
@@ -27,5 +26,3 @@
 #if defined(_MSC_VER) && _MSC_VER >= 1300
 #    pragma warning( 4 : 4996 ) // C4996 'std::<function>' was declared deprecated
 #endif
-
-#endif
diff --git a/cpp/include/IceUtil/Exception.h b/cpp/include/IceUtil/Exception.h
index 03a6fa6d836..9f04171efd9 100644
--- a/cpp/include/IceUtil/Exception.h
+++ b/cpp/include/IceUtil/Exception.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_EXCEPTION_H
-#define ICE_UTIL_EXCEPTION_H
+#pragma once
 
 #include <IceUtil/Config.h>
 
@@ -135,5 +134,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h
index 351c597c7c9..054a8c9fef0 100644
--- a/cpp/include/IceUtil/FileUtil.h
+++ b/cpp/include/IceUtil/FileUtil.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_FILE_UTIL_H
-#define ICE_FILE_UTIL_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Shared.h>
@@ -39,7 +38,7 @@ ICE_UTIL_API bool directoryExists(const std::string&);
 
 #ifdef _WIN32
 
-#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1300))
+#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER < 1300))
 typedef struct _stat structstat;
 #else
 typedef struct _stat64i32 structstat;
@@ -160,4 +159,3 @@ private:
 };
 
 }
-#endif
diff --git a/cpp/include/IceUtil/Functional.h b/cpp/include/IceUtil/Functional.h
index 47281bfa476..6ddbd824461 100644
--- a/cpp/include/IceUtil/Functional.h
+++ b/cpp/include/IceUtil/Functional.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_FUNCTIONAL_H
-#define ICE_UTIL_FUNCTIONAL_H
+#pragma once
 
 #include <IceUtil/Handle.h>
 #include <functional>
@@ -448,5 +447,3 @@ voidbind2nd(const _Operation& __fn, const _Tp& __x)
 _STLP_END_NAMESPACE
 
 #endif
-
-#endif
diff --git a/cpp/include/IceUtil/Handle.h b/cpp/include/IceUtil/Handle.h
index 2eeb58c8830..8e75db3bae4 100644
--- a/cpp/include/IceUtil/Handle.h
+++ b/cpp/include/IceUtil/Handle.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_HANDLE_H
-#define ICE_UTIL_HANDLE_H
+#pragma once
 
 #include <IceUtil/Exception.h>
 #include <algorithm>
@@ -147,17 +146,6 @@ template<typename T>
 class Handle : public HandleBase<T>
 {
 public:
-
-#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
-    //
-    // C++Builder 2009 does not allow setting Ptr to 0.
-    //
-    Handle(int p)
-    {
-        assert(p == 0);
-	this->_ptr = 0;
-    }
-#endif
     
     Handle(T* p = 0)
     {
@@ -262,24 +250,14 @@ public:
     template<class Y>
     static Handle dynamicCast(const HandleBase<Y>& r)
     {
-#ifdef __BCPLUSPLUS__
-        return Handle<T>(dynamic_cast<T*>(r._ptr));
-#else
         return Handle(dynamic_cast<T*>(r._ptr));
-#endif
     }
 
     template<class Y>
     static Handle dynamicCast(Y* p)
     {
-#ifdef __BCPLUSPLUS__
-        return Handle<T>(dynamic_cast<T*>(p));
-#else
         return Handle(dynamic_cast<T*>(p));
-#endif
     }
 };
 
 }
-
-#endif
diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h
index 783bcb6f945..87459b1d6f2 100644
--- a/cpp/include/IceUtil/IceUtil.h
+++ b/cpp/include/IceUtil/IceUtil.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_ICE_UTIL_H
-#define ICE_UTIL_ICE_UTIL_H
+#pragma once
 
 //
 // This file must include *all* other headers of IceUtil, except
@@ -38,5 +37,3 @@
 #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 4bbe0f08780..5428b4754d5 100644
--- a/cpp/include/IceUtil/InputUtil.h
+++ b/cpp/include/IceUtil/InputUtil.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_INPUT_UTIL_H
-#define ICE_UTIL_INPUT_UTIL_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <string>
@@ -43,5 +42,3 @@ 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 c3cc6222a35..e64446121b8 100644
--- a/cpp/include/IceUtil/Iterator.h
+++ b/cpp/include/IceUtil/Iterator.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_ITERATOR_H
-#define ICE_UTIL_ITERATOR_H
+#pragma once
 
 #include <iterator>
 
@@ -33,4 +32,3 @@ distance(ForwardIterator first, ForwardIterator last)
 }
 
 }
-#endif
diff --git a/cpp/include/IceUtil/Lock.h b/cpp/include/IceUtil/Lock.h
index cf5ba793e0b..573ee546653 100644
--- a/cpp/include/IceUtil/Lock.h
+++ b/cpp/include/IceUtil/Lock.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_LOCK_H
-#define ICE_UTIL_LOCK_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <IceUtil/ThreadException.h>
@@ -131,5 +130,3 @@ public:
 };
 
 } // End namespace IceUtil
-
-#endif
diff --git a/cpp/include/IceUtil/Monitor.h b/cpp/include/IceUtil/Monitor.h
index 48733926cce..2b3404aedf1 100644
--- a/cpp/include/IceUtil/Monitor.h
+++ b/cpp/include/IceUtil/Monitor.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_MONITOR_H
-#define ICE_UTIL_MONITOR_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Lock.h>
@@ -245,5 +244,3 @@ IceUtil::Monitor<T>::notifyImpl(int nnotify) const
         }
     }
 }
-
-#endif
diff --git a/cpp/include/IceUtil/Mutex.h b/cpp/include/IceUtil/Mutex.h
index 68c810cf475..3914e325dc3 100644
--- a/cpp/include/IceUtil/Mutex.h
+++ b/cpp/include/IceUtil/Mutex.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_MUTEX_H
-#define ICE_UTIL_MUTEX_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Lock.h>
@@ -325,5 +324,3 @@ Mutex::willUnlock() const
 }
 
 } // End namespace IceUtil
-
-#endif
diff --git a/cpp/include/IceUtil/MutexProtocol.h b/cpp/include/IceUtil/MutexProtocol.h
index a74589f468a..61a956a4b00 100644
--- a/cpp/include/IceUtil/MutexProtocol.h
+++ b/cpp/include/IceUtil/MutexProtocol.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_MUTEX_PROTOCOL_H
-#define ICE_UTIL_MUTEX_PROTOCOL_H
+#pragma once
 
 #include <IceUtil/Config.h>
 
@@ -24,5 +23,3 @@ 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 3574a95a442..c2e4a389c5c 100644
--- a/cpp/include/IceUtil/MutexPtrLock.h
+++ b/cpp/include/IceUtil/MutexPtrLock.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_MUTEX_PTR_LOCK_H
-#define ICE_UTIL_MUTEX_PTR_LOCK_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <IceUtil/ThreadException.h>
@@ -79,5 +78,3 @@ private:
 };
 
 } // End namespace IceUtilInternal
-
-#endif
diff --git a/cpp/include/IceUtil/MutexPtrTryLock.h b/cpp/include/IceUtil/MutexPtrTryLock.h
index 7eb64d242c8..c4b81d47ce7 100644
--- a/cpp/include/IceUtil/MutexPtrTryLock.h
+++ b/cpp/include/IceUtil/MutexPtrTryLock.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_MUTEX_PTR_TRY_LOCK_H
-#define ICE_UTIL_MUTEX_PTR_TRY_LOCK_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Mutex.h>
@@ -78,5 +77,3 @@ private:
 };
 
 } // End namespace IceUtilInternal
-
-#endif
diff --git a/cpp/include/IceUtil/Options.h b/cpp/include/IceUtil/Options.h
index d0edaee22bb..364df237821 100644
--- a/cpp/include/IceUtil/Options.h
+++ b/cpp/include/IceUtil/Options.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_OPTIONS_H
-#define ICE_UTIL_OPTIONS_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <IceUtil/RecMutex.h>
@@ -137,5 +136,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/include/IceUtil/OutputUtil.h b/cpp/include/IceUtil/OutputUtil.h
index d282369c69c..034a4214543 100644
--- a/cpp/include/IceUtil/OutputUtil.h
+++ b/cpp/include/IceUtil/OutputUtil.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_OUTPUT_UTIL_H
-#define ICE_UTIL_OUTPUT_UTIL_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <fstream>
@@ -378,5 +377,3 @@ 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 eb9b2ca0051..9bdd9caad53 100644
--- a/cpp/include/IceUtil/Random.h
+++ b/cpp/include/IceUtil/Random.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_RANDOM_H
-#define ICE_UTIL_RANDOM_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Exception.h>
@@ -20,5 +19,3 @@ ICE_UTIL_API void generateRandom(char*, int);
 ICE_UTIL_API unsigned int random(int = 0);
 
 }
-
-#endif
diff --git a/cpp/include/IceUtil/ScopedArray.h b/cpp/include/IceUtil/ScopedArray.h
index 8e1d0d0ddf0..15571b22b0e 100644
--- a/cpp/include/IceUtil/ScopedArray.h
+++ b/cpp/include/IceUtil/ScopedArray.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_SCOPED_ARRAY_H
-#define ICE_UTIL_SCOPED_ARRAY_H
+#pragma once
 
 #include <IceUtil/Config.h>
 
@@ -86,5 +85,3 @@ private:
 };
 
 } // End of namespace IceUtil
-
-#endif
diff --git a/cpp/include/IceUtil/Shared.h b/cpp/include/IceUtil/Shared.h
index 2412ec1210c..5b3e1b610c4 100644
--- a/cpp/include/IceUtil/Shared.h
+++ b/cpp/include/IceUtil/Shared.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_SHARED_H
-#define ICE_UTIL_SHARED_H
+#pragma once
 
 #include <IceUtil/Config.h>
 
@@ -144,5 +143,3 @@ protected:
 };
 
 }
-
-#endif
diff --git a/cpp/include/IceUtil/StringUtil.h b/cpp/include/IceUtil/StringUtil.h
index f2786340b4c..3439d040e36 100644
--- a/cpp/include/IceUtil/StringUtil.h
+++ b/cpp/include/IceUtil/StringUtil.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_STRING_UTIL_H
-#define ICE_STRING_UTIL_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <vector>
@@ -87,5 +86,3 @@ 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 6658ef8740f..e75adf60476 100644
--- a/cpp/include/IceUtil/Thread.h
+++ b/cpp/include/IceUtil/Thread.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_THREAD_H
-#define ICE_UTIL_THREAD_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
@@ -161,6 +160,3 @@ private:
 typedef Handle<Thread> ThreadPtr;
     
 }
-
-#endif
-
diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h
index c475b499117..d0444c20573 100644
--- a/cpp/include/IceUtil/ThreadException.h
+++ b/cpp/include/IceUtil/ThreadException.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_THREAD_EXCEPTION_H
-#define ICE_UTIL_THREAD_EXCEPTION_H
+#pragma once
 
 #include <IceUtil/Exception.h>
 #include <IceUtil/Time.h>
@@ -103,6 +102,3 @@ private:
 };
     
 }
-
-#endif
-
diff --git a/cpp/include/IceUtil/Time.h b/cpp/include/IceUtil/Time.h
index d987ca3cd00..8dcd0699d4f 100644
--- a/cpp/include/IceUtil/Time.h
+++ b/cpp/include/IceUtil/Time.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_TIME_H
-#define ICE_UTIL_TIME_H
+#pragma once
 
 #include <IceUtil/Config.h>
 
@@ -205,5 +204,3 @@ 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 00087365b33..f6eed95058e 100644
--- a/cpp/include/IceUtil/Timer.h
+++ b/cpp/include/IceUtil/Timer.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_TIMER_H
-#define ICE_UTIL_TIMER_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Thread.h>
@@ -137,6 +136,3 @@ Timer::Token::operator<(const Timer::Token& r) const
 }
 
 }
-
-#endif
-
diff --git a/cpp/include/IceUtil/UUID.h b/cpp/include/IceUtil/UUID.h
index 4cc1d85f87a..838b97d8e4e 100644
--- a/cpp/include/IceUtil/UUID.h
+++ b/cpp/include/IceUtil/UUID.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_UUID_H
-#define ICE_UTIL_UUID_H
+#pragma once
 
 #include <IceUtil/Config.h>
 
@@ -18,5 +17,3 @@ namespace IceUtil
 ICE_UTIL_API std::string generateUUID();
 
 }
-
-#endif
diff --git a/cpp/include/IceUtil/Unicode.h b/cpp/include/IceUtil/Unicode.h
index d88d04f9583..6bd5232c065 100644
--- a/cpp/include/IceUtil/Unicode.h
+++ b/cpp/include/IceUtil/Unicode.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_UNICODE_H
-#define ICE_UTIL_UNICODE_H
+#pragma once
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Exception.h>
@@ -91,5 +90,3 @@ 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 59c8c64fc35..e32993aa207 100644
--- a/cpp/include/IceXML/Parser.h
+++ b/cpp/include/IceXML/Parser.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_XML_PARSER_H
-#define ICE_XML_PARSER_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
@@ -153,5 +152,3 @@ public:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Makefile b/cpp/include/Makefile
index e0cc01b3c42..5de48e060d4 100644
--- a/cpp/include/Makefile
+++ b/cpp/include/Makefile
@@ -11,17 +11,22 @@ top_srcdir	= ..
 
 include $(top_srcdir)/config/Make.rules
 
-SUBDIRS		= Freeze \
-		  Glacier2 \
-		  Ice \
-		  IceBox \
-		  IceGrid \
-		  IcePatch2 \
+SUBDIRS		= Ice \
 		  IceSSL \
-		  IceStorm \
 		  IceUtil \
-		  IceXML \
 		  Slice
+		  
+ifneq ($(MinGW), yes)
+SUBDIRS		:= $(SUBDIRS) \
+		Freeze \
+		Glacier2 \
+		IceBox \
+		IceGrid \
+		IcePatch2 \
+		IceStorm \
+		IceXML
+endif
+
 
 $(EVERYTHING)::
 	@for subdir in $(SUBDIRS); \
diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h
index f8aeb5f19b3..9febb97eb1b 100644
--- a/cpp/include/Slice/CPlusPlusUtil.h
+++ b/cpp/include/Slice/CPlusPlusUtil.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef C_PLUS_PLUS_UTIL_H
-#define C_PLUS_PLUS_UTIL_H
+#pragma once
 
 #include <Slice/Parser.h>
 #include <IceUtil/OutputUtil.h>
@@ -61,5 +60,3 @@ 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 0a758f5c8a4..c874595512f 100644
--- a/cpp/include/Slice/Checksum.h
+++ b/cpp/include/Slice/Checksum.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef SLICE_CHECKSUM_H
-#define SLICE_CHECKSUM_H
+#pragma once
 
 #include <Slice/Parser.h>
 #include <map>
@@ -22,5 +21,3 @@ 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 46dae821ad9..39b8ac9bbae 100644
--- a/cpp/include/Slice/CsUtil.h
+++ b/cpp/include/Slice/CsUtil.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef CS_UTIL_H
-#define CS_UTIL_H
+#pragma once
 
 #include <Slice/Parser.h>
 #include <IceUtil/OutputUtil.h>
@@ -80,5 +79,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Slice/DotNetNames.h b/cpp/include/Slice/DotNetNames.h
index 88e74c378be..43bab7155c0 100644
--- a/cpp/include/Slice/DotNetNames.h
+++ b/cpp/include/Slice/DotNetNames.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef DOTNETNAMES_H
-#define DOTNETNAMES_H
+#pragma once
 
 #include <string>
 
@@ -30,5 +29,3 @@ 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 e59ae79bf9c..3fb45799e8c 100644
--- a/cpp/include/Slice/FileTracker.h
+++ b/cpp/include/Slice/FileTracker.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef FILE_TRACKER_H
-#define FILE_TRACKER_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <Slice/Parser.h>
@@ -67,5 +66,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Slice/JavaUtil.h b/cpp/include/Slice/JavaUtil.h
index c8bb6a71f85..d7023490b78 100644
--- a/cpp/include/Slice/JavaUtil.h
+++ b/cpp/include/Slice/JavaUtil.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef JAVA_UTIL_H
-#define JAVA_UTIL_H
+#pragma once
 
 #include <Slice/Parser.h>
 #include <IceUtil/OutputUtil.h>
@@ -267,5 +266,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Slice/PHPUtil.h b/cpp/include/Slice/PHPUtil.h
index 8e0322ffaee..200cdf57e86 100644
--- a/cpp/include/Slice/PHPUtil.h
+++ b/cpp/include/Slice/PHPUtil.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef SLICE_PHP_UTIL_H
-#define SLICE_PHP_UTIL_H
+#pragma once
 
 #include <Slice/Parser.h>
 
@@ -46,5 +45,3 @@ SLICE_API std::string escapeName(const std::string&);
 
 }
 }
-
-#endif
diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h
index 261a106bb38..51fb288b318 100644
--- a/cpp/include/Slice/Parser.h
+++ b/cpp/include/Slice/Parser.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef SLICE_PARSER_H
-#define SLICE_PARSER_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
@@ -31,7 +30,7 @@
 namespace Slice
 {
 
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(__MINGW32__)
  
 const IceUtil::Int64 Int32Max =  0x7fffffffi64;
 const IceUtil::Int64 Int32Min = -Int32Max - 1i64;
@@ -1071,5 +1070,3 @@ 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 969f4e09054..ee58e8f312c 100644
--- a/cpp/include/Slice/Preprocessor.h
+++ b/cpp/include/Slice/Preprocessor.h
@@ -7,16 +7,11 @@
 //
 // **********************************************************************
 
-#ifndef PREPROCESSOR_H
-#define PREPROCESSOR_H
+#pragma once
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
 #include <vector>
-#include <cstdio>
-#ifdef __BCPLUSPLUS__
-#  include <stdio.h>
-#endif
 
 #ifndef SLICE_API
 #   ifdef SLICE_API_EXPORTS
@@ -68,5 +63,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/cpp/include/Slice/PythonUtil.h b/cpp/include/Slice/PythonUtil.h
index 91501cb7f50..5201b7f1c49 100644
--- a/cpp/include/Slice/PythonUtil.h
+++ b/cpp/include/Slice/PythonUtil.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef SLICE_PYTHON_UTIL_H
-#define SLICE_PYTHON_UTIL_H
+#pragma once
 
 #include <Slice/Parser.h>
 #include <IceUtil/OutputUtil.h>
@@ -58,5 +57,3 @@ SLICE_API void printHeader(IceUtilInternal::Output&);
 
 }
 }
-
-#endif
diff --git a/cpp/include/Slice/RubyUtil.h b/cpp/include/Slice/RubyUtil.h
index d8cd8ead8b8..acf93455fed 100644
--- a/cpp/include/Slice/RubyUtil.h
+++ b/cpp/include/Slice/RubyUtil.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef SLICE_RUBY_UTIL_H
-#define SLICE_RUBY_UTIL_H
+#pragma once
 
 #include <Slice/Parser.h>
 #include <IceUtil/OutputUtil.h>
@@ -48,5 +47,3 @@ SLICE_API void printHeader(IceUtilInternal::Output&);
 
 }
 }
-
-#endif
diff --git a/cpp/include/Slice/Util.h b/cpp/include/Slice/Util.h
index 340f3eb6caa..c4267590cc2 100644
--- a/cpp/include/Slice/Util.h
+++ b/cpp/include/Slice/Util.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef SLICE_UTIL_H
-#define SLICE_UTIL_H
+#pragma once
 
 #include <Slice/Parser.h>
 #include <IceUtil/OutputUtil.h>
@@ -29,5 +28,3 @@ 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