summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-12-18 20:16:32 +0100
committerJose <jose@zeroc.com>2018-12-18 20:16:32 +0100
commit6b6c459791802bb00aa29114e758e4d7b7a79c2b (patch)
tree271cedfbbeed24da4bdf3fe31da7654a023353d1 /cpp/src
parentFix copyright header (diff)
downloadice-6b6c459791802bb00aa29114e758e4d7b7a79c2b.tar.bz2
ice-6b6c459791802bb00aa29114e758e4d7b7a79c2b.tar.xz
ice-6b6c459791802bb00aa29114e758e4d7b7a79c2b.zip
Remove copyright notice
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Glacier2/Blobject.cpp3
-rw-r--r--cpp/src/Glacier2/Blobject.h3
-rw-r--r--cpp/src/Glacier2/ClientBlobject.cpp3
-rw-r--r--cpp/src/Glacier2/ClientBlobject.h3
-rw-r--r--cpp/src/Glacier2/FilterI.cpp3
-rw-r--r--cpp/src/Glacier2/FilterI.h3
-rw-r--r--cpp/src/Glacier2/FilterManager.cpp3
-rw-r--r--cpp/src/Glacier2/FilterManager.h3
-rw-r--r--cpp/src/Glacier2/Glacier2Router.cpp3
-rw-r--r--cpp/src/Glacier2/Instance.cpp3
-rw-r--r--cpp/src/Glacier2/Instance.h3
-rw-r--r--cpp/src/Glacier2/Instrumentation.ice3
-rw-r--r--cpp/src/Glacier2/InstrumentationI.cpp3
-rw-r--r--cpp/src/Glacier2/InstrumentationI.h3
-rw-r--r--cpp/src/Glacier2/Makefile.mk3
-rw-r--r--cpp/src/Glacier2/ProxyVerifier.cpp3
-rw-r--r--cpp/src/Glacier2/ProxyVerifier.h3
-rw-r--r--cpp/src/Glacier2/RequestQueue.cpp3
-rw-r--r--cpp/src/Glacier2/RequestQueue.h3
-rw-r--r--cpp/src/Glacier2/RouterI.cpp3
-rw-r--r--cpp/src/Glacier2/RouterI.h3
-rw-r--r--cpp/src/Glacier2/RoutingTable.cpp3
-rw-r--r--cpp/src/Glacier2/RoutingTable.h3
-rw-r--r--cpp/src/Glacier2/ServerBlobject.cpp3
-rw-r--r--cpp/src/Glacier2/ServerBlobject.h3
-rw-r--r--cpp/src/Glacier2/SessionRouterI.cpp3
-rw-r--r--cpp/src/Glacier2/SessionRouterI.h3
-rw-r--r--cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp3
-rw-r--r--cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk3
-rw-r--r--cpp/src/Glacier2Lib/Application.cpp3
-rw-r--r--cpp/src/Glacier2Lib/Makefile.mk3
-rw-r--r--cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp3
-rw-r--r--cpp/src/Glacier2Lib/SessionHelper.cpp3
-rw-r--r--cpp/src/Ice/ACM.cpp3
-rw-r--r--cpp/src/Ice/ACM.h3
-rw-r--r--cpp/src/Ice/ACMF.h3
-rw-r--r--cpp/src/Ice/Acceptor.cpp3
-rw-r--r--cpp/src/Ice/Acceptor.h3
-rw-r--r--cpp/src/Ice/AcceptorF.h3
-rw-r--r--cpp/src/Ice/Application.cpp3
-rw-r--r--cpp/src/Ice/ArgVector.cpp3
-rw-r--r--cpp/src/Ice/ArgVector.h3
-rw-r--r--cpp/src/Ice/AsyncResult.cpp3
-rw-r--r--cpp/src/Ice/Base64.cpp3
-rw-r--r--cpp/src/Ice/Base64.h3
-rw-r--r--cpp/src/Ice/BatchRequestQueue.cpp3
-rw-r--r--cpp/src/Ice/BatchRequestQueue.h3
-rw-r--r--cpp/src/Ice/Buffer.cpp3
-rw-r--r--cpp/src/Ice/CollocatedRequestHandler.cpp3
-rw-r--r--cpp/src/Ice/CollocatedRequestHandler.h3
-rw-r--r--cpp/src/Ice/CommunicatorI.cpp3
-rw-r--r--cpp/src/Ice/CommunicatorI.h3
-rw-r--r--cpp/src/Ice/Cond.cpp3
-rw-r--r--cpp/src/Ice/ConnectRequestHandler.cpp3
-rw-r--r--cpp/src/Ice/ConnectRequestHandler.h3
-rw-r--r--cpp/src/Ice/ConnectRequestHandlerF.h3
-rw-r--r--cpp/src/Ice/ConnectionFactory.cpp3
-rw-r--r--cpp/src/Ice/ConnectionFactory.h3
-rw-r--r--cpp/src/Ice/ConnectionFactoryF.h3
-rw-r--r--cpp/src/Ice/ConnectionI.cpp3
-rw-r--r--cpp/src/Ice/ConnectionI.h3
-rw-r--r--cpp/src/Ice/ConnectionRequestHandler.cpp3
-rw-r--r--cpp/src/Ice/ConnectionRequestHandler.h3
-rw-r--r--cpp/src/Ice/Connector.cpp3
-rw-r--r--cpp/src/Ice/Connector.h3
-rw-r--r--cpp/src/Ice/ConnectorF.h3
-rw-r--r--cpp/src/Ice/CountDownLatch.cpp3
-rw-r--r--cpp/src/Ice/DLLMain.cpp3
-rw-r--r--cpp/src/Ice/DefaultsAndOverrides.cpp3
-rw-r--r--cpp/src/Ice/DefaultsAndOverrides.h3
-rw-r--r--cpp/src/Ice/DefaultsAndOverridesF.h3
-rw-r--r--cpp/src/Ice/DispatchInterceptor.cpp3
-rw-r--r--cpp/src/Ice/DynamicLibrary.cpp3
-rw-r--r--cpp/src/Ice/EndpointFactory.cpp3
-rw-r--r--cpp/src/Ice/EndpointFactory.h3
-rw-r--r--cpp/src/Ice/EndpointFactoryF.h3
-rw-r--r--cpp/src/Ice/EndpointFactoryManager.cpp3
-rw-r--r--cpp/src/Ice/EndpointFactoryManager.h3
-rw-r--r--cpp/src/Ice/EndpointFactoryManagerF.h3
-rw-r--r--cpp/src/Ice/EndpointI.cpp3
-rw-r--r--cpp/src/Ice/EndpointI.h3
-rw-r--r--cpp/src/Ice/EndpointIF.h3
-rw-r--r--cpp/src/Ice/EventHandler.cpp3
-rw-r--r--cpp/src/Ice/EventHandler.h3
-rw-r--r--cpp/src/Ice/EventHandlerF.h3
-rwxr-xr-xcpp/src/Ice/EventLoggerMsg.mc3
-rw-r--r--cpp/src/Ice/Exception.cpp3
-rw-r--r--cpp/src/Ice/FactoryTable.cpp3
-rw-r--r--cpp/src/Ice/FactoryTableInit.cpp3
-rw-r--r--cpp/src/Ice/GCObject.cpp3
-rw-r--r--cpp/src/Ice/HashUtil.h3
-rw-r--r--cpp/src/Ice/HttpParser.cpp3
-rw-r--r--cpp/src/Ice/HttpParser.h3
-rw-r--r--cpp/src/Ice/IPEndpointI.cpp3
-rw-r--r--cpp/src/Ice/IPEndpointI.h3
-rw-r--r--cpp/src/Ice/IPEndpointIF.h3
-rw-r--r--cpp/src/Ice/IconvStringConverter.cpp3
-rw-r--r--cpp/src/Ice/ImplicitContextI.cpp3
-rw-r--r--cpp/src/Ice/ImplicitContextI.h3
-rw-r--r--cpp/src/Ice/Incoming.cpp3
-rw-r--r--cpp/src/Ice/IncomingAsync.cpp3
-rw-r--r--cpp/src/Ice/IncomingRequest.h3
-rw-r--r--cpp/src/Ice/Initialize.cpp3
-rw-r--r--cpp/src/Ice/InputStream.cpp3
-rw-r--r--cpp/src/Ice/Instance.cpp3
-rw-r--r--cpp/src/Ice/Instance.h3
-rw-r--r--cpp/src/Ice/InstrumentationI.cpp3
-rw-r--r--cpp/src/Ice/InstrumentationI.h3
-rw-r--r--cpp/src/Ice/LocalObject.cpp3
-rw-r--r--cpp/src/Ice/LocatorInfo.cpp3
-rw-r--r--cpp/src/Ice/LocatorInfo.h3
-rw-r--r--cpp/src/Ice/LocatorInfoF.h3
-rw-r--r--cpp/src/Ice/LoggerAdminI.cpp3
-rw-r--r--cpp/src/Ice/LoggerAdminI.h3
-rw-r--r--cpp/src/Ice/LoggerI.cpp3
-rw-r--r--cpp/src/Ice/LoggerI.h3
-rw-r--r--cpp/src/Ice/LoggerUtil.cpp3
-rw-r--r--cpp/src/Ice/Makefile.mk3
-rw-r--r--cpp/src/Ice/MetricsAdminI.cpp3
-rw-r--r--cpp/src/Ice/MetricsObserverI.cpp3
-rwxr-xr-xcpp/src/Ice/Network.cpp3
-rwxr-xr-xcpp/src/Ice/Network.h3
-rw-r--r--cpp/src/Ice/NetworkF.h3
-rw-r--r--cpp/src/Ice/NetworkProxy.cpp3
-rw-r--r--cpp/src/Ice/NetworkProxy.h3
-rw-r--r--cpp/src/Ice/NetworkProxyF.h3
-rw-r--r--cpp/src/Ice/Object.cpp3
-rw-r--r--cpp/src/Ice/ObjectAdapterFactory.cpp3
-rw-r--r--cpp/src/Ice/ObjectAdapterFactory.h3
-rw-r--r--cpp/src/Ice/ObjectAdapterFactoryF.h3
-rw-r--r--cpp/src/Ice/ObjectAdapterI.cpp3
-rw-r--r--cpp/src/Ice/ObjectAdapterI.h3
-rw-r--r--cpp/src/Ice/ObserverHelper.cpp3
-rw-r--r--cpp/src/Ice/OpaqueEndpointI.cpp3
-rw-r--r--cpp/src/Ice/OpaqueEndpointI.h3
-rw-r--r--cpp/src/Ice/OutgoingAsync.cpp3
-rw-r--r--cpp/src/Ice/OutputStream.cpp3
-rw-r--r--cpp/src/Ice/PluginManagerI.cpp3
-rw-r--r--cpp/src/Ice/PluginManagerI.h3
-rw-r--r--cpp/src/Ice/PropertiesAdminI.cpp3
-rw-r--r--cpp/src/Ice/PropertiesAdminI.h3
-rw-r--r--cpp/src/Ice/PropertiesI.cpp3
-rw-r--r--cpp/src/Ice/PropertiesI.h3
-rw-r--r--cpp/src/Ice/PropertyNames.cpp3
-rw-r--r--cpp/src/Ice/PropertyNames.h3
-rw-r--r--cpp/src/Ice/Protocol.cpp3
-rw-r--r--cpp/src/Ice/ProtocolInstance.cpp3
-rw-r--r--cpp/src/Ice/ProtocolInstance.h3
-rw-r--r--cpp/src/Ice/ProtocolInstanceF.h3
-rw-r--r--cpp/src/Ice/ProtocolPluginFacade.cpp3
-rw-r--r--cpp/src/Ice/ProtocolPluginFacade.h3
-rw-r--r--cpp/src/Ice/ProtocolPluginFacadeF.h3
-rw-r--r--cpp/src/Ice/Proxy.cpp3
-rw-r--r--cpp/src/Ice/ProxyFactory.cpp3
-rw-r--r--cpp/src/Ice/ProxyFactory.h3
-rw-r--r--cpp/src/Ice/Reference.cpp3
-rw-r--r--cpp/src/Ice/Reference.h3
-rw-r--r--cpp/src/Ice/ReferenceFactory.cpp3
-rw-r--r--cpp/src/Ice/ReferenceFactory.h3
-rw-r--r--cpp/src/Ice/ReferenceFactoryF.h3
-rw-r--r--cpp/src/Ice/RegisterPluginsInit.cpp3
-rw-r--r--cpp/src/Ice/RegisterPluginsInit.h3
-rw-r--r--cpp/src/Ice/ReplyStatus.h3
-rw-r--r--cpp/src/Ice/RequestHandler.cpp3
-rw-r--r--cpp/src/Ice/RequestHandler.h3
-rw-r--r--cpp/src/Ice/RequestHandlerFactory.cpp3
-rw-r--r--cpp/src/Ice/RequestHandlerFactory.h3
-rw-r--r--cpp/src/Ice/ResponseHandler.cpp3
-rw-r--r--cpp/src/Ice/ResponseHandler.h3
-rw-r--r--cpp/src/Ice/RetryQueue.cpp3
-rw-r--r--cpp/src/Ice/RetryQueue.h3
-rw-r--r--cpp/src/Ice/RetryQueueF.h3
-rw-r--r--cpp/src/Ice/RouterInfo.cpp3
-rw-r--r--cpp/src/Ice/RouterInfo.h3
-rw-r--r--cpp/src/Ice/RouterInfoF.h3
-rw-r--r--cpp/src/Ice/SHA1.cpp3
-rw-r--r--cpp/src/Ice/Selector.cpp3
-rw-r--r--cpp/src/Ice/Selector.h3
-rw-r--r--cpp/src/Ice/ServantManager.cpp3
-rw-r--r--cpp/src/Ice/ServantManager.h3
-rw-r--r--cpp/src/Ice/Service.cpp3
-rw-r--r--cpp/src/Ice/SharedContext.h3
-rw-r--r--cpp/src/Ice/SliceChecksums.cpp3
-rw-r--r--cpp/src/Ice/SlicedData.cpp3
-rwxr-xr-xcpp/src/Ice/StreamSocket.cpp3
-rw-r--r--cpp/src/Ice/StreamSocket.h3
-rw-r--r--cpp/src/Ice/StringConverterPlugin.cpp3
-rw-r--r--cpp/src/Ice/StringUtil.h3
-rw-r--r--cpp/src/Ice/SysLoggerI.cpp3
-rw-r--r--cpp/src/Ice/SysLoggerI.h3
-rw-r--r--cpp/src/Ice/SystemdJournalI.cpp3
-rw-r--r--cpp/src/Ice/SystemdJournalI.h3
-rwxr-xr-xcpp/src/Ice/TcpAcceptor.cpp3
-rw-r--r--cpp/src/Ice/TcpAcceptor.h3
-rw-r--r--cpp/src/Ice/TcpConnector.cpp3
-rw-r--r--cpp/src/Ice/TcpConnector.h3
-rw-r--r--cpp/src/Ice/TcpEndpointI.cpp3
-rw-r--r--cpp/src/Ice/TcpEndpointI.h3
-rw-r--r--cpp/src/Ice/TcpTransceiver.cpp3
-rw-r--r--cpp/src/Ice/TcpTransceiver.h3
-rw-r--r--cpp/src/Ice/Thread.cpp3
-rw-r--r--cpp/src/Ice/ThreadPool.cpp3
-rw-r--r--cpp/src/Ice/ThreadPool.h3
-rw-r--r--cpp/src/Ice/Timer.cpp3
-rw-r--r--cpp/src/Ice/TraceLevels.cpp3
-rw-r--r--cpp/src/Ice/TraceLevels.h3
-rw-r--r--cpp/src/Ice/TraceLevelsF.h3
-rw-r--r--cpp/src/Ice/TraceUtil.cpp3
-rw-r--r--cpp/src/Ice/TraceUtil.h3
-rw-r--r--cpp/src/Ice/Transceiver.cpp3
-rw-r--r--cpp/src/Ice/Transceiver.h3
-rw-r--r--cpp/src/Ice/TransceiverF.h3
-rw-r--r--cpp/src/Ice/UdpConnector.cpp3
-rw-r--r--cpp/src/Ice/UdpConnector.h3
-rw-r--r--cpp/src/Ice/UdpEndpointI.cpp3
-rw-r--r--cpp/src/Ice/UdpEndpointI.h3
-rwxr-xr-xcpp/src/Ice/UdpTransceiver.cpp3
-rw-r--r--cpp/src/Ice/UdpTransceiver.h3
-rw-r--r--cpp/src/Ice/Value.cpp3
-rw-r--r--cpp/src/Ice/ValueFactoryManagerI.cpp3
-rw-r--r--cpp/src/Ice/ValueFactoryManagerI.h3
-rw-r--r--cpp/src/Ice/VirtualShared.h3
-rw-r--r--cpp/src/Ice/WSAcceptor.cpp3
-rw-r--r--cpp/src/Ice/WSAcceptor.h3
-rw-r--r--cpp/src/Ice/WSConnector.cpp3
-rw-r--r--cpp/src/Ice/WSConnector.h3
-rw-r--r--cpp/src/Ice/WSEndpoint.cpp3
-rw-r--r--cpp/src/Ice/WSEndpoint.h3
-rw-r--r--cpp/src/Ice/WSTransceiver.cpp3
-rw-r--r--cpp/src/Ice/WSTransceiver.h3
-rw-r--r--cpp/src/Ice/ios/Notifications.mm3
-rw-r--r--cpp/src/Ice/ios/StreamAcceptor.cpp3
-rw-r--r--cpp/src/Ice/ios/StreamAcceptor.h3
-rw-r--r--cpp/src/Ice/ios/StreamConnector.cpp3
-rw-r--r--cpp/src/Ice/ios/StreamConnector.h3
-rw-r--r--cpp/src/Ice/ios/StreamEndpointI.cpp3
-rw-r--r--cpp/src/Ice/ios/StreamEndpointI.h3
-rw-r--r--cpp/src/Ice/ios/StreamTransceiver.cpp3
-rw-r--r--cpp/src/Ice/ios/StreamTransceiver.h3
-rw-r--r--cpp/src/IceBT/AcceptorI.cpp3
-rw-r--r--cpp/src/IceBT/AcceptorI.h3
-rw-r--r--cpp/src/IceBT/Config.h3
-rw-r--r--cpp/src/IceBT/ConnectorI.cpp3
-rw-r--r--cpp/src/IceBT/ConnectorI.h3
-rw-r--r--cpp/src/IceBT/DBus.cpp3
-rw-r--r--cpp/src/IceBT/DBus.h3
-rw-r--r--cpp/src/IceBT/EndpointI.cpp3
-rw-r--r--cpp/src/IceBT/EndpointI.h3
-rw-r--r--cpp/src/IceBT/Engine.cpp3
-rw-r--r--cpp/src/IceBT/Engine.h3
-rw-r--r--cpp/src/IceBT/EngineF.h3
-rw-r--r--cpp/src/IceBT/Instance.cpp3
-rw-r--r--cpp/src/IceBT/Instance.h3
-rw-r--r--cpp/src/IceBT/InstanceF.h3
-rw-r--r--cpp/src/IceBT/Makefile.mk3
-rw-r--r--cpp/src/IceBT/PluginI.cpp3
-rw-r--r--cpp/src/IceBT/PluginI.h3
-rw-r--r--cpp/src/IceBT/StreamSocket.cpp3
-rw-r--r--cpp/src/IceBT/StreamSocket.h3
-rw-r--r--cpp/src/IceBT/TransceiverI.cpp3
-rw-r--r--cpp/src/IceBT/TransceiverI.h3
-rw-r--r--cpp/src/IceBT/Util.cpp3
-rw-r--r--cpp/src/IceBT/Util.h3
-rw-r--r--cpp/src/IceBox/Admin.cpp3
-rw-r--r--cpp/src/IceBox/Exception.cpp3
-rw-r--r--cpp/src/IceBox/Makefile.mk3
-rw-r--r--cpp/src/IceBox/Service.cpp3
-rw-r--r--cpp/src/IceBox/ServiceManagerI.cpp3
-rw-r--r--cpp/src/IceBox/ServiceManagerI.h3
-rw-r--r--cpp/src/IceBridge/IceBridge.cpp3
-rw-r--r--cpp/src/IceBridge/Makefile.mk3
-rw-r--r--cpp/src/IceDB/IceDB.cpp3
-rw-r--r--cpp/src/IceDB/IceDB.h3
-rw-r--r--cpp/src/IceDB/Makefile.mk3
-rw-r--r--cpp/src/IceDiscovery/LocatorI.cpp3
-rw-r--r--cpp/src/IceDiscovery/LocatorI.h3
-rw-r--r--cpp/src/IceDiscovery/LookupI.cpp3
-rw-r--r--cpp/src/IceDiscovery/LookupI.h3
-rw-r--r--cpp/src/IceDiscovery/Makefile.mk3
-rw-r--r--cpp/src/IceDiscovery/PluginI.cpp3
-rw-r--r--cpp/src/IceDiscovery/PluginI.h3
-rw-r--r--cpp/src/IceGrid/Activator.cpp3
-rw-r--r--cpp/src/IceGrid/Activator.h3
-rw-r--r--cpp/src/IceGrid/AdapterCache.cpp3
-rw-r--r--cpp/src/IceGrid/AdapterCache.h3
-rw-r--r--cpp/src/IceGrid/AdminCallbackRouter.cpp3
-rw-r--r--cpp/src/IceGrid/AdminCallbackRouter.h3
-rw-r--r--cpp/src/IceGrid/AdminI.cpp3
-rw-r--r--cpp/src/IceGrid/AdminI.h3
-rw-r--r--cpp/src/IceGrid/AdminRouter.cpp3
-rw-r--r--cpp/src/IceGrid/AdminRouter.h3
-rw-r--r--cpp/src/IceGrid/AdminSessionI.cpp3
-rw-r--r--cpp/src/IceGrid/AdminSessionI.h3
-rw-r--r--cpp/src/IceGrid/Allocatable.cpp3
-rw-r--r--cpp/src/IceGrid/Allocatable.h3
-rw-r--r--cpp/src/IceGrid/AllocatableObjectCache.cpp3
-rw-r--r--cpp/src/IceGrid/AllocatableObjectCache.h3
-rw-r--r--cpp/src/IceGrid/Cache.h3
-rw-r--r--cpp/src/IceGrid/Client.cpp3
-rw-r--r--cpp/src/IceGrid/Database.cpp3
-rw-r--r--cpp/src/IceGrid/Database.h3
-rw-r--r--cpp/src/IceGrid/DescriptorBuilder.cpp3
-rw-r--r--cpp/src/IceGrid/DescriptorBuilder.h3
-rw-r--r--cpp/src/IceGrid/DescriptorHelper.cpp3
-rw-r--r--cpp/src/IceGrid/DescriptorHelper.h3
-rw-r--r--cpp/src/IceGrid/DescriptorParser.cpp3
-rw-r--r--cpp/src/IceGrid/DescriptorParser.h3
-rw-r--r--cpp/src/IceGrid/FileCache.cpp3
-rw-r--r--cpp/src/IceGrid/FileCache.h3
-rw-r--r--cpp/src/IceGrid/FileParserI.cpp3
-rw-r--r--cpp/src/IceGrid/FileParserI.h3
-rw-r--r--cpp/src/IceGrid/FileUserAccountMapperI.cpp3
-rw-r--r--cpp/src/IceGrid/FileUserAccountMapperI.h3
-rw-r--r--cpp/src/IceGrid/Grammar.cpp3
-rw-r--r--cpp/src/IceGrid/Grammar.y3
-rw-r--r--cpp/src/IceGrid/IceGridNode.cpp3
-rw-r--r--cpp/src/IceGrid/IceGridRegistry.cpp3
-rw-r--r--cpp/src/IceGrid/Internal.ice3
-rw-r--r--cpp/src/IceGrid/InternalRegistryI.cpp3
-rw-r--r--cpp/src/IceGrid/InternalRegistryI.h3
-rw-r--r--cpp/src/IceGrid/LocatorI.cpp3
-rw-r--r--cpp/src/IceGrid/LocatorI.h3
-rw-r--r--cpp/src/IceGrid/LocatorRegistryI.cpp3
-rw-r--r--cpp/src/IceGrid/LocatorRegistryI.h3
-rw-r--r--cpp/src/IceGrid/Makefile.mk3
-rw-r--r--cpp/src/IceGrid/NodeAdminRouter.cpp3
-rw-r--r--cpp/src/IceGrid/NodeAdminRouter.h3
-rw-r--r--cpp/src/IceGrid/NodeCache.cpp3
-rw-r--r--cpp/src/IceGrid/NodeCache.h3
-rw-r--r--cpp/src/IceGrid/NodeI.cpp3
-rw-r--r--cpp/src/IceGrid/NodeI.h3
-rw-r--r--cpp/src/IceGrid/NodeSessionI.cpp3
-rw-r--r--cpp/src/IceGrid/NodeSessionI.h3
-rw-r--r--cpp/src/IceGrid/NodeSessionManager.cpp3
-rw-r--r--cpp/src/IceGrid/NodeSessionManager.h3
-rw-r--r--cpp/src/IceGrid/ObjectCache.cpp3
-rw-r--r--cpp/src/IceGrid/ObjectCache.h3
-rw-r--r--cpp/src/IceGrid/Parser.cpp3
-rw-r--r--cpp/src/IceGrid/Parser.h3
-rw-r--r--cpp/src/IceGrid/PlatformInfo.cpp3
-rw-r--r--cpp/src/IceGrid/PlatformInfo.h3
-rw-r--r--cpp/src/IceGrid/PluginFacadeI.cpp3
-rw-r--r--cpp/src/IceGrid/PluginFacadeI.h3
-rw-r--r--cpp/src/IceGrid/QueryI.cpp3
-rw-r--r--cpp/src/IceGrid/QueryI.h3
-rw-r--r--cpp/src/IceGrid/ReapThread.cpp3
-rw-r--r--cpp/src/IceGrid/ReapThread.h3
-rw-r--r--cpp/src/IceGrid/RegistryAdminRouter.cpp3
-rw-r--r--cpp/src/IceGrid/RegistryAdminRouter.h3
-rw-r--r--cpp/src/IceGrid/RegistryI.cpp3
-rw-r--r--cpp/src/IceGrid/RegistryI.h3
-rw-r--r--cpp/src/IceGrid/ReplicaCache.cpp3
-rw-r--r--cpp/src/IceGrid/ReplicaCache.h3
-rw-r--r--cpp/src/IceGrid/ReplicaSessionI.cpp3
-rw-r--r--cpp/src/IceGrid/ReplicaSessionI.h3
-rw-r--r--cpp/src/IceGrid/ReplicaSessionManager.cpp3
-rw-r--r--cpp/src/IceGrid/ReplicaSessionManager.h3
-rw-r--r--cpp/src/IceGrid/Scanner.cpp3
-rw-r--r--cpp/src/IceGrid/Scanner.l3
-rw-r--r--cpp/src/IceGrid/ServerAdapterI.cpp3
-rw-r--r--cpp/src/IceGrid/ServerAdapterI.h3
-rw-r--r--cpp/src/IceGrid/ServerCache.cpp3
-rw-r--r--cpp/src/IceGrid/ServerCache.h3
-rw-r--r--cpp/src/IceGrid/ServerI.cpp3
-rw-r--r--cpp/src/IceGrid/ServerI.h3
-rw-r--r--cpp/src/IceGrid/SessionI.cpp3
-rw-r--r--cpp/src/IceGrid/SessionI.h3
-rw-r--r--cpp/src/IceGrid/SessionManager.cpp3
-rw-r--r--cpp/src/IceGrid/SessionManager.h3
-rw-r--r--cpp/src/IceGrid/SessionServantManager.cpp3
-rw-r--r--cpp/src/IceGrid/SessionServantManager.h3
-rw-r--r--cpp/src/IceGrid/Topics.cpp3
-rw-r--r--cpp/src/IceGrid/Topics.h3
-rw-r--r--cpp/src/IceGrid/TraceLevels.cpp3
-rw-r--r--cpp/src/IceGrid/TraceLevels.h3
-rw-r--r--cpp/src/IceGrid/Util.cpp3
-rw-r--r--cpp/src/IceGrid/Util.h3
-rw-r--r--cpp/src/IceGrid/WaitQueue.cpp3
-rw-r--r--cpp/src/IceGrid/WaitQueue.h3
-rw-r--r--cpp/src/IceGrid/WellKnownObjectsManager.cpp3
-rw-r--r--cpp/src/IceGrid/WellKnownObjectsManager.h3
-rw-r--r--cpp/src/IceGridLib/Makefile.mk3
-rw-r--r--cpp/src/IceGridLib/PluginFacadeI.cpp3
-rw-r--r--cpp/src/IceIAP/Connector.h3
-rw-r--r--cpp/src/IceIAP/Connector.mm3
-rw-r--r--cpp/src/IceIAP/EndpointI.h3
-rw-r--r--cpp/src/IceIAP/EndpointI.mm3
-rw-r--r--cpp/src/IceIAP/Makefile.mk3
-rw-r--r--cpp/src/IceIAP/Transceiver.h3
-rw-r--r--cpp/src/IceIAP/Transceiver.mm3
-rw-r--r--cpp/src/IceLocatorDiscovery/Makefile.mk3
-rw-r--r--cpp/src/IceLocatorDiscovery/Plugin.h3
-rw-r--r--cpp/src/IceLocatorDiscovery/PluginI.cpp3
-rw-r--r--cpp/src/IcePatch2/Calc.cpp3
-rw-r--r--cpp/src/IcePatch2/Client.cpp3
-rw-r--r--cpp/src/IcePatch2/FileServerI.cpp3
-rw-r--r--cpp/src/IcePatch2/FileServerI.h3
-rw-r--r--cpp/src/IcePatch2/Makefile.mk3
-rw-r--r--cpp/src/IcePatch2/Server.cpp3
-rw-r--r--cpp/src/IcePatch2Lib/ClientUtil.cpp3
-rw-r--r--cpp/src/IcePatch2Lib/Makefile.mk3
-rw-r--r--cpp/src/IcePatch2Lib/Util.cpp3
-rw-r--r--cpp/src/IcePatch2Lib/Util.h3
-rw-r--r--cpp/src/IceSSL/AcceptorI.cpp3
-rw-r--r--cpp/src/IceSSL/AcceptorI.h3
-rw-r--r--cpp/src/IceSSL/CertificateI.cpp3
-rw-r--r--cpp/src/IceSSL/CertificateI.h3
-rw-r--r--cpp/src/IceSSL/ConnectorI.cpp3
-rw-r--r--cpp/src/IceSSL/ConnectorI.h3
-rw-r--r--cpp/src/IceSSL/EndpointI.cpp3
-rw-r--r--cpp/src/IceSSL/EndpointI.h3
-rw-r--r--cpp/src/IceSSL/Instance.cpp3
-rw-r--r--cpp/src/IceSSL/Instance.h3
-rw-r--r--cpp/src/IceSSL/InstanceF.h3
-rw-r--r--cpp/src/IceSSL/Makefile.mk3
-rw-r--r--cpp/src/IceSSL/OpenSSLCertificateI.cpp3
-rw-r--r--cpp/src/IceSSL/OpenSSLEngine.cpp3
-rw-r--r--cpp/src/IceSSL/OpenSSLEngine.h3
-rw-r--r--cpp/src/IceSSL/OpenSSLEngineF.h3
-rw-r--r--cpp/src/IceSSL/OpenSSLPluginI.cpp3
-rw-r--r--cpp/src/IceSSL/OpenSSLTransceiverI.cpp3
-rw-r--r--cpp/src/IceSSL/OpenSSLTransceiverI.h3
-rw-r--r--cpp/src/IceSSL/OpenSSLUtil.cpp3
-rw-r--r--cpp/src/IceSSL/OpenSSLUtil.h3
-rwxr-xr-xcpp/src/IceSSL/PluginI.cpp3
-rw-r--r--cpp/src/IceSSL/PluginI.h3
-rw-r--r--cpp/src/IceSSL/RFC2253.cpp3
-rw-r--r--cpp/src/IceSSL/RFC2253.h3
-rw-r--r--cpp/src/IceSSL/SChannelCertificateI.cpp3
-rw-r--r--cpp/src/IceSSL/SChannelEngine.cpp3
-rw-r--r--cpp/src/IceSSL/SChannelEngine.h3
-rw-r--r--cpp/src/IceSSL/SChannelEngineF.h3
-rw-r--r--cpp/src/IceSSL/SChannelPluginI.cpp3
-rw-r--r--cpp/src/IceSSL/SChannelTransceiverI.cpp3
-rw-r--r--cpp/src/IceSSL/SChannelTransceiverI.h3
-rw-r--r--cpp/src/IceSSL/SSLEngine.cpp3
-rw-r--r--cpp/src/IceSSL/SSLEngine.h3
-rw-r--r--cpp/src/IceSSL/SSLEngineF.h3
-rw-r--r--cpp/src/IceSSL/SecureTransportCertificateI.cpp3
-rw-r--r--cpp/src/IceSSL/SecureTransportEngine.cpp3
-rw-r--r--cpp/src/IceSSL/SecureTransportEngine.h3
-rw-r--r--cpp/src/IceSSL/SecureTransportEngineF.h3
-rw-r--r--cpp/src/IceSSL/SecureTransportPluginI.cpp3
-rw-r--r--cpp/src/IceSSL/SecureTransportTransceiverI.cpp3
-rw-r--r--cpp/src/IceSSL/SecureTransportTransceiverI.h3
-rw-r--r--cpp/src/IceSSL/SecureTransportUtil.cpp3
-rw-r--r--cpp/src/IceSSL/SecureTransportUtil.h3
-rw-r--r--cpp/src/IceSSL/TrustManager.cpp3
-rw-r--r--cpp/src/IceSSL/TrustManager.h3
-rw-r--r--cpp/src/IceSSL/TrustManagerF.h3
-rw-r--r--cpp/src/IceSSL/UWPCertificateI.cpp3
-rw-r--r--cpp/src/IceSSL/UWPEngine.cpp3
-rw-r--r--cpp/src/IceSSL/UWPEngine.h3
-rw-r--r--cpp/src/IceSSL/UWPEngineF.h3
-rw-r--r--cpp/src/IceSSL/UWPPluginI.cpp3
-rw-r--r--cpp/src/IceSSL/UWPTransceiverI.cpp3
-rw-r--r--cpp/src/IceSSL/UWPTransceiverI.h3
-rwxr-xr-xcpp/src/IceSSL/Util.cpp3
-rw-r--r--cpp/src/IceSSL/Util.h3
-rw-r--r--cpp/src/IceStorm/Admin.cpp3
-rw-r--r--cpp/src/IceStorm/DBTypes.ice3
-rw-r--r--cpp/src/IceStorm/Election.ice3
-rw-r--r--cpp/src/IceStorm/Grammar.cpp3
-rw-r--r--cpp/src/IceStorm/Grammar.y3
-rw-r--r--cpp/src/IceStorm/IceStormDB.cpp3
-rw-r--r--cpp/src/IceStorm/IceStormInternal.ice3
-rw-r--r--cpp/src/IceStorm/Instance.cpp3
-rw-r--r--cpp/src/IceStorm/Instance.h3
-rw-r--r--cpp/src/IceStorm/Instrumentation.ice3
-rw-r--r--cpp/src/IceStorm/InstrumentationI.cpp3
-rw-r--r--cpp/src/IceStorm/InstrumentationI.h3
-rw-r--r--cpp/src/IceStorm/LLURecord.ice3
-rw-r--r--cpp/src/IceStorm/LinkRecord.ice3
-rw-r--r--cpp/src/IceStorm/Makefile.mk3
-rw-r--r--cpp/src/IceStorm/NodeI.cpp3
-rw-r--r--cpp/src/IceStorm/NodeI.h3
-rw-r--r--cpp/src/IceStorm/Observers.cpp3
-rw-r--r--cpp/src/IceStorm/Observers.h3
-rw-r--r--cpp/src/IceStorm/Parser.cpp3
-rw-r--r--cpp/src/IceStorm/Parser.h3
-rw-r--r--cpp/src/IceStorm/Replica.h3
-rw-r--r--cpp/src/IceStorm/Scanner.cpp3
-rw-r--r--cpp/src/IceStorm/Scanner.l3
-rw-r--r--cpp/src/IceStorm/Service.cpp3
-rw-r--r--cpp/src/IceStorm/Service.h3
-rw-r--r--cpp/src/IceStorm/Subscriber.cpp3
-rw-r--r--cpp/src/IceStorm/Subscriber.h3
-rw-r--r--cpp/src/IceStorm/SubscriberRecord.ice3
-rw-r--r--cpp/src/IceStorm/TopicI.cpp3
-rw-r--r--cpp/src/IceStorm/TopicI.h3
-rw-r--r--cpp/src/IceStorm/TopicManagerI.cpp3
-rw-r--r--cpp/src/IceStorm/TopicManagerI.h3
-rw-r--r--cpp/src/IceStorm/TraceLevels.cpp3
-rw-r--r--cpp/src/IceStorm/TraceLevels.h3
-rw-r--r--cpp/src/IceStorm/TransientTopicI.cpp3
-rw-r--r--cpp/src/IceStorm/TransientTopicI.h3
-rw-r--r--cpp/src/IceStorm/TransientTopicManagerI.cpp3
-rw-r--r--cpp/src/IceStorm/TransientTopicManagerI.h3
-rw-r--r--cpp/src/IceStorm/Util.cpp3
-rw-r--r--cpp/src/IceStorm/Util.h3
-rw-r--r--cpp/src/IceStormLib/Makefile.mk3
-rw-r--r--cpp/src/IceUtil/ConsoleUtil.cpp3
-rw-r--r--cpp/src/IceUtil/ConvertUTF.cpp3
-rw-r--r--cpp/src/IceUtil/ConvertUTF.h3
-rw-r--r--cpp/src/IceUtil/CtrlCHandler.cpp3
-rw-r--r--cpp/src/IceUtil/FileUtil.cpp3
-rw-r--r--cpp/src/IceUtil/InputUtil.cpp3
-rw-r--r--cpp/src/IceUtil/Makefile.mk3
-rw-r--r--cpp/src/IceUtil/MutexProtocol.cpp3
-rw-r--r--cpp/src/IceUtil/Options.cpp3
-rw-r--r--cpp/src/IceUtil/OutputUtil.cpp3
-rw-r--r--cpp/src/IceUtil/Random.cpp3
-rw-r--r--cpp/src/IceUtil/RecMutex.cpp3
-rw-r--r--cpp/src/IceUtil/Shared.cpp3
-rw-r--r--cpp/src/IceUtil/StringConverter.cpp3
-rw-r--r--cpp/src/IceUtil/StringUtil.cpp3
-rw-r--r--cpp/src/IceUtil/ThreadException.cpp3
-rw-r--r--cpp/src/IceUtil/Time.cpp3
-rw-r--r--cpp/src/IceUtil/UUID.cpp3
-rw-r--r--cpp/src/IceUtil/Unicode.cpp3
-rw-r--r--cpp/src/IceUtil/Unicode.h3
-rw-r--r--cpp/src/IceUtil/UtilException.cpp3
-rw-r--r--cpp/src/IceXML/Makefile.mk3
-rw-r--r--cpp/src/IceXML/Parser.cpp3
-rw-r--r--cpp/src/IceXML/Parser.h3
-rw-r--r--cpp/src/Slice/CPlusPlusUtil.cpp6
-rw-r--r--cpp/src/Slice/CPlusPlusUtil.h3
-rw-r--r--cpp/src/Slice/Checksum.cpp3
-rw-r--r--cpp/src/Slice/Checksum.h3
-rw-r--r--cpp/src/Slice/FileTracker.cpp3
-rw-r--r--cpp/src/Slice/FileTracker.h3
-rw-r--r--cpp/src/Slice/Grammar.cpp3
-rw-r--r--cpp/src/Slice/Grammar.y3
-rw-r--r--cpp/src/Slice/GrammarUtil.h3
-rw-r--r--cpp/src/Slice/JavaUtil.cpp6
-rw-r--r--cpp/src/Slice/JavaUtil.h3
-rw-r--r--cpp/src/Slice/MD5.cpp3
-rw-r--r--cpp/src/Slice/MD5.h3
-rw-r--r--cpp/src/Slice/Makefile.mk3
-rw-r--r--cpp/src/Slice/PHPUtil.cpp3
-rw-r--r--cpp/src/Slice/PHPUtil.h3
-rw-r--r--cpp/src/Slice/Parser.cpp3
-rw-r--r--cpp/src/Slice/Parser.h3
-rw-r--r--cpp/src/Slice/Preprocessor.cpp3
-rw-r--r--cpp/src/Slice/Preprocessor.h3
-rw-r--r--cpp/src/Slice/Python.cpp3
-rw-r--r--cpp/src/Slice/PythonUtil.cpp6
-rw-r--r--cpp/src/Slice/PythonUtil.h3
-rw-r--r--cpp/src/Slice/Ruby.cpp3
-rw-r--r--cpp/src/Slice/RubyUtil.cpp6
-rw-r--r--cpp/src/Slice/RubyUtil.h3
-rw-r--r--cpp/src/Slice/Scanner.cpp3
-rw-r--r--cpp/src/Slice/Scanner.l3
-rw-r--r--cpp/src/Slice/SliceUtil.cpp3
-rw-r--r--cpp/src/Slice/StringLiteralUtil.cpp3
-rw-r--r--cpp/src/Slice/Util.h3
-rw-r--r--cpp/src/icegriddb/DBTypes.ice3
-rw-r--r--cpp/src/icegriddb/IceGridDB.cpp3
-rw-r--r--cpp/src/icegriddb/Makefile.mk3
-rw-r--r--cpp/src/iceserviceinstall/Install.cpp3
-rw-r--r--cpp/src/iceserviceinstall/ServiceInstaller.cpp3
-rw-r--r--cpp/src/iceserviceinstall/ServiceInstaller.h3
-rw-r--r--cpp/src/slice2confluence/ConfluenceOutput.cpp3
-rw-r--r--cpp/src/slice2confluence/ConfluenceOutput.h3
-rw-r--r--cpp/src/slice2confluence/Gen.cpp3
-rw-r--r--cpp/src/slice2confluence/Gen.h3
-rw-r--r--cpp/src/slice2confluence/Main.cpp3
-rw-r--r--cpp/src/slice2cpp/Gen.cpp3
-rw-r--r--cpp/src/slice2cpp/Gen.h3
-rw-r--r--cpp/src/slice2cpp/Main.cpp3
-rw-r--r--cpp/src/slice2cs/CsUtil.cpp3
-rw-r--r--cpp/src/slice2cs/CsUtil.h3
-rw-r--r--cpp/src/slice2cs/DotNetNames.cpp3
-rw-r--r--cpp/src/slice2cs/DotNetNames.h3
-rw-r--r--cpp/src/slice2cs/Gen.cpp6
-rw-r--r--cpp/src/slice2cs/Gen.h3
-rw-r--r--cpp/src/slice2cs/Main.cpp3
-rw-r--r--cpp/src/slice2html/Gen.cpp3
-rw-r--r--cpp/src/slice2html/Gen.h3
-rw-r--r--cpp/src/slice2html/Main.cpp3
-rw-r--r--cpp/src/slice2java/Gen.cpp3
-rw-r--r--cpp/src/slice2java/Gen.h3
-rw-r--r--cpp/src/slice2java/GenCompat.cpp3
-rw-r--r--cpp/src/slice2java/GenCompat.h3
-rw-r--r--cpp/src/slice2java/Main.cpp3
-rw-r--r--cpp/src/slice2js/Gen.cpp6
-rw-r--r--cpp/src/slice2js/Gen.h3
-rw-r--r--cpp/src/slice2js/JsUtil.cpp3
-rw-r--r--cpp/src/slice2js/JsUtil.h3
-rw-r--r--cpp/src/slice2js/Main.cpp3
-rw-r--r--cpp/src/slice2matlab/Main.cpp3
-rw-r--r--cpp/src/slice2objc/Gen.cpp6
-rw-r--r--cpp/src/slice2objc/Gen.h3
-rw-r--r--cpp/src/slice2objc/Main.cpp3
-rw-r--r--cpp/src/slice2objc/ObjCUtil.cpp3
-rw-r--r--cpp/src/slice2objc/ObjCUtil.h3
-rw-r--r--cpp/src/slice2php/Main.cpp6
-rw-r--r--cpp/src/slice2py/Main.cpp3
-rw-r--r--cpp/src/slice2rb/Main.cpp3
599 files changed, 0 insertions, 1821 deletions
diff --git a/cpp/src/Glacier2/Blobject.cpp b/cpp/src/Glacier2/Blobject.cpp
index 10530705621..ec44083d713 100644
--- a/cpp/src/Glacier2/Blobject.cpp
+++ b/cpp/src/Glacier2/Blobject.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Glacier2/Blobject.h>
diff --git a/cpp/src/Glacier2/Blobject.h b/cpp/src/Glacier2/Blobject.h
index be9aea43761..d81d016ad55 100644
--- a/cpp/src/Glacier2/Blobject.h
+++ b/cpp/src/Glacier2/Blobject.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef BLOBJECT_H
diff --git a/cpp/src/Glacier2/ClientBlobject.cpp b/cpp/src/Glacier2/ClientBlobject.cpp
index 65f92133f8d..2ab1871b293 100644
--- a/cpp/src/Glacier2/ClientBlobject.cpp
+++ b/cpp/src/Glacier2/ClientBlobject.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Glacier2/ClientBlobject.h>
diff --git a/cpp/src/Glacier2/ClientBlobject.h b/cpp/src/Glacier2/ClientBlobject.h
index eb57d110cd5..5d1765b6e79 100644
--- a/cpp/src/Glacier2/ClientBlobject.h
+++ b/cpp/src/Glacier2/ClientBlobject.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef CLIENT_BLOBJECT_H
diff --git a/cpp/src/Glacier2/FilterI.cpp b/cpp/src/Glacier2/FilterI.cpp
index fc06d600db5..9153ff6497f 100644
--- a/cpp/src/Glacier2/FilterI.cpp
+++ b/cpp/src/Glacier2/FilterI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Properties.h>
diff --git a/cpp/src/Glacier2/FilterI.h b/cpp/src/Glacier2/FilterI.h
index 284dab63f04..098d75c53a8 100644
--- a/cpp/src/Glacier2/FilterI.h
+++ b/cpp/src/Glacier2/FilterI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef FILTER_I_H
#define FILTER_I_H
diff --git a/cpp/src/Glacier2/FilterManager.cpp b/cpp/src/Glacier2/FilterManager.cpp
index 05e787fd55b..148583ebde5 100644
--- a/cpp/src/Glacier2/FilterManager.cpp
+++ b/cpp/src/Glacier2/FilterManager.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Communicator.h>
diff --git a/cpp/src/Glacier2/FilterManager.h b/cpp/src/Glacier2/FilterManager.h
index fdc82b3458a..8fc7119b631 100644
--- a/cpp/src/Glacier2/FilterManager.h
+++ b/cpp/src/Glacier2/FilterManager.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef FILTER_MANAGER_H
diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp
index 03ce348a828..5f38d12a461 100644
--- a/cpp/src/Glacier2/Glacier2Router.cpp
+++ b/cpp/src/Glacier2/Glacier2Router.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/UUID.h>
diff --git a/cpp/src/Glacier2/Instance.cpp b/cpp/src/Glacier2/Instance.cpp
index b81ea6b166f..0392c588d02 100644
--- a/cpp/src/Glacier2/Instance.cpp
+++ b/cpp/src/Glacier2/Instance.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Glacier2/SessionRouterI.h>
diff --git a/cpp/src/Glacier2/Instance.h b/cpp/src/Glacier2/Instance.h
index c74657f767c..7ec1f80d134 100644
--- a/cpp/src/Glacier2/Instance.h
+++ b/cpp/src/Glacier2/Instance.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef GLACIER2_INSTANCE_H
diff --git a/cpp/src/Glacier2/Instrumentation.ice b/cpp/src/Glacier2/Instrumentation.ice
index adfd9bc68c8..e86f35cedf5 100644
--- a/cpp/src/Glacier2/Instrumentation.ice
+++ b/cpp/src/Glacier2/Instrumentation.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/Glacier2/InstrumentationI.cpp b/cpp/src/Glacier2/InstrumentationI.cpp
index ced0cdf8f74..cd5efce3585 100644
--- a/cpp/src/Glacier2/InstrumentationI.cpp
+++ b/cpp/src/Glacier2/InstrumentationI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Glacier2/InstrumentationI.h>
diff --git a/cpp/src/Glacier2/InstrumentationI.h b/cpp/src/Glacier2/InstrumentationI.h
index 0c3882f4130..6b846d5e90e 100644
--- a/cpp/src/Glacier2/InstrumentationI.h
+++ b/cpp/src/Glacier2/InstrumentationI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef INSTRUMENTATION_I_H
diff --git a/cpp/src/Glacier2/Makefile.mk b/cpp/src/Glacier2/Makefile.mk
index 49750457d40..74fb91a3a44 100644
--- a/cpp/src/Glacier2/Makefile.mk
+++ b/cpp/src/Glacier2/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_programs := glacier2router
diff --git a/cpp/src/Glacier2/ProxyVerifier.cpp b/cpp/src/Glacier2/ProxyVerifier.cpp
index 007d43e2400..a08e3ee02ed 100644
--- a/cpp/src/Glacier2/ProxyVerifier.cpp
+++ b/cpp/src/Glacier2/ProxyVerifier.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Glacier2/ProxyVerifier.h>
diff --git a/cpp/src/Glacier2/ProxyVerifier.h b/cpp/src/Glacier2/ProxyVerifier.h
index f7f1e81770f..b5ba17a1222 100644
--- a/cpp/src/Glacier2/ProxyVerifier.h
+++ b/cpp/src/Glacier2/ProxyVerifier.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_PROXY_VERIFIER_H
diff --git a/cpp/src/Glacier2/RequestQueue.cpp b/cpp/src/Glacier2/RequestQueue.cpp
index a4b9976233a..4e96253a3c5 100644
--- a/cpp/src/Glacier2/RequestQueue.cpp
+++ b/cpp/src/Glacier2/RequestQueue.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Glacier2/RequestQueue.h>
diff --git a/cpp/src/Glacier2/RequestQueue.h b/cpp/src/Glacier2/RequestQueue.h
index 7b36ce123f6..fb06e77c155 100644
--- a/cpp/src/Glacier2/RequestQueue.h
+++ b/cpp/src/Glacier2/RequestQueue.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef REQUEST_H
diff --git a/cpp/src/Glacier2/RouterI.cpp b/cpp/src/Glacier2/RouterI.cpp
index 12c1e98d7b9..f32c1d06db9 100644
--- a/cpp/src/Glacier2/RouterI.cpp
+++ b/cpp/src/Glacier2/RouterI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Random.h>
diff --git a/cpp/src/Glacier2/RouterI.h b/cpp/src/Glacier2/RouterI.h
index 895c339f747..03d42898aac 100644
--- a/cpp/src/Glacier2/RouterI.h
+++ b/cpp/src/Glacier2/RouterI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef GLACIER2_ROUTER_I_H
diff --git a/cpp/src/Glacier2/RoutingTable.cpp b/cpp/src/Glacier2/RoutingTable.cpp
index 934f2fe556e..a5958dfffca 100644
--- a/cpp/src/Glacier2/RoutingTable.cpp
+++ b/cpp/src/Glacier2/RoutingTable.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Glacier2/RoutingTable.h>
diff --git a/cpp/src/Glacier2/RoutingTable.h b/cpp/src/Glacier2/RoutingTable.h
index 33d8a1dc0ce..ff50e384968 100644
--- a/cpp/src/Glacier2/RoutingTable.h
+++ b/cpp/src/Glacier2/RoutingTable.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_ROUTING_TABLE_H
diff --git a/cpp/src/Glacier2/ServerBlobject.cpp b/cpp/src/Glacier2/ServerBlobject.cpp
index 36871828be3..c1a5a1ad79c 100644
--- a/cpp/src/Glacier2/ServerBlobject.cpp
+++ b/cpp/src/Glacier2/ServerBlobject.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Glacier2/ServerBlobject.h>
diff --git a/cpp/src/Glacier2/ServerBlobject.h b/cpp/src/Glacier2/ServerBlobject.h
index ef1703b98b7..5e81784e9d0 100644
--- a/cpp/src/Glacier2/ServerBlobject.h
+++ b/cpp/src/Glacier2/ServerBlobject.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef SERVER_BLOBJECT_H
diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp
index 6b3831107b1..709c6428dda 100644
--- a/cpp/src/Glacier2/SessionRouterI.cpp
+++ b/cpp/src/Glacier2/SessionRouterI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Glacier2/SessionRouterI.h>
diff --git a/cpp/src/Glacier2/SessionRouterI.h b/cpp/src/Glacier2/SessionRouterI.h
index 76196f9481b..4360837667f 100644
--- a/cpp/src/Glacier2/SessionRouterI.h
+++ b/cpp/src/Glacier2/SessionRouterI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef GLACIER2_SESSION_ROUTER_I_H
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
index f246171010d..7a13f6e0b28 100644
--- a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Glacier2/PermissionsVerifier.h>
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk
index a6ac012c664..8f56b2d33ed 100644
--- a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_libraries += Glacier2CryptPermissionsVerifier
diff --git a/cpp/src/Glacier2Lib/Application.cpp b/cpp/src/Glacier2Lib/Application.cpp
index b69ca6a10c1..ed30e5db11e 100644
--- a/cpp/src/Glacier2Lib/Application.cpp
+++ b/cpp/src/Glacier2Lib/Application.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Glacier2/Application.h>
diff --git a/cpp/src/Glacier2Lib/Makefile.mk b/cpp/src/Glacier2Lib/Makefile.mk
index 3cc5699513b..f2e43b6eb00 100644
--- a/cpp/src/Glacier2Lib/Makefile.mk
+++ b/cpp/src/Glacier2Lib/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_libraries := Glacier2
diff --git a/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp b/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp
index 92cfdcf8a8c..a6690b42622 100644
--- a/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp
+++ b/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Glacier2/PermissionsVerifier.h>
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp
index a5afb22d904..637cd84a5e1 100644
--- a/cpp/src/Glacier2Lib/SessionHelper.cpp
+++ b/cpp/src/Glacier2Lib/SessionHelper.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Glacier2/SessionHelper.h>
diff --git a/cpp/src/Ice/ACM.cpp b/cpp/src/Ice/ACM.cpp
index dfd8acab520..af83fc34e03 100644
--- a/cpp/src/Ice/ACM.cpp
+++ b/cpp/src/Ice/ACM.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/ACM.h>
diff --git a/cpp/src/Ice/ACM.h b/cpp/src/Ice/ACM.h
index d0b1b56e8e3..a2bfb2e7e98 100644
--- a/cpp/src/Ice/ACM.h
+++ b/cpp/src/Ice/ACM.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_ACM_H
diff --git a/cpp/src/Ice/ACMF.h b/cpp/src/Ice/ACMF.h
index f2755216fd1..db5b0ca11fb 100644
--- a/cpp/src/Ice/ACMF.h
+++ b/cpp/src/Ice/ACMF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_ACM_F_H
diff --git a/cpp/src/Ice/Acceptor.cpp b/cpp/src/Ice/Acceptor.cpp
index 3f99998e026..f75b59f9e93 100644
--- a/cpp/src/Ice/Acceptor.cpp
+++ b/cpp/src/Ice/Acceptor.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Acceptor.h>
diff --git a/cpp/src/Ice/Acceptor.h b/cpp/src/Ice/Acceptor.h
index ab86a82f096..6eea03359c2 100644
--- a/cpp/src/Ice/Acceptor.h
+++ b/cpp/src/Ice/Acceptor.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_ACCEPTOR_H
diff --git a/cpp/src/Ice/AcceptorF.h b/cpp/src/Ice/AcceptorF.h
index 4ce06920099..eef36343c05 100644
--- a/cpp/src/Ice/AcceptorF.h
+++ b/cpp/src/Ice/AcceptorF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_ACCEPTOR_F_H
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index 3ab7bb57a05..21e884dda9a 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Application.h>
diff --git a/cpp/src/Ice/ArgVector.cpp b/cpp/src/Ice/ArgVector.cpp
index 44e4d43169c..e5eaf87b67c 100644
--- a/cpp/src/Ice/ArgVector.cpp
+++ b/cpp/src/Ice/ArgVector.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/ArgVector.h>
diff --git a/cpp/src/Ice/ArgVector.h b/cpp/src/Ice/ArgVector.h
index c9300df4a35..8dcdc024981 100644
--- a/cpp/src/Ice/ArgVector.h
+++ b/cpp/src/Ice/ArgVector.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_ARGVECTOR_H
diff --git a/cpp/src/Ice/AsyncResult.cpp b/cpp/src/Ice/AsyncResult.cpp
index 4234a832ba4..34cf22b04c5 100644
--- a/cpp/src/Ice/AsyncResult.cpp
+++ b/cpp/src/Ice/AsyncResult.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_CPP11_MAPPING
diff --git a/cpp/src/Ice/Base64.cpp b/cpp/src/Ice/Base64.cpp
index 2e9abcedf98..59f5f0234c3 100644
--- a/cpp/src/Ice/Base64.cpp
+++ b/cpp/src/Ice/Base64.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Base64.h>
diff --git a/cpp/src/Ice/Base64.h b/cpp/src/Ice/Base64.h
index 95b5a215685..e63d6ca8f43 100644
--- a/cpp/src/Ice/Base64.h
+++ b/cpp/src/Ice/Base64.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_BASE_64_H
diff --git a/cpp/src/Ice/BatchRequestQueue.cpp b/cpp/src/Ice/BatchRequestQueue.cpp
index 5fc62127ece..6618d863cbd 100644
--- a/cpp/src/Ice/BatchRequestQueue.cpp
+++ b/cpp/src/Ice/BatchRequestQueue.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/BatchRequestQueue.h>
diff --git a/cpp/src/Ice/BatchRequestQueue.h b/cpp/src/Ice/BatchRequestQueue.h
index be759cc0aab..f87d0874c26 100644
--- a/cpp/src/Ice/BatchRequestQueue.h
+++ b/cpp/src/Ice/BatchRequestQueue.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_BATCH_REQUEST_QUEUE_H
diff --git a/cpp/src/Ice/Buffer.cpp b/cpp/src/Ice/Buffer.cpp
index 6a73213bf8d..00f557f3a68 100644
--- a/cpp/src/Ice/Buffer.cpp
+++ b/cpp/src/Ice/Buffer.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Buffer.h>
diff --git a/cpp/src/Ice/CollocatedRequestHandler.cpp b/cpp/src/Ice/CollocatedRequestHandler.cpp
index 8dae5644cae..f00257f24f3 100644
--- a/cpp/src/Ice/CollocatedRequestHandler.cpp
+++ b/cpp/src/Ice/CollocatedRequestHandler.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/CollocatedRequestHandler.h>
diff --git a/cpp/src/Ice/CollocatedRequestHandler.h b/cpp/src/Ice/CollocatedRequestHandler.h
index f3bac1633d9..f0ed8b29f30 100644
--- a/cpp/src/Ice/CollocatedRequestHandler.h
+++ b/cpp/src/Ice/CollocatedRequestHandler.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_COLLOCATED_REQUEST_HANDLER_H
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index 2f5d2e751cf..0a8a6a03815 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/CommunicatorI.h>
diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h
index 4273bbe5d63..776fde355d6 100644
--- a/cpp/src/Ice/CommunicatorI.h
+++ b/cpp/src/Ice/CommunicatorI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_COMMUNICATOR_I_H
diff --git a/cpp/src/Ice/Cond.cpp b/cpp/src/Ice/Cond.cpp
index 96015dda0d2..02d4003bbdb 100644
--- a/cpp/src/Ice/Cond.cpp
+++ b/cpp/src/Ice/Cond.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Cond.h>
diff --git a/cpp/src/Ice/ConnectRequestHandler.cpp b/cpp/src/Ice/ConnectRequestHandler.cpp
index 2ed48681bc8..0be8fe54899 100644
--- a/cpp/src/Ice/ConnectRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectRequestHandler.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/ConnectRequestHandler.h>
diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h
index 2eef26cd062..dc0fbf45f23 100644
--- a/cpp/src/Ice/ConnectRequestHandler.h
+++ b/cpp/src/Ice/ConnectRequestHandler.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_CONNECT_REQUEST_HANDLER_H
diff --git a/cpp/src/Ice/ConnectRequestHandlerF.h b/cpp/src/Ice/ConnectRequestHandlerF.h
index 08856fa3808..8c82187b170 100644
--- a/cpp/src/Ice/ConnectRequestHandlerF.h
+++ b/cpp/src/Ice/ConnectRequestHandlerF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_CONNECT_REQUEST_HANDLER_F_H
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index 00eb3d7c4e8..40d76f896c9 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/ConnectionFactory.h>
diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h
index 5ca310b65e1..7ae02361601 100644
--- a/cpp/src/Ice/ConnectionFactory.h
+++ b/cpp/src/Ice/ConnectionFactory.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_CONNECTION_FACTORY_H
diff --git a/cpp/src/Ice/ConnectionFactoryF.h b/cpp/src/Ice/ConnectionFactoryF.h
index 2ff28fbc632..ff0d4734089 100644
--- a/cpp/src/Ice/ConnectionFactoryF.h
+++ b/cpp/src/Ice/ConnectionFactoryF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_CONNECTION_FACTORY_F_H
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index 4b4cede42b5..dc6691649e5 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h
index 84ba7d2baac..956c72d9355 100644
--- a/cpp/src/Ice/ConnectionI.h
+++ b/cpp/src/Ice/ConnectionI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_CONNECTION_I_H
diff --git a/cpp/src/Ice/ConnectionRequestHandler.cpp b/cpp/src/Ice/ConnectionRequestHandler.cpp
index 276814dd575..72ae5a27581 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectionRequestHandler.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/ConnectionRequestHandler.h>
diff --git a/cpp/src/Ice/ConnectionRequestHandler.h b/cpp/src/Ice/ConnectionRequestHandler.h
index f01c8cc704e..ed599b35547 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.h
+++ b/cpp/src/Ice/ConnectionRequestHandler.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_CONNECTION_REQUEST_HANDLER_H
diff --git a/cpp/src/Ice/Connector.cpp b/cpp/src/Ice/Connector.cpp
index f870c56ae45..be758b132eb 100644
--- a/cpp/src/Ice/Connector.cpp
+++ b/cpp/src/Ice/Connector.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Connector.h>
diff --git a/cpp/src/Ice/Connector.h b/cpp/src/Ice/Connector.h
index 0a1cbdb85da..c4b3b6e3e25 100644
--- a/cpp/src/Ice/Connector.h
+++ b/cpp/src/Ice/Connector.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_CONNECTOR_H
diff --git a/cpp/src/Ice/ConnectorF.h b/cpp/src/Ice/ConnectorF.h
index 6dbeb1bd778..29f7957885d 100644
--- a/cpp/src/Ice/ConnectorF.h
+++ b/cpp/src/Ice/ConnectorF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_CONNECTOR_F_H
diff --git a/cpp/src/Ice/CountDownLatch.cpp b/cpp/src/Ice/CountDownLatch.cpp
index a81c7d2c433..e29393a059a 100644
--- a/cpp/src/Ice/CountDownLatch.cpp
+++ b/cpp/src/Ice/CountDownLatch.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/CountDownLatch.h>
diff --git a/cpp/src/Ice/DLLMain.cpp b/cpp/src/Ice/DLLMain.cpp
index 75e3de65306..f7da03b5bc5 100644
--- a/cpp/src/Ice/DLLMain.cpp
+++ b/cpp/src/Ice/DLLMain.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/ImplicitContextI.h>
diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp
index 28ce655d279..030ee6e8c6d 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.cpp
+++ b/cpp/src/Ice/DefaultsAndOverrides.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/DefaultsAndOverrides.h>
diff --git a/cpp/src/Ice/DefaultsAndOverrides.h b/cpp/src/Ice/DefaultsAndOverrides.h
index 26bbf33e767..7d95ca7ee11 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.h
+++ b/cpp/src/Ice/DefaultsAndOverrides.h
@@ -3,9 +3,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_DEFAULTS_AND_OVERRIDES_H
diff --git a/cpp/src/Ice/DefaultsAndOverridesF.h b/cpp/src/Ice/DefaultsAndOverridesF.h
index 767ca1108c6..1336077b536 100644
--- a/cpp/src/Ice/DefaultsAndOverridesF.h
+++ b/cpp/src/Ice/DefaultsAndOverridesF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_DEFAULTS_AND_OVERRIDES_F_H
diff --git a/cpp/src/Ice/DispatchInterceptor.cpp b/cpp/src/Ice/DispatchInterceptor.cpp
index f9039154627..fa41f4796c4 100644
--- a/cpp/src/Ice/DispatchInterceptor.cpp
+++ b/cpp/src/Ice/DispatchInterceptor.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/DispatchInterceptor.h>
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp
index 59ffeb61e1d..75dea12610b 100644
--- a/cpp/src/Ice/DynamicLibrary.cpp
+++ b/cpp/src/Ice/DynamicLibrary.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/DynamicLibrary.h>
diff --git a/cpp/src/Ice/EndpointFactory.cpp b/cpp/src/Ice/EndpointFactory.cpp
index 41d3ff41a42..d040c737b8a 100644
--- a/cpp/src/Ice/EndpointFactory.cpp
+++ b/cpp/src/Ice/EndpointFactory.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/EndpointFactory.h>
diff --git a/cpp/src/Ice/EndpointFactory.h b/cpp/src/Ice/EndpointFactory.h
index 7e9f4f57bbe..8333b820ea5 100644
--- a/cpp/src/Ice/EndpointFactory.h
+++ b/cpp/src/Ice/EndpointFactory.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_ENDPOINT_FACTORY_H
diff --git a/cpp/src/Ice/EndpointFactoryF.h b/cpp/src/Ice/EndpointFactoryF.h
index 8bbdaf29fcc..10fa4cc5311 100644
--- a/cpp/src/Ice/EndpointFactoryF.h
+++ b/cpp/src/Ice/EndpointFactoryF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_ENDPOINT_FACTORY_F_H
diff --git a/cpp/src/Ice/EndpointFactoryManager.cpp b/cpp/src/Ice/EndpointFactoryManager.cpp
index f023a6306ce..ea653bb55f5 100644
--- a/cpp/src/Ice/EndpointFactoryManager.cpp
+++ b/cpp/src/Ice/EndpointFactoryManager.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/EndpointFactoryManager.h>
diff --git a/cpp/src/Ice/EndpointFactoryManager.h b/cpp/src/Ice/EndpointFactoryManager.h
index 2a6b017ba93..eb2fc71d983 100644
--- a/cpp/src/Ice/EndpointFactoryManager.h
+++ b/cpp/src/Ice/EndpointFactoryManager.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_ENDPOINT_FACTORY_MANAGER_H
diff --git a/cpp/src/Ice/EndpointFactoryManagerF.h b/cpp/src/Ice/EndpointFactoryManagerF.h
index 010f02628e1..32e21e25a67 100644
--- a/cpp/src/Ice/EndpointFactoryManagerF.h
+++ b/cpp/src/Ice/EndpointFactoryManagerF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_ENDPOINT_FACTORY_MANAGER_F_H
diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp
index 6a870473439..367795c6477 100644
--- a/cpp/src/Ice/EndpointI.cpp
+++ b/cpp/src/Ice/EndpointI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/EndpointI.h>
diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h
index b0ceb38ae6e..b46abe30208 100644
--- a/cpp/src/Ice/EndpointI.h
+++ b/cpp/src/Ice/EndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_ENDPOINT_I_H
diff --git a/cpp/src/Ice/EndpointIF.h b/cpp/src/Ice/EndpointIF.h
index c3dd73501c8..d8dc7e20fd7 100644
--- a/cpp/src/Ice/EndpointIF.h
+++ b/cpp/src/Ice/EndpointIF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_ENDPOINT_I_F_H
diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp
index 5e348f2654f..3cb1d2138a7 100644
--- a/cpp/src/Ice/EventHandler.cpp
+++ b/cpp/src/Ice/EventHandler.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/EventHandler.h>
diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h
index 74b92361d1b..99f8b4cc1b6 100644
--- a/cpp/src/Ice/EventHandler.h
+++ b/cpp/src/Ice/EventHandler.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_EVENT_HANDLER_H
diff --git a/cpp/src/Ice/EventHandlerF.h b/cpp/src/Ice/EventHandlerF.h
index f9495bcd0f8..6b95c6ed842 100644
--- a/cpp/src/Ice/EventHandlerF.h
+++ b/cpp/src/Ice/EventHandlerF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_EVENT_HANDLER_F_H
diff --git a/cpp/src/Ice/EventLoggerMsg.mc b/cpp/src/Ice/EventLoggerMsg.mc
index 0265e835eac..7f512f34025 100755
--- a/cpp/src/Ice/EventLoggerMsg.mc
+++ b/cpp/src/Ice/EventLoggerMsg.mc
@@ -2,9 +2,6 @@
; //
; // Copyright (c) 2003-present 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.
-; //
; // **********************************************************************
MessageId=0x0
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 51b9bd77c3c..459cdcfc8fa 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Exception.h>
diff --git a/cpp/src/Ice/FactoryTable.cpp b/cpp/src/Ice/FactoryTable.cpp
index 570c1414a7f..3fea598436a 100644
--- a/cpp/src/Ice/FactoryTable.cpp
+++ b/cpp/src/Ice/FactoryTable.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/FactoryTable.h>
diff --git a/cpp/src/Ice/FactoryTableInit.cpp b/cpp/src/Ice/FactoryTableInit.cpp
index 211239f9748..7230b1711b0 100644
--- a/cpp/src/Ice/FactoryTableInit.cpp
+++ b/cpp/src/Ice/FactoryTableInit.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/FactoryTableInit.h>
diff --git a/cpp/src/Ice/GCObject.cpp b/cpp/src/Ice/GCObject.cpp
index 92a2e34bfe9..988185c446d 100644
--- a/cpp/src/Ice/GCObject.cpp
+++ b/cpp/src/Ice/GCObject.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/GCObject.h>
diff --git a/cpp/src/Ice/HashUtil.h b/cpp/src/Ice/HashUtil.h
index 14b9547e2c7..15faa844157 100644
--- a/cpp/src/Ice/HashUtil.h
+++ b/cpp/src/Ice/HashUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_HASH_UTIL_H
diff --git a/cpp/src/Ice/HttpParser.cpp b/cpp/src/Ice/HttpParser.cpp
index 9d0139a5e9e..d1578c59d03 100644
--- a/cpp/src/Ice/HttpParser.cpp
+++ b/cpp/src/Ice/HttpParser.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Config.h>
diff --git a/cpp/src/Ice/HttpParser.h b/cpp/src/Ice/HttpParser.h
index 449504b55ad..af992fe7e0e 100644
--- a/cpp/src/Ice/HttpParser.h
+++ b/cpp/src/Ice/HttpParser.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_HTTP_PARSER_H
diff --git a/cpp/src/Ice/IPEndpointI.cpp b/cpp/src/Ice/IPEndpointI.cpp
index b4c86f7b456..54aebd7641e 100644
--- a/cpp/src/Ice/IPEndpointI.cpp
+++ b/cpp/src/Ice/IPEndpointI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/IPEndpointI.h>
diff --git a/cpp/src/Ice/IPEndpointI.h b/cpp/src/Ice/IPEndpointI.h
index 427bb738ede..1c676668a54 100644
--- a/cpp/src/Ice/IPEndpointI.h
+++ b/cpp/src/Ice/IPEndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_IP_ENDPOINT_I_H
diff --git a/cpp/src/Ice/IPEndpointIF.h b/cpp/src/Ice/IPEndpointIF.h
index ad6350e1030..4feace4fae4 100644
--- a/cpp/src/Ice/IPEndpointIF.h
+++ b/cpp/src/Ice/IPEndpointIF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_IP_ENDPOINT_I_F_H
diff --git a/cpp/src/Ice/IconvStringConverter.cpp b/cpp/src/Ice/IconvStringConverter.cpp
index c6d50f9fc15..30665bba5a5 100644
--- a/cpp/src/Ice/IconvStringConverter.cpp
+++ b/cpp/src/Ice/IconvStringConverter.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/IconvStringConverter.h>
diff --git a/cpp/src/Ice/ImplicitContextI.cpp b/cpp/src/Ice/ImplicitContextI.cpp
index 0ebb4dad963..74f5c9ed209 100644
--- a/cpp/src/Ice/ImplicitContextI.cpp
+++ b/cpp/src/Ice/ImplicitContextI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/ImplicitContextI.h>
diff --git a/cpp/src/Ice/ImplicitContextI.h b/cpp/src/Ice/ImplicitContextI.h
index 44fc9683e29..ec81e4f944e 100644
--- a/cpp/src/Ice/ImplicitContextI.h
+++ b/cpp/src/Ice/ImplicitContextI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_IMPLICIT_CONTEXT_I_H
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index 3e1b87e9f3e..e8ee2feb844 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Incoming.h>
diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp
index 0c90aa4a240..543a0419565 100644
--- a/cpp/src/Ice/IncomingAsync.cpp
+++ b/cpp/src/Ice/IncomingAsync.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/IncomingAsync.h>
diff --git a/cpp/src/Ice/IncomingRequest.h b/cpp/src/Ice/IncomingRequest.h
index 9c3251e9701..a3e40ee4965 100644
--- a/cpp/src/Ice/IncomingRequest.h
+++ b/cpp/src/Ice/IncomingRequest.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_INCOMING_REQUEST_H
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index 916992cc7ff..b81cc91bdab 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/ArgVector.h>
diff --git a/cpp/src/Ice/InputStream.cpp b/cpp/src/Ice/InputStream.cpp
index d10d1324e3c..943b51f255d 100644
--- a/cpp/src/Ice/InputStream.cpp
+++ b/cpp/src/Ice/InputStream.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index a701e3325e7..d8dd997e45c 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h
index 968af794fe5..1570969aaa6 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_INSTANCE_H
diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp
index e323f7e128a..449356d43e3 100644
--- a/cpp/src/Ice/InstrumentationI.cpp
+++ b/cpp/src/Ice/InstrumentationI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/InstrumentationI.h>
diff --git a/cpp/src/Ice/InstrumentationI.h b/cpp/src/Ice/InstrumentationI.h
index 3319887de68..2ead12457ab 100644
--- a/cpp/src/Ice/InstrumentationI.h
+++ b/cpp/src/Ice/InstrumentationI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_INSTRUMENTATION_I_H
diff --git a/cpp/src/Ice/LocalObject.cpp b/cpp/src/Ice/LocalObject.cpp
index b719bf5dee4..254bd23c08a 100644
--- a/cpp/src/Ice/LocalObject.cpp
+++ b/cpp/src/Ice/LocalObject.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/LocalObject.h>
diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp
index 131261c688a..7b686ed898b 100644
--- a/cpp/src/Ice/LocatorInfo.cpp
+++ b/cpp/src/Ice/LocatorInfo.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h
index 9b0517b10bb..974faaebc95 100644
--- a/cpp/src/Ice/LocatorInfo.h
+++ b/cpp/src/Ice/LocatorInfo.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_LOCATOR_INFO_H
diff --git a/cpp/src/Ice/LocatorInfoF.h b/cpp/src/Ice/LocatorInfoF.h
index d568f67ec5b..170c3b47368 100644
--- a/cpp/src/Ice/LocatorInfoF.h
+++ b/cpp/src/Ice/LocatorInfoF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_LOCATOR_INFO_F_H
diff --git a/cpp/src/Ice/LoggerAdminI.cpp b/cpp/src/Ice/LoggerAdminI.cpp
index c2611e48d2c..c9d4169be3c 100644
--- a/cpp/src/Ice/LoggerAdminI.cpp
+++ b/cpp/src/Ice/LoggerAdminI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/LoggerAdminI.h>
diff --git a/cpp/src/Ice/LoggerAdminI.h b/cpp/src/Ice/LoggerAdminI.h
index 2e14f1aad8c..b1a97416271 100644
--- a/cpp/src/Ice/LoggerAdminI.h
+++ b/cpp/src/Ice/LoggerAdminI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_LOGGER_ADMIN_I_H
diff --git a/cpp/src/Ice/LoggerI.cpp b/cpp/src/Ice/LoggerI.cpp
index 647ce587c3a..bed87c9beb9 100644
--- a/cpp/src/Ice/LoggerI.cpp
+++ b/cpp/src/Ice/LoggerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Time.h>
diff --git a/cpp/src/Ice/LoggerI.h b/cpp/src/Ice/LoggerI.h
index 953b5deaa73..f71bcef9aa5 100644
--- a/cpp/src/Ice/LoggerI.h
+++ b/cpp/src/Ice/LoggerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_LOGGER_I_H
diff --git a/cpp/src/Ice/LoggerUtil.cpp b/cpp/src/Ice/LoggerUtil.cpp
index cb63b12a3df..67798cc290c 100644
--- a/cpp/src/Ice/LoggerUtil.cpp
+++ b/cpp/src/Ice/LoggerUtil.cpp
@@ -3,9 +3,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/LoggerUtil.h>
diff --git a/cpp/src/Ice/Makefile.mk b/cpp/src/Ice/Makefile.mk
index db471cb2966..84e2ee5cbfd 100644
--- a/cpp/src/Ice/Makefile.mk
+++ b/cpp/src/Ice/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_libraries = Ice
diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp
index 61f01beca24..5dd55417f51 100644
--- a/cpp/src/Ice/MetricsAdminI.cpp
+++ b/cpp/src/Ice/MetricsAdminI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/MetricsAdminI.h>
diff --git a/cpp/src/Ice/MetricsObserverI.cpp b/cpp/src/Ice/MetricsObserverI.cpp
index de288e38252..81accf60ec1 100644
--- a/cpp/src/Ice/MetricsObserverI.cpp
+++ b/cpp/src/Ice/MetricsObserverI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/MetricsObserverI.h>
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 592ff9ab9c1..0b7739a1900 100755
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
//
diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h
index 7d944d7f899..470c35816e0 100755
--- a/cpp/src/Ice/Network.h
+++ b/cpp/src/Ice/Network.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_NETWORK_H
diff --git a/cpp/src/Ice/NetworkF.h b/cpp/src/Ice/NetworkF.h
index 64c2bf48b08..8bde8bc0526 100644
--- a/cpp/src/Ice/NetworkF.h
+++ b/cpp/src/Ice/NetworkF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_NETWORK_F_H
diff --git a/cpp/src/Ice/NetworkProxy.cpp b/cpp/src/Ice/NetworkProxy.cpp
index 29d7bb25856..64514c70905 100644
--- a/cpp/src/Ice/NetworkProxy.cpp
+++ b/cpp/src/Ice/NetworkProxy.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/NetworkProxy.h>
diff --git a/cpp/src/Ice/NetworkProxy.h b/cpp/src/Ice/NetworkProxy.h
index 727c7fc7f19..fe3f7a896e4 100644
--- a/cpp/src/Ice/NetworkProxy.h
+++ b/cpp/src/Ice/NetworkProxy.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_NETWORK_PROXY_H
diff --git a/cpp/src/Ice/NetworkProxyF.h b/cpp/src/Ice/NetworkProxyF.h
index ba51bc84258..dc30f562150 100644
--- a/cpp/src/Ice/NetworkProxyF.h
+++ b/cpp/src/Ice/NetworkProxyF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_NETWORK_PROXY_F_H
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 770dcbfd6d9..74e228aba5b 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Object.h>
diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp
index 1073e645470..82b2d31cd80 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.cpp
+++ b/cpp/src/Ice/ObjectAdapterFactory.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/ObjectAdapterFactory.h>
diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h
index 90cbe3ec76c..b80d71ece70 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.h
+++ b/cpp/src/Ice/ObjectAdapterFactory.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_OBJECT_ADAPTER_FACTORY_H
diff --git a/cpp/src/Ice/ObjectAdapterFactoryF.h b/cpp/src/Ice/ObjectAdapterFactoryF.h
index 25caac5cf31..58d1c0702d3 100644
--- a/cpp/src/Ice/ObjectAdapterFactoryF.h
+++ b/cpp/src/Ice/ObjectAdapterFactoryF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_OBJECT_ADAPTER_FACTORY_F_H
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index 61b3c336c48..dbe6b87eeb4 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/UUID.h>
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h
index 9a0a6f29a97..209faa28e78 100644
--- a/cpp/src/Ice/ObjectAdapterI.h
+++ b/cpp/src/Ice/ObjectAdapterI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_OBJECT_ADAPTER_I_H
diff --git a/cpp/src/Ice/ObserverHelper.cpp b/cpp/src/Ice/ObserverHelper.cpp
index 73d0b5f2a39..a205267e1a5 100644
--- a/cpp/src/Ice/ObserverHelper.cpp
+++ b/cpp/src/Ice/ObserverHelper.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/ObserverHelper.h>
diff --git a/cpp/src/Ice/OpaqueEndpointI.cpp b/cpp/src/Ice/OpaqueEndpointI.cpp
index 608d29a4386..40b2a0061b4 100644
--- a/cpp/src/Ice/OpaqueEndpointI.cpp
+++ b/cpp/src/Ice/OpaqueEndpointI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/OpaqueEndpointI.h>
diff --git a/cpp/src/Ice/OpaqueEndpointI.h b/cpp/src/Ice/OpaqueEndpointI.h
index d57e229f2a8..6c65eaafa09 100644
--- a/cpp/src/Ice/OpaqueEndpointI.h
+++ b/cpp/src/Ice/OpaqueEndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_UNKNOWN_ENDPOINT_I_H
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index 9ddb9741a90..9ca32e6029a 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/OutgoingAsync.h>
diff --git a/cpp/src/Ice/OutputStream.cpp b/cpp/src/Ice/OutputStream.cpp
index 576b2dab63e..53c4c32a175 100644
--- a/cpp/src/Ice/OutputStream.cpp
+++ b/cpp/src/Ice/OutputStream.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/OutputStream.h>
diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp
index cb43e2c30d6..bc8aae6e9b8 100644
--- a/cpp/src/Ice/PluginManagerI.cpp
+++ b/cpp/src/Ice/PluginManagerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h
index 2d9c56d9171..d3b9089e51f 100644
--- a/cpp/src/Ice/PluginManagerI.h
+++ b/cpp/src/Ice/PluginManagerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_PLUGIN_MANAGER_I_H
diff --git a/cpp/src/Ice/PropertiesAdminI.cpp b/cpp/src/Ice/PropertiesAdminI.cpp
index 5e254bf4e0f..a198fe7832f 100644
--- a/cpp/src/Ice/PropertiesAdminI.cpp
+++ b/cpp/src/Ice/PropertiesAdminI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/PropertiesAdminI.h>
diff --git a/cpp/src/Ice/PropertiesAdminI.h b/cpp/src/Ice/PropertiesAdminI.h
index 44a13de43fb..82a1e2da26c 100644
--- a/cpp/src/Ice/PropertiesAdminI.h
+++ b/cpp/src/Ice/PropertiesAdminI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_PROPERTIES_ADMIN_I_H
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index 5e07681028b..7bdbe96add9 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/PropertiesI.h>
diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h
index a00d94c69f0..fcdf42cbbdc 100644
--- a/cpp/src/Ice/PropertiesI.h
+++ b/cpp/src/Ice/PropertiesI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_PROPERTIES_I_H
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 62d15554ac3..213ee6c2553 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Oct 25 22:10:11 2018
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index fc707a3e868..0f5df4cb150 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Oct 25 22:10:11 2018
diff --git a/cpp/src/Ice/Protocol.cpp b/cpp/src/Ice/Protocol.cpp
index 3d0fe2cd1d3..62d0d2706f7 100644
--- a/cpp/src/Ice/Protocol.cpp
+++ b/cpp/src/Ice/Protocol.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Protocol.h>
diff --git a/cpp/src/Ice/ProtocolInstance.cpp b/cpp/src/Ice/ProtocolInstance.cpp
index 8c8d4671231..bf2e7b67b7f 100644
--- a/cpp/src/Ice/ProtocolInstance.cpp
+++ b/cpp/src/Ice/ProtocolInstance.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/ProtocolInstance.h>
diff --git a/cpp/src/Ice/ProtocolInstance.h b/cpp/src/Ice/ProtocolInstance.h
index 744848040c6..c6f2893219c 100644
--- a/cpp/src/Ice/ProtocolInstance.h
+++ b/cpp/src/Ice/ProtocolInstance.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_PROTOCOL_INSTANCE_H
diff --git a/cpp/src/Ice/ProtocolInstanceF.h b/cpp/src/Ice/ProtocolInstanceF.h
index 47ee2a4220f..8c5fe3bd8ca 100644
--- a/cpp/src/Ice/ProtocolInstanceF.h
+++ b/cpp/src/Ice/ProtocolInstanceF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_PROTOCOL_INSTANCE_F_H
diff --git a/cpp/src/Ice/ProtocolPluginFacade.cpp b/cpp/src/Ice/ProtocolPluginFacade.cpp
index b224e0b0eeb..a9030670517 100644
--- a/cpp/src/Ice/ProtocolPluginFacade.cpp
+++ b/cpp/src/Ice/ProtocolPluginFacade.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/ProtocolPluginFacade.h>
diff --git a/cpp/src/Ice/ProtocolPluginFacade.h b/cpp/src/Ice/ProtocolPluginFacade.h
index 7f2cb6f3d59..8b8375a2537 100644
--- a/cpp/src/Ice/ProtocolPluginFacade.h
+++ b/cpp/src/Ice/ProtocolPluginFacade.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_PROTOCOL_PLUGIN_FACADE_H
diff --git a/cpp/src/Ice/ProtocolPluginFacadeF.h b/cpp/src/Ice/ProtocolPluginFacadeF.h
index 6a05233d968..ba1c9a4e6df 100644
--- a/cpp/src/Ice/ProtocolPluginFacadeF.h
+++ b/cpp/src/Ice/ProtocolPluginFacadeF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_PROTOCOL_PLUGIN_FACADE_F_H
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index ef0c017f26c..85871b699b9 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Proxy.h>
diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp
index c7daeeb0edd..d3e0f115314 100644
--- a/cpp/src/Ice/ProxyFactory.cpp
+++ b/cpp/src/Ice/ProxyFactory.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Thread.h>
diff --git a/cpp/src/Ice/ProxyFactory.h b/cpp/src/Ice/ProxyFactory.h
index 79e28eabd6e..8169b09e9d1 100644
--- a/cpp/src/Ice/ProxyFactory.h
+++ b/cpp/src/Ice/ProxyFactory.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_PROXY_FACTORY_H
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index b534be1fe6a..3c6f90537a2 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Reference.h>
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index bd7fa1ac906..bf7ca251603 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_REFERENCE_H
diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp
index 7a9e25a1eac..d5efd50b77d 100644
--- a/cpp/src/Ice/ReferenceFactory.cpp
+++ b/cpp/src/Ice/ReferenceFactory.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Communicator.h>
diff --git a/cpp/src/Ice/ReferenceFactory.h b/cpp/src/Ice/ReferenceFactory.h
index f9539dbe1dc..6efa856dea2 100644
--- a/cpp/src/Ice/ReferenceFactory.h
+++ b/cpp/src/Ice/ReferenceFactory.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_REFERENCE_FACTORY_H
diff --git a/cpp/src/Ice/ReferenceFactoryF.h b/cpp/src/Ice/ReferenceFactoryF.h
index 7c43fa65284..a1879a4abf1 100644
--- a/cpp/src/Ice/ReferenceFactoryF.h
+++ b/cpp/src/Ice/ReferenceFactoryF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_REFERENCE_FACTORY_F_H
diff --git a/cpp/src/Ice/RegisterPluginsInit.cpp b/cpp/src/Ice/RegisterPluginsInit.cpp
index c2ed592d0d3..c7039137062 100644
--- a/cpp/src/Ice/RegisterPluginsInit.cpp
+++ b/cpp/src/Ice/RegisterPluginsInit.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/RegisterPluginsInit.h>
diff --git a/cpp/src/Ice/RegisterPluginsInit.h b/cpp/src/Ice/RegisterPluginsInit.h
index 8ed7a5a50fa..9dad32d4bec 100644
--- a/cpp/src/Ice/RegisterPluginsInit.h
+++ b/cpp/src/Ice/RegisterPluginsInit.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_REGISTER_PLUGINS_INIT_H
diff --git a/cpp/src/Ice/ReplyStatus.h b/cpp/src/Ice/ReplyStatus.h
index 2633feb789e..224370ce2a4 100644
--- a/cpp/src/Ice/ReplyStatus.h
+++ b/cpp/src/Ice/ReplyStatus.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_REPLY_STATUS_H
diff --git a/cpp/src/Ice/RequestHandler.cpp b/cpp/src/Ice/RequestHandler.cpp
index be63d79a18b..6de365336d4 100644
--- a/cpp/src/Ice/RequestHandler.cpp
+++ b/cpp/src/Ice/RequestHandler.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/RequestHandler.h>
diff --git a/cpp/src/Ice/RequestHandler.h b/cpp/src/Ice/RequestHandler.h
index 2d7ddf09182..3aafaa56827 100644
--- a/cpp/src/Ice/RequestHandler.h
+++ b/cpp/src/Ice/RequestHandler.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_REQUEST_HANDLER_H
diff --git a/cpp/src/Ice/RequestHandlerFactory.cpp b/cpp/src/Ice/RequestHandlerFactory.cpp
index a139520e4ac..4643212694e 100644
--- a/cpp/src/Ice/RequestHandlerFactory.cpp
+++ b/cpp/src/Ice/RequestHandlerFactory.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/RequestHandlerFactory.h>
diff --git a/cpp/src/Ice/RequestHandlerFactory.h b/cpp/src/Ice/RequestHandlerFactory.h
index bad2cfccbe4..5e71d791109 100644
--- a/cpp/src/Ice/RequestHandlerFactory.h
+++ b/cpp/src/Ice/RequestHandlerFactory.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_REQUEST_HANDLER_FACTORY_H
diff --git a/cpp/src/Ice/ResponseHandler.cpp b/cpp/src/Ice/ResponseHandler.cpp
index 4d8b4e71532..77054e9ab83 100644
--- a/cpp/src/Ice/ResponseHandler.cpp
+++ b/cpp/src/Ice/ResponseHandler.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/ResponseHandler.h>
diff --git a/cpp/src/Ice/ResponseHandler.h b/cpp/src/Ice/ResponseHandler.h
index f973c1e5a8b..5cf8e2b1b66 100644
--- a/cpp/src/Ice/ResponseHandler.h
+++ b/cpp/src/Ice/ResponseHandler.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_RESPONSE_HANDLER_H
diff --git a/cpp/src/Ice/RetryQueue.cpp b/cpp/src/Ice/RetryQueue.cpp
index ef03612394c..429d066b32c 100644
--- a/cpp/src/Ice/RetryQueue.cpp
+++ b/cpp/src/Ice/RetryQueue.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/RetryQueue.h>
diff --git a/cpp/src/Ice/RetryQueue.h b/cpp/src/Ice/RetryQueue.h
index 926e7065219..eebf96854ec 100644
--- a/cpp/src/Ice/RetryQueue.h
+++ b/cpp/src/Ice/RetryQueue.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_RETRY_QUEUE_H
diff --git a/cpp/src/Ice/RetryQueueF.h b/cpp/src/Ice/RetryQueueF.h
index 59669fef321..9fbee7c7d98 100644
--- a/cpp/src/Ice/RetryQueueF.h
+++ b/cpp/src/Ice/RetryQueueF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_RETRY_QUEUE_F_H
diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp
index 7a41655bbb0..d63fdacbfa0 100644
--- a/cpp/src/Ice/RouterInfo.cpp
+++ b/cpp/src/Ice/RouterInfo.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/RouterInfo.h>
diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h
index 24a2b041232..3c47bbeae6a 100644
--- a/cpp/src/Ice/RouterInfo.h
+++ b/cpp/src/Ice/RouterInfo.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_ROUTER_INFO_H
diff --git a/cpp/src/Ice/RouterInfoF.h b/cpp/src/Ice/RouterInfoF.h
index 84c7765b08e..2f90339650d 100644
--- a/cpp/src/Ice/RouterInfoF.h
+++ b/cpp/src/Ice/RouterInfoF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_ROUTER_INFO_F_H
diff --git a/cpp/src/Ice/SHA1.cpp b/cpp/src/Ice/SHA1.cpp
index 3965812c7f8..1db71b10ec1 100644
--- a/cpp/src/Ice/SHA1.cpp
+++ b/cpp/src/Ice/SHA1.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/SHA1.h>
diff --git a/cpp/src/Ice/Selector.cpp b/cpp/src/Ice/Selector.cpp
index 3db6055b573..ff25ccc4edf 100644
--- a/cpp/src/Ice/Selector.cpp
+++ b/cpp/src/Ice/Selector.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Selector.h>
diff --git a/cpp/src/Ice/Selector.h b/cpp/src/Ice/Selector.h
index a8057cd5329..f98f49ccbb9 100644
--- a/cpp/src/Ice/Selector.h
+++ b/cpp/src/Ice/Selector.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_SELECTOR_H
diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp
index d37efcca70b..2ef28025948 100644
--- a/cpp/src/Ice/ServantManager.cpp
+++ b/cpp/src/Ice/ServantManager.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/ServantManager.h>
diff --git a/cpp/src/Ice/ServantManager.h b/cpp/src/Ice/ServantManager.h
index 23f6fc9e9b9..cc6518a2ebb 100644
--- a/cpp/src/Ice/ServantManager.h
+++ b/cpp/src/Ice/ServantManager.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_SERVANT_MANAGER_H
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index c37ab74f235..be5003ed818 100644
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/Ice/SharedContext.h b/cpp/src/Ice/SharedContext.h
index bf1fd1a9e0e..2d2d46fb890 100644
--- a/cpp/src/Ice/SharedContext.h
+++ b/cpp/src/Ice/SharedContext.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_SHARED_CONTEXT_H
diff --git a/cpp/src/Ice/SliceChecksums.cpp b/cpp/src/Ice/SliceChecksums.cpp
index f59d8d7f86d..3ac1532b3eb 100644
--- a/cpp/src/Ice/SliceChecksums.cpp
+++ b/cpp/src/Ice/SliceChecksums.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/SliceChecksums.h>
diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp
index 3e44e8f872e..0ea0ae95bde 100644
--- a/cpp/src/Ice/SlicedData.cpp
+++ b/cpp/src/Ice/SlicedData.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/SlicedData.h>
diff --git a/cpp/src/Ice/StreamSocket.cpp b/cpp/src/Ice/StreamSocket.cpp
index e38898f2568..c6459cde7bf 100755
--- a/cpp/src/Ice/StreamSocket.cpp
+++ b/cpp/src/Ice/StreamSocket.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/StreamSocket.h>
diff --git a/cpp/src/Ice/StreamSocket.h b/cpp/src/Ice/StreamSocket.h
index 1462b19faaf..922f72216f9 100644
--- a/cpp/src/Ice/StreamSocket.h
+++ b/cpp/src/Ice/StreamSocket.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_STREAM_SOCKET_H
diff --git a/cpp/src/Ice/StringConverterPlugin.cpp b/cpp/src/Ice/StringConverterPlugin.cpp
index 5efeee5ff77..5ebaa1d03a7 100644
--- a/cpp/src/Ice/StringConverterPlugin.cpp
+++ b/cpp/src/Ice/StringConverterPlugin.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Config.h>
diff --git a/cpp/src/Ice/StringUtil.h b/cpp/src/Ice/StringUtil.h
index 1df4976061e..6be689ce874 100644
--- a/cpp/src/Ice/StringUtil.h
+++ b/cpp/src/Ice/StringUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_STRING_UTIL_H
diff --git a/cpp/src/Ice/SysLoggerI.cpp b/cpp/src/Ice/SysLoggerI.cpp
index f3df83701f2..c105947749f 100644
--- a/cpp/src/Ice/SysLoggerI.cpp
+++ b/cpp/src/Ice/SysLoggerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef _WIN32
diff --git a/cpp/src/Ice/SysLoggerI.h b/cpp/src/Ice/SysLoggerI.h
index dd749076ef8..221c75a1614 100644
--- a/cpp/src/Ice/SysLoggerI.h
+++ b/cpp/src/Ice/SysLoggerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_SYS_LOGGER_I_H
diff --git a/cpp/src/Ice/SystemdJournalI.cpp b/cpp/src/Ice/SystemdJournalI.cpp
index 295622a3b6c..06ac35f06b2 100644
--- a/cpp/src/Ice/SystemdJournalI.cpp
+++ b/cpp/src/Ice/SystemdJournalI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifdef ICE_USE_SYSTEMD
diff --git a/cpp/src/Ice/SystemdJournalI.h b/cpp/src/Ice/SystemdJournalI.h
index 852bae98c9e..ae5aedd140a 100644
--- a/cpp/src/Ice/SystemdJournalI.h
+++ b/cpp/src/Ice/SystemdJournalI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_SYSTEMD_JOURNAL_I_H
diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp
index b90f64ab3d0..2190cc05bf1 100755
--- a/cpp/src/Ice/TcpAcceptor.cpp
+++ b/cpp/src/Ice/TcpAcceptor.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/TcpAcceptor.h>
diff --git a/cpp/src/Ice/TcpAcceptor.h b/cpp/src/Ice/TcpAcceptor.h
index 229a77f1180..c4ec822173f 100644
--- a/cpp/src/Ice/TcpAcceptor.h
+++ b/cpp/src/Ice/TcpAcceptor.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_TCP_ACCEPTOR_H
diff --git a/cpp/src/Ice/TcpConnector.cpp b/cpp/src/Ice/TcpConnector.cpp
index c06e649cadc..0f51c2ae977 100644
--- a/cpp/src/Ice/TcpConnector.cpp
+++ b/cpp/src/Ice/TcpConnector.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/TcpConnector.h>
diff --git a/cpp/src/Ice/TcpConnector.h b/cpp/src/Ice/TcpConnector.h
index c8e366a1e67..b86542494d6 100644
--- a/cpp/src/Ice/TcpConnector.h
+++ b/cpp/src/Ice/TcpConnector.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_TCP_CONNECTOR_H
diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp
index bada6649a73..c64b9069447 100644
--- a/cpp/src/Ice/TcpEndpointI.cpp
+++ b/cpp/src/Ice/TcpEndpointI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/TcpEndpointI.h>
diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h
index fb887cb4a7d..e8d761a6529 100644
--- a/cpp/src/Ice/TcpEndpointI.h
+++ b/cpp/src/Ice/TcpEndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_TCP_ENDPOINT_I_H
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp
index c208a99b170..fe37b1637c3 100644
--- a/cpp/src/Ice/TcpTransceiver.cpp
+++ b/cpp/src/Ice/TcpTransceiver.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/TcpTransceiver.h>
diff --git a/cpp/src/Ice/TcpTransceiver.h b/cpp/src/Ice/TcpTransceiver.h
index f12e7e5a885..e5d2a03133d 100644
--- a/cpp/src/Ice/TcpTransceiver.h
+++ b/cpp/src/Ice/TcpTransceiver.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_TCP_TRANSCEIVER_H
diff --git a/cpp/src/Ice/Thread.cpp b/cpp/src/Ice/Thread.cpp
index 1a12e3bd36a..3f22010481c 100644
--- a/cpp/src/Ice/Thread.cpp
+++ b/cpp/src/Ice/Thread.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifdef __sun
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index a73388eceeb..ae6bd81b9ab 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/ThreadPool.h>
diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h
index f86b993fe49..76e3218501e 100644
--- a/cpp/src/Ice/ThreadPool.h
+++ b/cpp/src/Ice/ThreadPool.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_THREAD_POOL_H
diff --git a/cpp/src/Ice/Timer.cpp b/cpp/src/Ice/Timer.cpp
index 30f4aa5e0c2..3e62448ebe6 100644
--- a/cpp/src/Ice/Timer.cpp
+++ b/cpp/src/Ice/Timer.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Timer.h>
diff --git a/cpp/src/Ice/TraceLevels.cpp b/cpp/src/Ice/TraceLevels.cpp
index b07273508f3..db69e96ca74 100644
--- a/cpp/src/Ice/TraceLevels.cpp
+++ b/cpp/src/Ice/TraceLevels.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/TraceLevels.h>
diff --git a/cpp/src/Ice/TraceLevels.h b/cpp/src/Ice/TraceLevels.h
index aac749452dd..9ac192f29ac 100644
--- a/cpp/src/Ice/TraceLevels.h
+++ b/cpp/src/Ice/TraceLevels.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_TRACE_LEVELS_H
diff --git a/cpp/src/Ice/TraceLevelsF.h b/cpp/src/Ice/TraceLevelsF.h
index cab8cfe1502..565cf3baa0d 100644
--- a/cpp/src/Ice/TraceLevelsF.h
+++ b/cpp/src/Ice/TraceLevelsF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_TRACE_LEVELS_F_H
diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp
index c11ac73718a..4f394282b85 100644
--- a/cpp/src/Ice/TraceUtil.cpp
+++ b/cpp/src/Ice/TraceUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Mutex.h>
diff --git a/cpp/src/Ice/TraceUtil.h b/cpp/src/Ice/TraceUtil.h
index f7625551c08..c0f25d3ca17 100644
--- a/cpp/src/Ice/TraceUtil.h
+++ b/cpp/src/Ice/TraceUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_TRACE_UTIL_H
diff --git a/cpp/src/Ice/Transceiver.cpp b/cpp/src/Ice/Transceiver.cpp
index 040d4d81af3..10f45b2e82a 100644
--- a/cpp/src/Ice/Transceiver.cpp
+++ b/cpp/src/Ice/Transceiver.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Transceiver.h>
diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h
index 5f4a4a0d6d1..ea6171977bc 100644
--- a/cpp/src/Ice/Transceiver.h
+++ b/cpp/src/Ice/Transceiver.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_TRANSCEIVER_H
diff --git a/cpp/src/Ice/TransceiverF.h b/cpp/src/Ice/TransceiverF.h
index 6a9be1df49a..d3e728fa6d2 100644
--- a/cpp/src/Ice/TransceiverF.h
+++ b/cpp/src/Ice/TransceiverF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_TRANSCEIVER_F_H
diff --git a/cpp/src/Ice/UdpConnector.cpp b/cpp/src/Ice/UdpConnector.cpp
index 1e781724915..43516704b3c 100644
--- a/cpp/src/Ice/UdpConnector.cpp
+++ b/cpp/src/Ice/UdpConnector.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/UdpConnector.h>
diff --git a/cpp/src/Ice/UdpConnector.h b/cpp/src/Ice/UdpConnector.h
index a2871cb897e..92d49dcba31 100644
--- a/cpp/src/Ice/UdpConnector.h
+++ b/cpp/src/Ice/UdpConnector.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_UDP_CONNECTOR_H
diff --git a/cpp/src/Ice/UdpEndpointI.cpp b/cpp/src/Ice/UdpEndpointI.cpp
index aeff0624e74..34a33df39a6 100644
--- a/cpp/src/Ice/UdpEndpointI.cpp
+++ b/cpp/src/Ice/UdpEndpointI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/UdpEndpointI.h>
diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h
index 26ec12e511d..bed014f97ee 100644
--- a/cpp/src/Ice/UdpEndpointI.h
+++ b/cpp/src/Ice/UdpEndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_UDP_ENDPOINT_I_H
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index 62ea6b62e8c..3d2b13a4088 100755
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/UdpTransceiver.h>
diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h
index 2ec9040d4c7..c681cef44f2 100644
--- a/cpp/src/Ice/UdpTransceiver.h
+++ b/cpp/src/Ice/UdpTransceiver.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_UDP_TRANSCEIVER_H
diff --git a/cpp/src/Ice/Value.cpp b/cpp/src/Ice/Value.cpp
index e9cb132417e..855fb60beed 100644
--- a/cpp/src/Ice/Value.cpp
+++ b/cpp/src/Ice/Value.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Value.h>
diff --git a/cpp/src/Ice/ValueFactoryManagerI.cpp b/cpp/src/Ice/ValueFactoryManagerI.cpp
index 31b3fcb31f2..6355e7a8edc 100644
--- a/cpp/src/Ice/ValueFactoryManagerI.cpp
+++ b/cpp/src/Ice/ValueFactoryManagerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/ValueFactoryManagerI.h>
diff --git a/cpp/src/Ice/ValueFactoryManagerI.h b/cpp/src/Ice/ValueFactoryManagerI.h
index de3a3fc888a..ce79ce945cb 100644
--- a/cpp/src/Ice/ValueFactoryManagerI.h
+++ b/cpp/src/Ice/ValueFactoryManagerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_VALUE_FACTORY_MANAGER_I_H
diff --git a/cpp/src/Ice/VirtualShared.h b/cpp/src/Ice/VirtualShared.h
index 29e1f0ab01d..0f64e441a02 100644
--- a/cpp/src/Ice/VirtualShared.h
+++ b/cpp/src/Ice/VirtualShared.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_VIRTUAL_SHARED_H
diff --git a/cpp/src/Ice/WSAcceptor.cpp b/cpp/src/Ice/WSAcceptor.cpp
index d97a711f562..9a4064edeae 100644
--- a/cpp/src/Ice/WSAcceptor.cpp
+++ b/cpp/src/Ice/WSAcceptor.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/WSAcceptor.h>
diff --git a/cpp/src/Ice/WSAcceptor.h b/cpp/src/Ice/WSAcceptor.h
index ca271a2acfc..56e9f1978fb 100644
--- a/cpp/src/Ice/WSAcceptor.h
+++ b/cpp/src/Ice/WSAcceptor.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_WS_ACCEPTOR_I_H
diff --git a/cpp/src/Ice/WSConnector.cpp b/cpp/src/Ice/WSConnector.cpp
index 3e3615e05fd..61bbad67242 100644
--- a/cpp/src/Ice/WSConnector.cpp
+++ b/cpp/src/Ice/WSConnector.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/WSConnector.h>
diff --git a/cpp/src/Ice/WSConnector.h b/cpp/src/Ice/WSConnector.h
index b3e31b1037f..fcfe3b15976 100644
--- a/cpp/src/Ice/WSConnector.h
+++ b/cpp/src/Ice/WSConnector.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_WSCONNECTOR_I_H
diff --git a/cpp/src/Ice/WSEndpoint.cpp b/cpp/src/Ice/WSEndpoint.cpp
index ca286ef1135..0bb0f32d1a5 100644
--- a/cpp/src/Ice/WSEndpoint.cpp
+++ b/cpp/src/Ice/WSEndpoint.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/WSEndpoint.h>
diff --git a/cpp/src/Ice/WSEndpoint.h b/cpp/src/Ice/WSEndpoint.h
index 03608dd0359..e76fc3da814 100644
--- a/cpp/src/Ice/WSEndpoint.h
+++ b/cpp/src/Ice/WSEndpoint.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_WS_ENDPOINT_I_H
diff --git a/cpp/src/Ice/WSTransceiver.cpp b/cpp/src/Ice/WSTransceiver.cpp
index 41afc44daac..9d3fa390c50 100644
--- a/cpp/src/Ice/WSTransceiver.cpp
+++ b/cpp/src/Ice/WSTransceiver.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/WSTransceiver.h>
diff --git a/cpp/src/Ice/WSTransceiver.h b/cpp/src/Ice/WSTransceiver.h
index 680bc41c4e5..1f3ff4d652b 100644
--- a/cpp/src/Ice/WSTransceiver.h
+++ b/cpp/src/Ice/WSTransceiver.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_WS_TRANSCEIVER_I_H
diff --git a/cpp/src/Ice/ios/Notifications.mm b/cpp/src/Ice/ios/Notifications.mm
index 62e75c0d603..b8841593dac 100644
--- a/cpp/src/Ice/ios/Notifications.mm
+++ b/cpp/src/Ice/ios/Notifications.mm
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#import <Ice/Config.h>
diff --git a/cpp/src/Ice/ios/StreamAcceptor.cpp b/cpp/src/Ice/ios/StreamAcceptor.cpp
index 7856c927bae..1f382bfdc33 100644
--- a/cpp/src/Ice/ios/StreamAcceptor.cpp
+++ b/cpp/src/Ice/ios/StreamAcceptor.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include "StreamTransceiver.h"
diff --git a/cpp/src/Ice/ios/StreamAcceptor.h b/cpp/src/Ice/ios/StreamAcceptor.h
index 6585d03ca7b..6a6409d41f8 100644
--- a/cpp/src/Ice/ios/StreamAcceptor.h
+++ b/cpp/src/Ice/ios/StreamAcceptor.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_STREAM_ACCEPTOR_H
diff --git a/cpp/src/Ice/ios/StreamConnector.cpp b/cpp/src/Ice/ios/StreamConnector.cpp
index e4b0bdd8131..da75a9e8276 100644
--- a/cpp/src/Ice/ios/StreamConnector.cpp
+++ b/cpp/src/Ice/ios/StreamConnector.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include "StreamTransceiver.h"
diff --git a/cpp/src/Ice/ios/StreamConnector.h b/cpp/src/Ice/ios/StreamConnector.h
index b3d8a5371d3..ec373351c04 100644
--- a/cpp/src/Ice/ios/StreamConnector.h
+++ b/cpp/src/Ice/ios/StreamConnector.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_STREAM_CONNECTOR_H
diff --git a/cpp/src/Ice/ios/StreamEndpointI.cpp b/cpp/src/Ice/ios/StreamEndpointI.cpp
index 3e8ef8bdee5..2f5b22acd4b 100644
--- a/cpp/src/Ice/ios/StreamEndpointI.cpp
+++ b/cpp/src/Ice/ios/StreamEndpointI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include "StreamEndpointI.h"
diff --git a/cpp/src/Ice/ios/StreamEndpointI.h b/cpp/src/Ice/ios/StreamEndpointI.h
index 4347f3742db..4a5e82297fd 100644
--- a/cpp/src/Ice/ios/StreamEndpointI.h
+++ b/cpp/src/Ice/ios/StreamEndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_STREAM_ENDPOINT_I_H
diff --git a/cpp/src/Ice/ios/StreamTransceiver.cpp b/cpp/src/Ice/ios/StreamTransceiver.cpp
index c9f943ecd08..a4c047e5aab 100644
--- a/cpp/src/Ice/ios/StreamTransceiver.cpp
+++ b/cpp/src/Ice/ios/StreamTransceiver.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include "StreamTransceiver.h"
diff --git a/cpp/src/Ice/ios/StreamTransceiver.h b/cpp/src/Ice/ios/StreamTransceiver.h
index 22fef490a3a..38cfd9de02b 100644
--- a/cpp/src/Ice/ios/StreamTransceiver.h
+++ b/cpp/src/Ice/ios/StreamTransceiver.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_STREAM_TRANSCEIVER_H
diff --git a/cpp/src/IceBT/AcceptorI.cpp b/cpp/src/IceBT/AcceptorI.cpp
index f1d940216bd..cab9a303fd0 100644
--- a/cpp/src/IceBT/AcceptorI.cpp
+++ b/cpp/src/IceBT/AcceptorI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceBT/AcceptorI.h>
diff --git a/cpp/src/IceBT/AcceptorI.h b/cpp/src/IceBT/AcceptorI.h
index 53300d27411..7803b2e9287 100644
--- a/cpp/src/IceBT/AcceptorI.h
+++ b/cpp/src/IceBT/AcceptorI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_BT_ACCEPTOR_I_H
diff --git a/cpp/src/IceBT/Config.h b/cpp/src/IceBT/Config.h
index ebb2bdde674..445cb0da9e1 100644
--- a/cpp/src/IceBT/Config.h
+++ b/cpp/src/IceBT/Config.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_BT_CONFIG_H
diff --git a/cpp/src/IceBT/ConnectorI.cpp b/cpp/src/IceBT/ConnectorI.cpp
index 55b7e43c5a8..48c111a3e18 100644
--- a/cpp/src/IceBT/ConnectorI.cpp
+++ b/cpp/src/IceBT/ConnectorI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceBT/ConnectorI.h>
diff --git a/cpp/src/IceBT/ConnectorI.h b/cpp/src/IceBT/ConnectorI.h
index 98a6e1ecc67..87d8cc9929f 100644
--- a/cpp/src/IceBT/ConnectorI.h
+++ b/cpp/src/IceBT/ConnectorI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_BT_CONNECTOR_I_H
diff --git a/cpp/src/IceBT/DBus.cpp b/cpp/src/IceBT/DBus.cpp
index 95f056de93c..8648db092fd 100644
--- a/cpp/src/IceBT/DBus.cpp
+++ b/cpp/src/IceBT/DBus.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceBT/DBus.h>
diff --git a/cpp/src/IceBT/DBus.h b/cpp/src/IceBT/DBus.h
index dcc7ae8be8a..6c89e3a8f2d 100644
--- a/cpp/src/IceBT/DBus.h
+++ b/cpp/src/IceBT/DBus.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_BT_DBUS_H
diff --git a/cpp/src/IceBT/EndpointI.cpp b/cpp/src/IceBT/EndpointI.cpp
index 02defca3ddd..068bcaca30f 100644
--- a/cpp/src/IceBT/EndpointI.cpp
+++ b/cpp/src/IceBT/EndpointI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceBT/EndpointI.h>
diff --git a/cpp/src/IceBT/EndpointI.h b/cpp/src/IceBT/EndpointI.h
index 33a99715e2e..9d9e1c655a2 100644
--- a/cpp/src/IceBT/EndpointI.h
+++ b/cpp/src/IceBT/EndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_BT_ENDPOINT_I_H
diff --git a/cpp/src/IceBT/Engine.cpp b/cpp/src/IceBT/Engine.cpp
index 10dfd2b4dd7..4eda781a3a6 100644
--- a/cpp/src/IceBT/Engine.cpp
+++ b/cpp/src/IceBT/Engine.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceBT/Engine.h>
diff --git a/cpp/src/IceBT/Engine.h b/cpp/src/IceBT/Engine.h
index e3094a22fac..7dfec79ad15 100644
--- a/cpp/src/IceBT/Engine.h
+++ b/cpp/src/IceBT/Engine.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_BT_ENGINE_H
diff --git a/cpp/src/IceBT/EngineF.h b/cpp/src/IceBT/EngineF.h
index e93cd6d230b..80f5b6c0757 100644
--- a/cpp/src/IceBT/EngineF.h
+++ b/cpp/src/IceBT/EngineF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_BT_ENGINE_F_H
diff --git a/cpp/src/IceBT/Instance.cpp b/cpp/src/IceBT/Instance.cpp
index e2d0c74d883..6487f1193c6 100644
--- a/cpp/src/IceBT/Instance.cpp
+++ b/cpp/src/IceBT/Instance.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceBT/Instance.h>
diff --git a/cpp/src/IceBT/Instance.h b/cpp/src/IceBT/Instance.h
index 15a78bf8de0..f7e75f8ce71 100644
--- a/cpp/src/IceBT/Instance.h
+++ b/cpp/src/IceBT/Instance.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_BT_INSTANCE_H
diff --git a/cpp/src/IceBT/InstanceF.h b/cpp/src/IceBT/InstanceF.h
index 90a9df372e9..8bc8e8e7b74 100644
--- a/cpp/src/IceBT/InstanceF.h
+++ b/cpp/src/IceBT/InstanceF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_BT_INSTANCE_F_H
diff --git a/cpp/src/IceBT/Makefile.mk b/cpp/src/IceBT/Makefile.mk
index ac93e2d9906..277a02f76c8 100644
--- a/cpp/src/IceBT/Makefile.mk
+++ b/cpp/src/IceBT/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
#
diff --git a/cpp/src/IceBT/PluginI.cpp b/cpp/src/IceBT/PluginI.cpp
index e1ac6c50fc3..b0a68be305a 100644
--- a/cpp/src/IceBT/PluginI.cpp
+++ b/cpp/src/IceBT/PluginI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceBT/PluginI.h>
diff --git a/cpp/src/IceBT/PluginI.h b/cpp/src/IceBT/PluginI.h
index 937e818c93b..4bb603788ab 100644
--- a/cpp/src/IceBT/PluginI.h
+++ b/cpp/src/IceBT/PluginI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_BT_PLUGIN_I_H
diff --git a/cpp/src/IceBT/StreamSocket.cpp b/cpp/src/IceBT/StreamSocket.cpp
index 7a9ba6fb4e6..400b2ea7382 100644
--- a/cpp/src/IceBT/StreamSocket.cpp
+++ b/cpp/src/IceBT/StreamSocket.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceBT/StreamSocket.h>
diff --git a/cpp/src/IceBT/StreamSocket.h b/cpp/src/IceBT/StreamSocket.h
index 2800cb37960..62134210a3d 100644
--- a/cpp/src/IceBT/StreamSocket.h
+++ b/cpp/src/IceBT/StreamSocket.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_BT_STREAM_SOCKET_H
diff --git a/cpp/src/IceBT/TransceiverI.cpp b/cpp/src/IceBT/TransceiverI.cpp
index 54b770ffded..0a4dc9503f8 100644
--- a/cpp/src/IceBT/TransceiverI.cpp
+++ b/cpp/src/IceBT/TransceiverI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceBT/TransceiverI.h>
diff --git a/cpp/src/IceBT/TransceiverI.h b/cpp/src/IceBT/TransceiverI.h
index 1cad542226d..09650cc8c62 100644
--- a/cpp/src/IceBT/TransceiverI.h
+++ b/cpp/src/IceBT/TransceiverI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_BT_TRANSCEIVER_H
diff --git a/cpp/src/IceBT/Util.cpp b/cpp/src/IceBT/Util.cpp
index a24ad2d8c43..f02556ebd42 100644
--- a/cpp/src/IceBT/Util.cpp
+++ b/cpp/src/IceBT/Util.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceBT/Util.h>
diff --git a/cpp/src/IceBT/Util.h b/cpp/src/IceBT/Util.h
index fe7dd1a1aa2..777335f34ae 100644
--- a/cpp/src/IceBT/Util.h
+++ b/cpp/src/IceBT/Util.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_BT_UTIL_H
diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp
index 734a6ce3123..d92ca632b8d 100644
--- a/cpp/src/IceBox/Admin.cpp
+++ b/cpp/src/IceBox/Admin.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceBox/Exception.cpp b/cpp/src/IceBox/Exception.cpp
index cde7417bdc5..414b198117f 100644
--- a/cpp/src/IceBox/Exception.cpp
+++ b/cpp/src/IceBox/Exception.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceBox/IceBox.h>
diff --git a/cpp/src/IceBox/Makefile.mk b/cpp/src/IceBox/Makefile.mk
index ffeb93d2da4..f1a022dc512 100644
--- a/cpp/src/IceBox/Makefile.mk
+++ b/cpp/src/IceBox/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_libraries := IceBox
diff --git a/cpp/src/IceBox/Service.cpp b/cpp/src/IceBox/Service.cpp
index 1e2197bcb8c..8fa8b96649c 100644
--- a/cpp/src/IceBox/Service.cpp
+++ b/cpp/src/IceBox/Service.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index cba1bba12b5..13b2e2cd550 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IceBox/ServiceManagerI.h b/cpp/src/IceBox/ServiceManagerI.h
index 84ebbe9dafd..a3ea4ca0616 100644
--- a/cpp/src/IceBox/ServiceManagerI.h
+++ b/cpp/src/IceBox/ServiceManagerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef SERVICE_MANAGER_I_H
diff --git a/cpp/src/IceBridge/IceBridge.cpp b/cpp/src/IceBridge/IceBridge.cpp
index ae99d2647b4..d0bc8e0d22f 100644
--- a/cpp/src/IceBridge/IceBridge.cpp
+++ b/cpp/src/IceBridge/IceBridge.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Connection.h>
diff --git a/cpp/src/IceBridge/Makefile.mk b/cpp/src/IceBridge/Makefile.mk
index fc559bed76c..d1361bc0c19 100644
--- a/cpp/src/IceBridge/Makefile.mk
+++ b/cpp/src/IceBridge/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_programs := icebridge
diff --git a/cpp/src/IceDB/IceDB.cpp b/cpp/src/IceDB/IceDB.cpp
index a2cd79e6324..9f67ccca436 100644
--- a/cpp/src/IceDB/IceDB.cpp
+++ b/cpp/src/IceDB/IceDB.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceDB/IceDB.h>
diff --git a/cpp/src/IceDB/IceDB.h b/cpp/src/IceDB/IceDB.h
index 3bc83246d06..6b62054038e 100644
--- a/cpp/src/IceDB/IceDB.h
+++ b/cpp/src/IceDB/IceDB.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_DB_H
diff --git a/cpp/src/IceDB/Makefile.mk b/cpp/src/IceDB/Makefile.mk
index fa42acbc4d2..bcbd7c8a53a 100644
--- a/cpp/src/IceDB/Makefile.mk
+++ b/cpp/src/IceDB/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_libraries = IceDB
diff --git a/cpp/src/IceDiscovery/LocatorI.cpp b/cpp/src/IceDiscovery/LocatorI.cpp
index 5ec2e16b362..9f89a664a6c 100644
--- a/cpp/src/IceDiscovery/LocatorI.cpp
+++ b/cpp/src/IceDiscovery/LocatorI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceDiscovery/LocatorI.h>
diff --git a/cpp/src/IceDiscovery/LocatorI.h b/cpp/src/IceDiscovery/LocatorI.h
index ff3a5542ce8..0aa1361d861 100644
--- a/cpp/src/IceDiscovery/LocatorI.h
+++ b/cpp/src/IceDiscovery/LocatorI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef LOCATORI_H
diff --git a/cpp/src/IceDiscovery/LookupI.cpp b/cpp/src/IceDiscovery/LookupI.cpp
index bbd03d0a989..4640ec1903d 100644
--- a/cpp/src/IceDiscovery/LookupI.cpp
+++ b/cpp/src/IceDiscovery/LookupI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Connection.h>
diff --git a/cpp/src/IceDiscovery/LookupI.h b/cpp/src/IceDiscovery/LookupI.h
index 9e7a63ab514..5c78dfebbd2 100644
--- a/cpp/src/IceDiscovery/LookupI.h
+++ b/cpp/src/IceDiscovery/LookupI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef LOOKUPI_H
diff --git a/cpp/src/IceDiscovery/Makefile.mk b/cpp/src/IceDiscovery/Makefile.mk
index 2bbfbdf9052..ae78db9e910 100644
--- a/cpp/src/IceDiscovery/Makefile.mk
+++ b/cpp/src/IceDiscovery/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_libraries := IceDiscovery
diff --git a/cpp/src/IceDiscovery/PluginI.cpp b/cpp/src/IceDiscovery/PluginI.cpp
index f4051e3d125..4a2b10b9c4a 100644
--- a/cpp/src/IceDiscovery/PluginI.cpp
+++ b/cpp/src/IceDiscovery/PluginI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/src/IceDiscovery/PluginI.h b/cpp/src/IceDiscovery/PluginI.h
index 949bbbaefbe..e85a6a23b37 100644
--- a/cpp/src/IceDiscovery/PluginI.h
+++ b/cpp/src/IceDiscovery/PluginI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef PLUGIN_I_H
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp
index 329efbcc67d..590a0dff293 100644
--- a/cpp/src/IceGrid/Activator.cpp
+++ b/cpp/src/IceGrid/Activator.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/ArgVector.h>
diff --git a/cpp/src/IceGrid/Activator.h b/cpp/src/IceGrid/Activator.h
index 95f1b4f6a01..56240e96b9b 100644
--- a/cpp/src/IceGrid/Activator.h
+++ b/cpp/src/IceGrid/Activator.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_ACTIVATOR_H
diff --git a/cpp/src/IceGrid/AdapterCache.cpp b/cpp/src/IceGrid/AdapterCache.cpp
index 21d9b294a74..059e7621d56 100644
--- a/cpp/src/IceGrid/AdapterCache.cpp
+++ b/cpp/src/IceGrid/AdapterCache.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Random.h>
diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h
index 1ec0074f92d..ac3d0265679 100644
--- a/cpp/src/IceGrid/AdapterCache.h
+++ b/cpp/src/IceGrid/AdapterCache.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_ADAPTERCACHE_H
diff --git a/cpp/src/IceGrid/AdminCallbackRouter.cpp b/cpp/src/IceGrid/AdminCallbackRouter.cpp
index 2f21b833c19..f338a5f5dee 100644
--- a/cpp/src/IceGrid/AdminCallbackRouter.cpp
+++ b/cpp/src/IceGrid/AdminCallbackRouter.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceGrid/AdminCallbackRouter.h>
diff --git a/cpp/src/IceGrid/AdminCallbackRouter.h b/cpp/src/IceGrid/AdminCallbackRouter.h
index a7e31c6ffc8..4bab9ce23d6 100644
--- a/cpp/src/IceGrid/AdminCallbackRouter.h
+++ b/cpp/src/IceGrid/AdminCallbackRouter.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_ADMIN_CALLBACK_ROUTER_H
diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp
index 3aea7820408..fedb2684ef7 100644
--- a/cpp/src/IceGrid/AdminI.cpp
+++ b/cpp/src/IceGrid/AdminI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/UUID.h>
diff --git a/cpp/src/IceGrid/AdminI.h b/cpp/src/IceGrid/AdminI.h
index 3344b651d4d..013b8873b50 100644
--- a/cpp/src/IceGrid/AdminI.h
+++ b/cpp/src/IceGrid/AdminI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_ADMIN_I_H
diff --git a/cpp/src/IceGrid/AdminRouter.cpp b/cpp/src/IceGrid/AdminRouter.cpp
index 3c6287ee824..4b19c65a345 100644
--- a/cpp/src/IceGrid/AdminRouter.cpp
+++ b/cpp/src/IceGrid/AdminRouter.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceGrid/AdminRouter.h>
diff --git a/cpp/src/IceGrid/AdminRouter.h b/cpp/src/IceGrid/AdminRouter.h
index 9d6a84cc4b3..63f1cc92fb3 100644
--- a/cpp/src/IceGrid/AdminRouter.h
+++ b/cpp/src/IceGrid/AdminRouter.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_ADMIN_ROUTER_H
diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp
index 5ebc3300e82..ac7daf2ab61 100644
--- a/cpp/src/IceGrid/AdminSessionI.cpp
+++ b/cpp/src/IceGrid/AdminSessionI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/AdminSessionI.h b/cpp/src/IceGrid/AdminSessionI.h
index 69c58dd82f5..e02a0e6a996 100644
--- a/cpp/src/IceGrid/AdminSessionI.h
+++ b/cpp/src/IceGrid/AdminSessionI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICEGRID_ADMINSESSIONI_H
diff --git a/cpp/src/IceGrid/Allocatable.cpp b/cpp/src/IceGrid/Allocatable.cpp
index 119080c4f3a..2298fe82b8a 100644
--- a/cpp/src/IceGrid/Allocatable.cpp
+++ b/cpp/src/IceGrid/Allocatable.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceGrid/Allocatable.h>
diff --git a/cpp/src/IceGrid/Allocatable.h b/cpp/src/IceGrid/Allocatable.h
index 7068f936943..20d82a23bd4 100644
--- a/cpp/src/IceGrid/Allocatable.h
+++ b/cpp/src/IceGrid/Allocatable.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_ALLOCATABLE_H
diff --git a/cpp/src/IceGrid/AllocatableObjectCache.cpp b/cpp/src/IceGrid/AllocatableObjectCache.cpp
index 80d74e37391..d87fe6f4cf6 100644
--- a/cpp/src/IceGrid/AllocatableObjectCache.cpp
+++ b/cpp/src/IceGrid/AllocatableObjectCache.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Random.h>
diff --git a/cpp/src/IceGrid/AllocatableObjectCache.h b/cpp/src/IceGrid/AllocatableObjectCache.h
index 83b06043b30..0cd2d2be768 100644
--- a/cpp/src/IceGrid/AllocatableObjectCache.h
+++ b/cpp/src/IceGrid/AllocatableObjectCache.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_ALLOCATABLEOBJECTCACHE_H
diff --git a/cpp/src/IceGrid/Cache.h b/cpp/src/IceGrid/Cache.h
index 39ead9a926c..c614998943d 100644
--- a/cpp/src/IceGrid/Cache.h
+++ b/cpp/src/IceGrid/Cache.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_CACHE_H
diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp
index 7cc4cd2b0c1..c6243e5acd8 100644
--- a/cpp/src/IceGrid/Client.cpp
+++ b/cpp/src/IceGrid/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp
index 34be6a4cca8..45898db72cc 100644
--- a/cpp/src/IceGrid/Database.cpp
+++ b/cpp/src/IceGrid/Database.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IceGrid/Database.h b/cpp/src/IceGrid/Database.h
index d2363494bce..656012b6633 100644
--- a/cpp/src/IceGrid/Database.h
+++ b/cpp/src/IceGrid/Database.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_DATABASE_H
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp
index 5a6e07ce6fa..0cbed7f794d 100644
--- a/cpp/src/IceGrid/DescriptorBuilder.cpp
+++ b/cpp/src/IceGrid/DescriptorBuilder.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Communicator.h>
diff --git a/cpp/src/IceGrid/DescriptorBuilder.h b/cpp/src/IceGrid/DescriptorBuilder.h
index 35203cdfbda..90d50ef6b42 100644
--- a/cpp/src/IceGrid/DescriptorBuilder.h
+++ b/cpp/src/IceGrid/DescriptorBuilder.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_DESCRIPTOR_BUILDER_H
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index 3a04ca88b15..4e80aeff179 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/DescriptorHelper.h b/cpp/src/IceGrid/DescriptorHelper.h
index 4529d2ae206..6de9017870a 100644
--- a/cpp/src/IceGrid/DescriptorHelper.h
+++ b/cpp/src/IceGrid/DescriptorHelper.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_DESCRIPTOR_HELPER_H
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp
index 51c62a41ff1..6da1f347173 100644
--- a/cpp/src/IceGrid/DescriptorParser.cpp
+++ b/cpp/src/IceGrid/DescriptorParser.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/DescriptorParser.h b/cpp/src/IceGrid/DescriptorParser.h
index 77ed14f0fb2..32caaf751dc 100644
--- a/cpp/src/IceGrid/DescriptorParser.h
+++ b/cpp/src/IceGrid/DescriptorParser.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICEGRID_DESCRIPTOR_PARSER_H
diff --git a/cpp/src/IceGrid/FileCache.cpp b/cpp/src/IceGrid/FileCache.cpp
index 42407a43693..712eabb5afe 100644
--- a/cpp/src/IceGrid/FileCache.cpp
+++ b/cpp/src/IceGrid/FileCache.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Communicator.h>
diff --git a/cpp/src/IceGrid/FileCache.h b/cpp/src/IceGrid/FileCache.h
index 28dc4bf4949..09cc0fa2c51 100644
--- a/cpp/src/IceGrid/FileCache.h
+++ b/cpp/src/IceGrid/FileCache.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_FILE_CACHE_H
diff --git a/cpp/src/IceGrid/FileParserI.cpp b/cpp/src/IceGrid/FileParserI.cpp
index 1f8aa8cdd89..3cdec69cf68 100644
--- a/cpp/src/IceGrid/FileParserI.cpp
+++ b/cpp/src/IceGrid/FileParserI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceGrid/FileParserI.h>
diff --git a/cpp/src/IceGrid/FileParserI.h b/cpp/src/IceGrid/FileParserI.h
index 75d468a5938..b6c9cd8ebda 100644
--- a/cpp/src/IceGrid/FileParserI.h
+++ b/cpp/src/IceGrid/FileParserI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_FILE_PARSERI_H
diff --git a/cpp/src/IceGrid/FileUserAccountMapperI.cpp b/cpp/src/IceGrid/FileUserAccountMapperI.cpp
index 75bdcba3f69..3c7a800b858 100644
--- a/cpp/src/IceGrid/FileUserAccountMapperI.cpp
+++ b/cpp/src/IceGrid/FileUserAccountMapperI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IceGrid/FileUserAccountMapperI.h b/cpp/src/IceGrid/FileUserAccountMapperI.h
index 67d4368a232..40c95429be9 100644
--- a/cpp/src/IceGrid/FileUserAccountMapperI.h
+++ b/cpp/src/IceGrid/FileUserAccountMapperI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_FILEUSERACCOUNTMAPPERI_H
diff --git a/cpp/src/IceGrid/Grammar.cpp b/cpp/src/IceGrid/Grammar.cpp
index e6b527c9bd7..6f8f9787d7e 100644
--- a/cpp/src/IceGrid/Grammar.cpp
+++ b/cpp/src/IceGrid/Grammar.cpp
@@ -70,9 +70,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/Grammar.y b/cpp/src/IceGrid/Grammar.y
index 942f8ddf00b..31ea16bfa0b 100644
--- a/cpp/src/IceGrid/Grammar.y
+++ b/cpp/src/IceGrid/Grammar.y
@@ -4,9 +4,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp
index 41cfdc81755..0524f923a53 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/UUID.h>
diff --git a/cpp/src/IceGrid/IceGridRegistry.cpp b/cpp/src/IceGrid/IceGridRegistry.cpp
index 94bbac4edc2..3e0e804367e 100644
--- a/cpp/src/IceGrid/IceGridRegistry.cpp
+++ b/cpp/src/IceGrid/IceGridRegistry.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IceGrid/Internal.ice b/cpp/src/IceGrid/Internal.ice
index 1d0e7511413..2a299523216 100644
--- a/cpp/src/IceGrid/Internal.ice
+++ b/cpp/src/IceGrid/Internal.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/IceGrid/InternalRegistryI.cpp b/cpp/src/IceGrid/InternalRegistryI.cpp
index 4095b4aba55..fb3998bcd1b 100644
--- a/cpp/src/IceGrid/InternalRegistryI.cpp
+++ b/cpp/src/IceGrid/InternalRegistryI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/IceGrid/InternalRegistryI.h b/cpp/src/IceGrid/InternalRegistryI.h
index 7995d35dcd9..50ec2f4c73d 100644
--- a/cpp/src/IceGrid/InternalRegistryI.h
+++ b/cpp/src/IceGrid/InternalRegistryI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_INTERNALREGISTRYI_H
diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp
index 6f75b3b428c..d7d7d32560a 100644
--- a/cpp/src/IceGrid/LocatorI.cpp
+++ b/cpp/src/IceGrid/LocatorI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/LocatorI.h b/cpp/src/IceGrid/LocatorI.h
index 6f9d18581e6..9c23511b17f 100644
--- a/cpp/src/IceGrid/LocatorI.h
+++ b/cpp/src/IceGrid/LocatorI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_LOCATOR_I_H
diff --git a/cpp/src/IceGrid/LocatorRegistryI.cpp b/cpp/src/IceGrid/LocatorRegistryI.cpp
index 6c3f412113d..da9d70d8506 100644
--- a/cpp/src/IceGrid/LocatorRegistryI.cpp
+++ b/cpp/src/IceGrid/LocatorRegistryI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/LocatorRegistryI.h b/cpp/src/IceGrid/LocatorRegistryI.h
index 4e530f3f5bc..ff7ddfebde0 100644
--- a/cpp/src/IceGrid/LocatorRegistryI.h
+++ b/cpp/src/IceGrid/LocatorRegistryI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_LOCATOR_REGISTRY_I_H
diff --git a/cpp/src/IceGrid/Makefile.mk b/cpp/src/IceGrid/Makefile.mk
index fa5e9c90d10..401f3be40da 100644
--- a/cpp/src/IceGrid/Makefile.mk
+++ b/cpp/src/IceGrid/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
local_node_srcs = Activator.cpp \
diff --git a/cpp/src/IceGrid/NodeAdminRouter.cpp b/cpp/src/IceGrid/NodeAdminRouter.cpp
index 8d450515cc5..4a77bd960fb 100644
--- a/cpp/src/IceGrid/NodeAdminRouter.cpp
+++ b/cpp/src/IceGrid/NodeAdminRouter.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceGrid/NodeAdminRouter.h>
diff --git a/cpp/src/IceGrid/NodeAdminRouter.h b/cpp/src/IceGrid/NodeAdminRouter.h
index bcfae9a4aff..c613e1ef21b 100644
--- a/cpp/src/IceGrid/NodeAdminRouter.h
+++ b/cpp/src/IceGrid/NodeAdminRouter.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_NODE_ADMIN_ROUTER_H
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index c47f2eb627b..98789b954ce 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Functional.h>
diff --git a/cpp/src/IceGrid/NodeCache.h b/cpp/src/IceGrid/NodeCache.h
index 259c3cbf319..6b2a5b3995f 100644
--- a/cpp/src/IceGrid/NodeCache.h
+++ b/cpp/src/IceGrid/NodeCache.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_NODECACHE_H
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp
index dcd9769226c..c7dfb898f8a 100644
--- a/cpp/src/IceGrid/NodeI.cpp
+++ b/cpp/src/IceGrid/NodeI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Timer.h>
diff --git a/cpp/src/IceGrid/NodeI.h b/cpp/src/IceGrid/NodeI.h
index 2b055d775c6..adc36d2ebff 100644
--- a/cpp/src/IceGrid/NodeI.h
+++ b/cpp/src/IceGrid/NodeI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_NODE_I_H
diff --git a/cpp/src/IceGrid/NodeSessionI.cpp b/cpp/src/IceGrid/NodeSessionI.cpp
index ad22edcb568..145cf9862f1 100644
--- a/cpp/src/IceGrid/NodeSessionI.cpp
+++ b/cpp/src/IceGrid/NodeSessionI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/UUID.h>
diff --git a/cpp/src/IceGrid/NodeSessionI.h b/cpp/src/IceGrid/NodeSessionI.h
index af37ffa68e9..3976a4d72e2 100644
--- a/cpp/src/IceGrid/NodeSessionI.h
+++ b/cpp/src/IceGrid/NodeSessionI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICEGRID_NODE_SESSION_H
diff --git a/cpp/src/IceGrid/NodeSessionManager.cpp b/cpp/src/IceGrid/NodeSessionManager.cpp
index 5ae070db6e9..2cb50e7541a 100644
--- a/cpp/src/IceGrid/NodeSessionManager.cpp
+++ b/cpp/src/IceGrid/NodeSessionManager.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/NodeSessionManager.h b/cpp/src/IceGrid/NodeSessionManager.h
index 731cbb8d7fb..2b85fec5cbb 100644
--- a/cpp/src/IceGrid/NodeSessionManager.h
+++ b/cpp/src/IceGrid/NodeSessionManager.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_NODE_SESSION_MANAGER_H
diff --git a/cpp/src/IceGrid/ObjectCache.cpp b/cpp/src/IceGrid/ObjectCache.cpp
index 74f34326b85..5b6f54a4d0b 100644
--- a/cpp/src/IceGrid/ObjectCache.cpp
+++ b/cpp/src/IceGrid/ObjectCache.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Random.h>
diff --git a/cpp/src/IceGrid/ObjectCache.h b/cpp/src/IceGrid/ObjectCache.h
index f4d1693c340..94c84c2ad95 100644
--- a/cpp/src/IceGrid/ObjectCache.h
+++ b/cpp/src/IceGrid/ObjectCache.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_OBJECTCACHE_H
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index 266247cbdac..5364b51375b 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/IceGrid/Parser.h b/cpp/src/IceGrid/Parser.h
index cb61c578481..f23adf0bfaa 100644
--- a/cpp/src/IceGrid/Parser.h
+++ b/cpp/src/IceGrid/Parser.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_PARSER_H
diff --git a/cpp/src/IceGrid/PlatformInfo.cpp b/cpp/src/IceGrid/PlatformInfo.cpp
index 447e516e13a..bd5c6769dd4 100644
--- a/cpp/src/IceGrid/PlatformInfo.cpp
+++ b/cpp/src/IceGrid/PlatformInfo.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IceGrid/PlatformInfo.h b/cpp/src/IceGrid/PlatformInfo.h
index 82f13680322..e1d018e1c22 100644
--- a/cpp/src/IceGrid/PlatformInfo.h
+++ b/cpp/src/IceGrid/PlatformInfo.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_PLATFORM_INFO_H
diff --git a/cpp/src/IceGrid/PluginFacadeI.cpp b/cpp/src/IceGrid/PluginFacadeI.cpp
index 0a58b600ab1..8d086e5342b 100644
--- a/cpp/src/IceGrid/PluginFacadeI.cpp
+++ b/cpp/src/IceGrid/PluginFacadeI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceGrid/PluginFacadeI.h>
diff --git a/cpp/src/IceGrid/PluginFacadeI.h b/cpp/src/IceGrid/PluginFacadeI.h
index b58a407aba0..a9b2c7522ba 100644
--- a/cpp/src/IceGrid/PluginFacadeI.h
+++ b/cpp/src/IceGrid/PluginFacadeI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICEGRID_PLUGIN_FACADE_I_H
diff --git a/cpp/src/IceGrid/QueryI.cpp b/cpp/src/IceGrid/QueryI.cpp
index 1e9803c19f0..e5c2555220b 100644
--- a/cpp/src/IceGrid/QueryI.cpp
+++ b/cpp/src/IceGrid/QueryI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceGrid/Internal.h>
diff --git a/cpp/src/IceGrid/QueryI.h b/cpp/src/IceGrid/QueryI.h
index a3fd5252ff5..6a9a3a913a1 100644
--- a/cpp/src/IceGrid/QueryI.h
+++ b/cpp/src/IceGrid/QueryI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_QUERY_I_H
diff --git a/cpp/src/IceGrid/ReapThread.cpp b/cpp/src/IceGrid/ReapThread.cpp
index 99b327fd04b..d7d7d2a2aaf 100644
--- a/cpp/src/IceGrid/ReapThread.cpp
+++ b/cpp/src/IceGrid/ReapThread.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/ReapThread.h b/cpp/src/IceGrid/ReapThread.h
index d2e4fcacb5e..ed872adcc66 100644
--- a/cpp/src/IceGrid/ReapThread.h
+++ b/cpp/src/IceGrid/ReapThread.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICEGRID_REAPER_THREAD_H
diff --git a/cpp/src/IceGrid/RegistryAdminRouter.cpp b/cpp/src/IceGrid/RegistryAdminRouter.cpp
index 7b021e30bf7..2ebaa8f4ad7 100644
--- a/cpp/src/IceGrid/RegistryAdminRouter.cpp
+++ b/cpp/src/IceGrid/RegistryAdminRouter.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceGrid/RegistryAdminRouter.h>
diff --git a/cpp/src/IceGrid/RegistryAdminRouter.h b/cpp/src/IceGrid/RegistryAdminRouter.h
index abfebafbbb6..d0961c329ce 100644
--- a/cpp/src/IceGrid/RegistryAdminRouter.h
+++ b/cpp/src/IceGrid/RegistryAdminRouter.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_REGISTRY_ADMIN_ROUTER_H
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index 22b456ebfba..a6f4bc797b8 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/UUID.h>
diff --git a/cpp/src/IceGrid/RegistryI.h b/cpp/src/IceGrid/RegistryI.h
index c322c0d84fd..18deac3daf5 100644
--- a/cpp/src/IceGrid/RegistryI.h
+++ b/cpp/src/IceGrid/RegistryI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_REGISTRYI_H
diff --git a/cpp/src/IceGrid/ReplicaCache.cpp b/cpp/src/IceGrid/ReplicaCache.cpp
index d3a70a9dadf..b5af05fa2e6 100644
--- a/cpp/src/IceGrid/ReplicaCache.cpp
+++ b/cpp/src/IceGrid/ReplicaCache.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Communicator.h>
diff --git a/cpp/src/IceGrid/ReplicaCache.h b/cpp/src/IceGrid/ReplicaCache.h
index 35b085a7da5..0e006fa8381 100644
--- a/cpp/src/IceGrid/ReplicaCache.h
+++ b/cpp/src/IceGrid/ReplicaCache.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_REPLICACACHE_H
diff --git a/cpp/src/IceGrid/ReplicaSessionI.cpp b/cpp/src/IceGrid/ReplicaSessionI.cpp
index 7a06aeb8990..9d86958fa2d 100644
--- a/cpp/src/IceGrid/ReplicaSessionI.cpp
+++ b/cpp/src/IceGrid/ReplicaSessionI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/ReplicaSessionI.h b/cpp/src/IceGrid/ReplicaSessionI.h
index 65c9ed28f24..5f30539a046 100644
--- a/cpp/src/IceGrid/ReplicaSessionI.h
+++ b/cpp/src/IceGrid/ReplicaSessionI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICEGRID_REPLICA_SESSION_H
diff --git a/cpp/src/IceGrid/ReplicaSessionManager.cpp b/cpp/src/IceGrid/ReplicaSessionManager.cpp
index 1b42e567305..d66fe69b313 100644
--- a/cpp/src/IceGrid/ReplicaSessionManager.cpp
+++ b/cpp/src/IceGrid/ReplicaSessionManager.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/ReplicaSessionManager.h b/cpp/src/IceGrid/ReplicaSessionManager.h
index cdc7bd8df50..938fecbab60 100644
--- a/cpp/src/IceGrid/ReplicaSessionManager.h
+++ b/cpp/src/IceGrid/ReplicaSessionManager.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_REPLICA_SESSION_MANAGER_H
diff --git a/cpp/src/IceGrid/Scanner.cpp b/cpp/src/IceGrid/Scanner.cpp
index 8b3d8dae9b0..f07d5fa1ec1 100644
--- a/cpp/src/IceGrid/Scanner.cpp
+++ b/cpp/src/IceGrid/Scanner.cpp
@@ -466,9 +466,6 @@ char *yytext;
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/Scanner.l b/cpp/src/IceGrid/Scanner.l
index 6aed3bb88fb..ba71ae83c6f 100644
--- a/cpp/src/IceGrid/Scanner.l
+++ b/cpp/src/IceGrid/Scanner.l
@@ -4,9 +4,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/ServerAdapterI.cpp b/cpp/src/IceGrid/ServerAdapterI.cpp
index 8ce043300ea..e4a1df463a3 100644
--- a/cpp/src/IceGrid/ServerAdapterI.cpp
+++ b/cpp/src/IceGrid/ServerAdapterI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/ServerAdapterI.h b/cpp/src/IceGrid/ServerAdapterI.h
index 9c2c65bf2ce..ee7d9823aaf 100644
--- a/cpp/src/IceGrid/ServerAdapterI.h
+++ b/cpp/src/IceGrid/ServerAdapterI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_SERVER_ADAPTER_I_H
diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp
index da628a3da02..c9ebc4742a7 100644
--- a/cpp/src/IceGrid/ServerCache.cpp
+++ b/cpp/src/IceGrid/ServerCache.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/IceGrid/ServerCache.h b/cpp/src/IceGrid/ServerCache.h
index bfbe089e32f..373af7bdfc1 100644
--- a/cpp/src/IceGrid/ServerCache.h
+++ b/cpp/src/IceGrid/ServerCache.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_SERVERCACHE_H
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index 6dc187b3723..6ee41505409 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/IceGrid/ServerI.h b/cpp/src/IceGrid/ServerI.h
index 68d1c8eaab8..5893dd7b9ac 100644
--- a/cpp/src/IceGrid/ServerI.h
+++ b/cpp/src/IceGrid/ServerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_SERVER_I_H
diff --git a/cpp/src/IceGrid/SessionI.cpp b/cpp/src/IceGrid/SessionI.cpp
index 7f2c80afeb8..cb693b56cc1 100644
--- a/cpp/src/IceGrid/SessionI.cpp
+++ b/cpp/src/IceGrid/SessionI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/SessionI.h b/cpp/src/IceGrid/SessionI.h
index c7c5a9f11ce..631e1dcd176 100644
--- a/cpp/src/IceGrid/SessionI.h
+++ b/cpp/src/IceGrid/SessionI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICEGRID_SESSIONI_H
diff --git a/cpp/src/IceGrid/SessionManager.cpp b/cpp/src/IceGrid/SessionManager.cpp
index 2ddd7701eca..eeb01f40204 100644
--- a/cpp/src/IceGrid/SessionManager.cpp
+++ b/cpp/src/IceGrid/SessionManager.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/SessionManager.h b/cpp/src/IceGrid/SessionManager.h
index beb0bd4d3e1..6c1a6255f13 100644
--- a/cpp/src/IceGrid/SessionManager.h
+++ b/cpp/src/IceGrid/SessionManager.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_SESSION_MANAGER_H
diff --git a/cpp/src/IceGrid/SessionServantManager.cpp b/cpp/src/IceGrid/SessionServantManager.cpp
index 85f7f00a987..c52890fc7c0 100644
--- a/cpp/src/IceGrid/SessionServantManager.cpp
+++ b/cpp/src/IceGrid/SessionServantManager.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/UUID.h>
diff --git a/cpp/src/IceGrid/SessionServantManager.h b/cpp/src/IceGrid/SessionServantManager.h
index 0b8a2cad66b..6dc75971002 100644
--- a/cpp/src/IceGrid/SessionServantManager.h
+++ b/cpp/src/IceGrid/SessionServantManager.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_SESSIONSERVANTLOCATOR_H
diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp
index 96298f6aff6..a2cf027f857 100644
--- a/cpp/src/IceGrid/Topics.cpp
+++ b/cpp/src/IceGrid/Topics.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/Topics.h b/cpp/src/IceGrid/Topics.h
index 8f0bef12d34..2d8992fd5b4 100644
--- a/cpp/src/IceGrid/Topics.h
+++ b/cpp/src/IceGrid/Topics.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICEGRID_TOPICS_H
diff --git a/cpp/src/IceGrid/TraceLevels.cpp b/cpp/src/IceGrid/TraceLevels.cpp
index b48e6df59b5..727c7d718e4 100644
--- a/cpp/src/IceGrid/TraceLevels.cpp
+++ b/cpp/src/IceGrid/TraceLevels.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Communicator.h>
diff --git a/cpp/src/IceGrid/TraceLevels.h b/cpp/src/IceGrid/TraceLevels.h
index 87032e4b24f..4492781290f 100644
--- a/cpp/src/IceGrid/TraceLevels.h
+++ b/cpp/src/IceGrid/TraceLevels.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_TRACE_LEVELS_H
diff --git a/cpp/src/IceGrid/Util.cpp b/cpp/src/IceGrid/Util.cpp
index fffd12f7be6..dc3cddfcccc 100644
--- a/cpp/src/IceGrid/Util.cpp
+++ b/cpp/src/IceGrid/Util.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/Util.h b/cpp/src/IceGrid/Util.h
index 92147f28df1..c917bd60923 100644
--- a/cpp/src/IceGrid/Util.h
+++ b/cpp/src/IceGrid/Util.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_UTIL_H
diff --git a/cpp/src/IceGrid/WaitQueue.cpp b/cpp/src/IceGrid/WaitQueue.cpp
index 1bc6fd1a676..988e8092b60 100644
--- a/cpp/src/IceGrid/WaitQueue.cpp
+++ b/cpp/src/IceGrid/WaitQueue.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/WaitQueue.h b/cpp/src/IceGrid/WaitQueue.h
index f6c11f2ee12..1cea39ce684 100644
--- a/cpp/src/IceGrid/WaitQueue.h
+++ b/cpp/src/IceGrid/WaitQueue.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_WAIT_QUEUE_H
diff --git a/cpp/src/IceGrid/WellKnownObjectsManager.cpp b/cpp/src/IceGrid/WellKnownObjectsManager.cpp
index 8ecd75474d2..8e13d5abf0a 100644
--- a/cpp/src/IceGrid/WellKnownObjectsManager.cpp
+++ b/cpp/src/IceGrid/WellKnownObjectsManager.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Endpoint.h>
diff --git a/cpp/src/IceGrid/WellKnownObjectsManager.h b/cpp/src/IceGrid/WellKnownObjectsManager.h
index 1458372df26..887fccfea65 100644
--- a/cpp/src/IceGrid/WellKnownObjectsManager.h
+++ b/cpp/src/IceGrid/WellKnownObjectsManager.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_GRID_WELL_KNOWN_OBJECTS_MANAGER_H
diff --git a/cpp/src/IceGridLib/Makefile.mk b/cpp/src/IceGridLib/Makefile.mk
index 8919d5a8350..fb35c3ea36a 100644
--- a/cpp/src/IceGridLib/Makefile.mk
+++ b/cpp/src/IceGridLib/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_libraries := IceGrid
diff --git a/cpp/src/IceGridLib/PluginFacadeI.cpp b/cpp/src/IceGridLib/PluginFacadeI.cpp
index 12fd79c8d84..9170d094e26 100644
--- a/cpp/src/IceGridLib/PluginFacadeI.cpp
+++ b/cpp/src/IceGridLib/PluginFacadeI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICEGRID_API_EXPORTS
diff --git a/cpp/src/IceIAP/Connector.h b/cpp/src/IceIAP/Connector.h
index faf4ac4fe58..4de39d6e9a2 100644
--- a/cpp/src/IceIAP/Connector.h
+++ b/cpp/src/IceIAP/Connector.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_IAP_CONNECTOR_H
diff --git a/cpp/src/IceIAP/Connector.mm b/cpp/src/IceIAP/Connector.mm
index 11e3ae07a26..9311cee422f 100644
--- a/cpp/src/IceIAP/Connector.mm
+++ b/cpp/src/IceIAP/Connector.mm
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include "Transceiver.h"
diff --git a/cpp/src/IceIAP/EndpointI.h b/cpp/src/IceIAP/EndpointI.h
index 318d1644a1a..65d314e55cc 100644
--- a/cpp/src/IceIAP/EndpointI.h
+++ b/cpp/src/IceIAP/EndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_IAP_ENDPOINT_I_H
diff --git a/cpp/src/IceIAP/EndpointI.mm b/cpp/src/IceIAP/EndpointI.mm
index 0a1ccee9576..8271778137c 100644
--- a/cpp/src/IceIAP/EndpointI.mm
+++ b/cpp/src/IceIAP/EndpointI.mm
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include "EndpointI.h"
diff --git a/cpp/src/IceIAP/Makefile.mk b/cpp/src/IceIAP/Makefile.mk
index 074326d0727..05bb62b010d 100644
--- a/cpp/src/IceIAP/Makefile.mk
+++ b/cpp/src/IceIAP/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_libraries = IceIAP
diff --git a/cpp/src/IceIAP/Transceiver.h b/cpp/src/IceIAP/Transceiver.h
index eea6c2691e2..6b7c57a2f3c 100644
--- a/cpp/src/IceIAP/Transceiver.h
+++ b/cpp/src/IceIAP/Transceiver.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_IAP_TRANSCEIVER_H
diff --git a/cpp/src/IceIAP/Transceiver.mm b/cpp/src/IceIAP/Transceiver.mm
index e66225faa5e..b711b244017 100644
--- a/cpp/src/IceIAP/Transceiver.mm
+++ b/cpp/src/IceIAP/Transceiver.mm
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include "Transceiver.h"
diff --git a/cpp/src/IceLocatorDiscovery/Makefile.mk b/cpp/src/IceLocatorDiscovery/Makefile.mk
index f5b5f03e22b..91f08f2d1b1 100644
--- a/cpp/src/IceLocatorDiscovery/Makefile.mk
+++ b/cpp/src/IceLocatorDiscovery/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_libraries := IceLocatorDiscovery
diff --git a/cpp/src/IceLocatorDiscovery/Plugin.h b/cpp/src/IceLocatorDiscovery/Plugin.h
index 62fd5008d93..c8ba472d807 100644
--- a/cpp/src/IceLocatorDiscovery/Plugin.h
+++ b/cpp/src/IceLocatorDiscovery/Plugin.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef LOCATOR_DISCOVERY_PLUGIN_I_H
diff --git a/cpp/src/IceLocatorDiscovery/PluginI.cpp b/cpp/src/IceLocatorDiscovery/PluginI.cpp
index e593c5b9225..7f97f8befe8 100644
--- a/cpp/src/IceLocatorDiscovery/PluginI.cpp
+++ b/cpp/src/IceLocatorDiscovery/PluginI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/src/IcePatch2/Calc.cpp b/cpp/src/IcePatch2/Calc.cpp
index 601aa53e615..3c334e286e6 100644
--- a/cpp/src/IcePatch2/Calc.cpp
+++ b/cpp/src/IcePatch2/Calc.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IcePatch2/Client.cpp b/cpp/src/IcePatch2/Client.cpp
index a0f199b6b79..6ed6869a405 100644
--- a/cpp/src/IcePatch2/Client.cpp
+++ b/cpp/src/IcePatch2/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp
index d136aecc86f..61eeb9f7b3d 100644
--- a/cpp/src/IcePatch2/FileServerI.cpp
+++ b/cpp/src/IcePatch2/FileServerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/IcePatch2/FileServerI.h b/cpp/src/IcePatch2/FileServerI.h
index 1550c289e3f..881261bf51b 100644
--- a/cpp/src/IcePatch2/FileServerI.h
+++ b/cpp/src/IcePatch2/FileServerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_PATCH2_FILE_SERVER_I_H
diff --git a/cpp/src/IcePatch2/Makefile.mk b/cpp/src/IcePatch2/Makefile.mk
index bfe946233f5..451313dfff2 100644
--- a/cpp/src/IcePatch2/Makefile.mk
+++ b/cpp/src/IcePatch2/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_programs := icepatch2server icepatch2client icepatch2calc
diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp
index 0ff2e445226..dbd764a58fb 100644
--- a/cpp/src/IcePatch2/Server.cpp
+++ b/cpp/src/IcePatch2/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IcePatch2Lib/ClientUtil.cpp b/cpp/src/IcePatch2Lib/ClientUtil.cpp
index 27676ef2afe..0a6c39d7156 100644
--- a/cpp/src/IcePatch2Lib/ClientUtil.cpp
+++ b/cpp/src/IcePatch2Lib/ClientUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IcePatch2Lib/Makefile.mk b/cpp/src/IcePatch2Lib/Makefile.mk
index 07fbbcfbaab..06d31352bdc 100644
--- a/cpp/src/IcePatch2Lib/Makefile.mk
+++ b/cpp/src/IcePatch2Lib/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_libraries := IcePatch2
diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp
index da3ce87d6cf..11431fa4335 100644
--- a/cpp/src/IcePatch2Lib/Util.cpp
+++ b/cpp/src/IcePatch2Lib/Util.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
//
diff --git a/cpp/src/IcePatch2Lib/Util.h b/cpp/src/IcePatch2Lib/Util.h
index 912f6fe81ea..203f27fe1fa 100644
--- a/cpp/src/IcePatch2Lib/Util.h
+++ b/cpp/src/IcePatch2Lib/Util.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_PATCH2_UTIL_H
diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp
index 2fd5e1e3759..9882df1bcd2 100644
--- a/cpp/src/IceSSL/AcceptorI.cpp
+++ b/cpp/src/IceSSL/AcceptorI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/AcceptorI.h>
diff --git a/cpp/src/IceSSL/AcceptorI.h b/cpp/src/IceSSL/AcceptorI.h
index a8df4af547f..cb6316fbb11 100644
--- a/cpp/src/IceSSL/AcceptorI.h
+++ b/cpp/src/IceSSL/AcceptorI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_ACCEPTOR_I_H
diff --git a/cpp/src/IceSSL/CertificateI.cpp b/cpp/src/IceSSL/CertificateI.cpp
index e51185840df..02eaab8c355 100644
--- a/cpp/src/IceSSL/CertificateI.cpp
+++ b/cpp/src/IceSSL/CertificateI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/IceSSL/CertificateI.h b/cpp/src/IceSSL/CertificateI.h
index 3eb7fddce65..e851d5a24ff 100644
--- a/cpp/src/IceSSL/CertificateI.h
+++ b/cpp/src/IceSSL/CertificateI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_CERTIFICATE_I_H
diff --git a/cpp/src/IceSSL/ConnectorI.cpp b/cpp/src/IceSSL/ConnectorI.cpp
index 2f62ad191ce..b8d189192fa 100644
--- a/cpp/src/IceSSL/ConnectorI.cpp
+++ b/cpp/src/IceSSL/ConnectorI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/ConnectorI.h>
diff --git a/cpp/src/IceSSL/ConnectorI.h b/cpp/src/IceSSL/ConnectorI.h
index f048cb8952e..27ec6644c58 100644
--- a/cpp/src/IceSSL/ConnectorI.h
+++ b/cpp/src/IceSSL/ConnectorI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_CONNECTOR_I_H
diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp
index fd932a5826b..cfd1540093f 100644
--- a/cpp/src/IceSSL/EndpointI.cpp
+++ b/cpp/src/IceSSL/EndpointI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/EndpointI.h>
diff --git a/cpp/src/IceSSL/EndpointI.h b/cpp/src/IceSSL/EndpointI.h
index cde8675f0e7..ae04a3e6dd7 100644
--- a/cpp/src/IceSSL/EndpointI.h
+++ b/cpp/src/IceSSL/EndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_ENDPOINT_I_H
diff --git a/cpp/src/IceSSL/Instance.cpp b/cpp/src/IceSSL/Instance.cpp
index 55102c9cd5a..0b5079797e4 100644
--- a/cpp/src/IceSSL/Instance.cpp
+++ b/cpp/src/IceSSL/Instance.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/Instance.h>
diff --git a/cpp/src/IceSSL/Instance.h b/cpp/src/IceSSL/Instance.h
index d811c7b8b68..0b56c77bc33 100644
--- a/cpp/src/IceSSL/Instance.h
+++ b/cpp/src/IceSSL/Instance.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_INSTANCE_H
diff --git a/cpp/src/IceSSL/InstanceF.h b/cpp/src/IceSSL/InstanceF.h
index c31a1a943f0..d39f922b126 100644
--- a/cpp/src/IceSSL/InstanceF.h
+++ b/cpp/src/IceSSL/InstanceF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_INSTANCE_F_H
diff --git a/cpp/src/IceSSL/Makefile.mk b/cpp/src/IceSSL/Makefile.mk
index c58df8d3f43..1bff174643a 100644
--- a/cpp/src/IceSSL/Makefile.mk
+++ b/cpp/src/IceSSL/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_libraries := IceSSL
diff --git a/cpp/src/IceSSL/OpenSSLCertificateI.cpp b/cpp/src/IceSSL/OpenSSLCertificateI.cpp
index ffbbdf1c687..712b6b8199d 100644
--- a/cpp/src/IceSSL/OpenSSLCertificateI.cpp
+++ b/cpp/src/IceSSL/OpenSSLCertificateI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/Plugin.h>
diff --git a/cpp/src/IceSSL/OpenSSLEngine.cpp b/cpp/src/IceSSL/OpenSSLEngine.cpp
index bc7ea0b09fd..133d98ee465 100644
--- a/cpp/src/IceSSL/OpenSSLEngine.cpp
+++ b/cpp/src/IceSSL/OpenSSLEngine.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/Config.h>
diff --git a/cpp/src/IceSSL/OpenSSLEngine.h b/cpp/src/IceSSL/OpenSSLEngine.h
index 8c30cca886a..681648dd2ba 100644
--- a/cpp/src/IceSSL/OpenSSLEngine.h
+++ b/cpp/src/IceSSL/OpenSSLEngine.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_OPENSSL_ENGINE_H
diff --git a/cpp/src/IceSSL/OpenSSLEngineF.h b/cpp/src/IceSSL/OpenSSLEngineF.h
index 2e1e77ba289..14413751979 100644
--- a/cpp/src/IceSSL/OpenSSLEngineF.h
+++ b/cpp/src/IceSSL/OpenSSLEngineF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_OPENSSL_ENGINE_F_H
diff --git a/cpp/src/IceSSL/OpenSSLPluginI.cpp b/cpp/src/IceSSL/OpenSSLPluginI.cpp
index 9ab8c313b1f..0ce0b5e0fe2 100644
--- a/cpp/src/IceSSL/OpenSSLPluginI.cpp
+++ b/cpp/src/IceSSL/OpenSSLPluginI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/PluginI.h>
diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
index 994d7b98f44..48e0bad02cf 100644
--- a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
+++ b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/OpenSSLTransceiverI.h>
diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.h b/cpp/src/IceSSL/OpenSSLTransceiverI.h
index fbdcc128cb0..21698549c42 100644
--- a/cpp/src/IceSSL/OpenSSLTransceiverI.h
+++ b/cpp/src/IceSSL/OpenSSLTransceiverI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_OPENSSL_TRANSCEIVER_I_H
diff --git a/cpp/src/IceSSL/OpenSSLUtil.cpp b/cpp/src/IceSSL/OpenSSLUtil.cpp
index 826ee2380dc..513c5e510a2 100644
--- a/cpp/src/IceSSL/OpenSSLUtil.cpp
+++ b/cpp/src/IceSSL/OpenSSLUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/OpenSSLUtil.h>
diff --git a/cpp/src/IceSSL/OpenSSLUtil.h b/cpp/src/IceSSL/OpenSSLUtil.h
index 0d77fd8fd79..c113ee858d5 100644
--- a/cpp/src/IceSSL/OpenSSLUtil.h
+++ b/cpp/src/IceSSL/OpenSSLUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_OPENSSL_UTIL_I_H
diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp
index 91876d7baee..10f5e9b26d4 100755
--- a/cpp/src/IceSSL/PluginI.cpp
+++ b/cpp/src/IceSSL/PluginI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/PluginI.h>
diff --git a/cpp/src/IceSSL/PluginI.h b/cpp/src/IceSSL/PluginI.h
index 6974e581dd2..50befc27261 100644
--- a/cpp/src/IceSSL/PluginI.h
+++ b/cpp/src/IceSSL/PluginI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_PLUGIN_I_H
diff --git a/cpp/src/IceSSL/RFC2253.cpp b/cpp/src/IceSSL/RFC2253.cpp
index bffb621b01f..4c1c540a5e6 100644
--- a/cpp/src/IceSSL/RFC2253.cpp
+++ b/cpp/src/IceSSL/RFC2253.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IceSSL/RFC2253.h b/cpp/src/IceSSL/RFC2253.h
index 1b4dfb40fb5..44d9d677bde 100644
--- a/cpp/src/IceSSL/RFC2253.h
+++ b/cpp/src/IceSSL/RFC2253.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_RFC_2253_H
diff --git a/cpp/src/IceSSL/SChannelCertificateI.cpp b/cpp/src/IceSSL/SChannelCertificateI.cpp
index afa3b7d78cc..d817dc61923 100644
--- a/cpp/src/IceSSL/SChannelCertificateI.cpp
+++ b/cpp/src/IceSSL/SChannelCertificateI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/Plugin.h>
diff --git a/cpp/src/IceSSL/SChannelEngine.cpp b/cpp/src/IceSSL/SChannelEngine.cpp
index ddaa7731b7d..19a50c49631 100644
--- a/cpp/src/IceSSL/SChannelEngine.cpp
+++ b/cpp/src/IceSSL/SChannelEngine.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/SChannelEngine.h>
diff --git a/cpp/src/IceSSL/SChannelEngine.h b/cpp/src/IceSSL/SChannelEngine.h
index f5db95b23c1..c50e8cb6629 100644
--- a/cpp/src/IceSSL/SChannelEngine.h
+++ b/cpp/src/IceSSL/SChannelEngine.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_SCHANNEL_ENGINE_H
diff --git a/cpp/src/IceSSL/SChannelEngineF.h b/cpp/src/IceSSL/SChannelEngineF.h
index a68852cf2fa..879daa4d5d1 100644
--- a/cpp/src/IceSSL/SChannelEngineF.h
+++ b/cpp/src/IceSSL/SChannelEngineF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_SCHANNEL_ENGINE_F_H
diff --git a/cpp/src/IceSSL/SChannelPluginI.cpp b/cpp/src/IceSSL/SChannelPluginI.cpp
index b0febdefab1..694615743b3 100644
--- a/cpp/src/IceSSL/SChannelPluginI.cpp
+++ b/cpp/src/IceSSL/SChannelPluginI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/PluginI.h>
diff --git a/cpp/src/IceSSL/SChannelTransceiverI.cpp b/cpp/src/IceSSL/SChannelTransceiverI.cpp
index 6716e1c1f5b..b879dab8798 100644
--- a/cpp/src/IceSSL/SChannelTransceiverI.cpp
+++ b/cpp/src/IceSSL/SChannelTransceiverI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/SChannelTransceiverI.h>
diff --git a/cpp/src/IceSSL/SChannelTransceiverI.h b/cpp/src/IceSSL/SChannelTransceiverI.h
index 628dafb15e1..c183c6ff8fd 100644
--- a/cpp/src/IceSSL/SChannelTransceiverI.h
+++ b/cpp/src/IceSSL/SChannelTransceiverI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_SCHANNELTRANSCEIVER_I_H
diff --git a/cpp/src/IceSSL/SSLEngine.cpp b/cpp/src/IceSSL/SSLEngine.cpp
index 2a1b807f270..56e74693671 100644
--- a/cpp/src/IceSSL/SSLEngine.cpp
+++ b/cpp/src/IceSSL/SSLEngine.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/SSLEngine.h>
diff --git a/cpp/src/IceSSL/SSLEngine.h b/cpp/src/IceSSL/SSLEngine.h
index adedc3b2349..57041bc16ad 100644
--- a/cpp/src/IceSSL/SSLEngine.h
+++ b/cpp/src/IceSSL/SSLEngine.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_ENGINE_H
diff --git a/cpp/src/IceSSL/SSLEngineF.h b/cpp/src/IceSSL/SSLEngineF.h
index ecf83afb058..f745756340d 100644
--- a/cpp/src/IceSSL/SSLEngineF.h
+++ b/cpp/src/IceSSL/SSLEngineF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_ENGINE_F_H
diff --git a/cpp/src/IceSSL/SecureTransportCertificateI.cpp b/cpp/src/IceSSL/SecureTransportCertificateI.cpp
index 2d275927553..89a6b6a5b93 100644
--- a/cpp/src/IceSSL/SecureTransportCertificateI.cpp
+++ b/cpp/src/IceSSL/SecureTransportCertificateI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/Plugin.h>
diff --git a/cpp/src/IceSSL/SecureTransportEngine.cpp b/cpp/src/IceSSL/SecureTransportEngine.cpp
index 15be667d61a..80f28129bf7 100644
--- a/cpp/src/IceSSL/SecureTransportEngine.cpp
+++ b/cpp/src/IceSSL/SecureTransportEngine.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/Config.h>
diff --git a/cpp/src/IceSSL/SecureTransportEngine.h b/cpp/src/IceSSL/SecureTransportEngine.h
index 71caa78ebd9..a8bdf41d594 100644
--- a/cpp/src/IceSSL/SecureTransportEngine.h
+++ b/cpp/src/IceSSL/SecureTransportEngine.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_ENGINE_H
diff --git a/cpp/src/IceSSL/SecureTransportEngineF.h b/cpp/src/IceSSL/SecureTransportEngineF.h
index 5e5096af388..565c5535c51 100644
--- a/cpp/src/IceSSL/SecureTransportEngineF.h
+++ b/cpp/src/IceSSL/SecureTransportEngineF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_ENGINE_F_H
diff --git a/cpp/src/IceSSL/SecureTransportPluginI.cpp b/cpp/src/IceSSL/SecureTransportPluginI.cpp
index 1ea5713d992..7c4cdc375f3 100644
--- a/cpp/src/IceSSL/SecureTransportPluginI.cpp
+++ b/cpp/src/IceSSL/SecureTransportPluginI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/PluginI.h>
diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
index fcd76e80d2d..317da13705b 100644
--- a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
+++ b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/SecureTransportTransceiverI.h>
diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.h b/cpp/src/IceSSL/SecureTransportTransceiverI.h
index 677a110c31c..f3d84ef033b 100644
--- a/cpp/src/IceSSL/SecureTransportTransceiverI.h
+++ b/cpp/src/IceSSL/SecureTransportTransceiverI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_TRANSCEIVER_I_H
diff --git a/cpp/src/IceSSL/SecureTransportUtil.cpp b/cpp/src/IceSSL/SecureTransportUtil.cpp
index f1ce4cd93dd..ac8d8f21e34 100644
--- a/cpp/src/IceSSL/SecureTransportUtil.cpp
+++ b/cpp/src/IceSSL/SecureTransportUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/SecureTransportUtil.h>
diff --git a/cpp/src/IceSSL/SecureTransportUtil.h b/cpp/src/IceSSL/SecureTransportUtil.h
index 89f402ab00d..211d4b49c9c 100644
--- a/cpp/src/IceSSL/SecureTransportUtil.h
+++ b/cpp/src/IceSSL/SecureTransportUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_UTIL_H
diff --git a/cpp/src/IceSSL/TrustManager.cpp b/cpp/src/IceSSL/TrustManager.cpp
index eba463f85a5..8f2352b70c6 100644
--- a/cpp/src/IceSSL/TrustManager.cpp
+++ b/cpp/src/IceSSL/TrustManager.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/TrustManager.h>
diff --git a/cpp/src/IceSSL/TrustManager.h b/cpp/src/IceSSL/TrustManager.h
index 126ede4d916..ce9ba4d42dd 100644
--- a/cpp/src/IceSSL/TrustManager.h
+++ b/cpp/src/IceSSL/TrustManager.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_TRUST_MANAGER_H
diff --git a/cpp/src/IceSSL/TrustManagerF.h b/cpp/src/IceSSL/TrustManagerF.h
index 0d01d3fbde9..ec11874eadd 100644
--- a/cpp/src/IceSSL/TrustManagerF.h
+++ b/cpp/src/IceSSL/TrustManagerF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_TRUST_MANAGER_F_H
diff --git a/cpp/src/IceSSL/UWPCertificateI.cpp b/cpp/src/IceSSL/UWPCertificateI.cpp
index f2711a2c17b..b5108e7bc23 100644
--- a/cpp/src/IceSSL/UWPCertificateI.cpp
+++ b/cpp/src/IceSSL/UWPCertificateI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
//
diff --git a/cpp/src/IceSSL/UWPEngine.cpp b/cpp/src/IceSSL/UWPEngine.cpp
index 4dece71132b..f3be970d81b 100644
--- a/cpp/src/IceSSL/UWPEngine.cpp
+++ b/cpp/src/IceSSL/UWPEngine.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/Config.h>
diff --git a/cpp/src/IceSSL/UWPEngine.h b/cpp/src/IceSSL/UWPEngine.h
index e0be122f085..701590131e4 100644
--- a/cpp/src/IceSSL/UWPEngine.h
+++ b/cpp/src/IceSSL/UWPEngine.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_UWP_ENGINE_H
diff --git a/cpp/src/IceSSL/UWPEngineF.h b/cpp/src/IceSSL/UWPEngineF.h
index 82db9059afc..634f0c594d8 100644
--- a/cpp/src/IceSSL/UWPEngineF.h
+++ b/cpp/src/IceSSL/UWPEngineF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_UWP_ENGINE_F_H
diff --git a/cpp/src/IceSSL/UWPPluginI.cpp b/cpp/src/IceSSL/UWPPluginI.cpp
index fd6c9e2cfd7..a1d519496ba 100644
--- a/cpp/src/IceSSL/UWPPluginI.cpp
+++ b/cpp/src/IceSSL/UWPPluginI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/PluginI.h>
diff --git a/cpp/src/IceSSL/UWPTransceiverI.cpp b/cpp/src/IceSSL/UWPTransceiverI.cpp
index e12da8bdafd..50cc865ff0f 100644
--- a/cpp/src/IceSSL/UWPTransceiverI.cpp
+++ b/cpp/src/IceSSL/UWPTransceiverI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceSSL/Config.h>
diff --git a/cpp/src/IceSSL/UWPTransceiverI.h b/cpp/src/IceSSL/UWPTransceiverI.h
index 6181400af28..272356c51be 100644
--- a/cpp/src/IceSSL/UWPTransceiverI.h
+++ b/cpp/src/IceSSL/UWPTransceiverI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_UWP_TRANSCEIVER_I_H
diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp
index 269d8269ba5..f919115613b 100755
--- a/cpp/src/IceSSL/Util.cpp
+++ b/cpp/src/IceSSL/Util.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Config.h>
diff --git a/cpp/src/IceSSL/Util.h b/cpp/src/IceSSL/Util.h
index 7f5c3ef70ab..62b60e6598a 100644
--- a/cpp/src/IceSSL/Util.h
+++ b/cpp/src/IceSSL/Util.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESSL_UTIL_H
diff --git a/cpp/src/IceStorm/Admin.cpp b/cpp/src/IceStorm/Admin.cpp
index 4f4bf9aef66..875ac412e36 100644
--- a/cpp/src/IceStorm/Admin.cpp
+++ b/cpp/src/IceStorm/Admin.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IceStorm/DBTypes.ice b/cpp/src/IceStorm/DBTypes.ice
index ecdd4481632..08dc5d22510 100644
--- a/cpp/src/IceStorm/DBTypes.ice
+++ b/cpp/src/IceStorm/DBTypes.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/Election.ice b/cpp/src/IceStorm/Election.ice
index 1ffc2a9e9f5..8a7c47e558c 100644
--- a/cpp/src/IceStorm/Election.ice
+++ b/cpp/src/IceStorm/Election.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/Grammar.cpp b/cpp/src/IceStorm/Grammar.cpp
index 7db49139955..aafd24e8559 100644
--- a/cpp/src/IceStorm/Grammar.cpp
+++ b/cpp/src/IceStorm/Grammar.cpp
@@ -70,9 +70,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceStorm/Grammar.y b/cpp/src/IceStorm/Grammar.y
index 8906ee64866..d60b83fccbf 100644
--- a/cpp/src/IceStorm/Grammar.y
+++ b/cpp/src/IceStorm/Grammar.y
@@ -4,9 +4,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceStorm/IceStormDB.cpp b/cpp/src/IceStorm/IceStormDB.cpp
index cbeec576535..2cf9398428c 100644
--- a/cpp/src/IceStorm/IceStormDB.cpp
+++ b/cpp/src/IceStorm/IceStormDB.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IceStorm/IceStormInternal.ice b/cpp/src/IceStorm/IceStormInternal.ice
index cdf73088b24..7f9d6ace1c0 100644
--- a/cpp/src/IceStorm/IceStormInternal.ice
+++ b/cpp/src/IceStorm/IceStormInternal.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/Instance.cpp b/cpp/src/IceStorm/Instance.cpp
index 1cbf85f74e6..f65d83f8353 100644
--- a/cpp/src/IceStorm/Instance.cpp
+++ b/cpp/src/IceStorm/Instance.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceStorm/Instance.h>
diff --git a/cpp/src/IceStorm/Instance.h b/cpp/src/IceStorm/Instance.h
index fa55815130b..19e9555327c 100644
--- a/cpp/src/IceStorm/Instance.h
+++ b/cpp/src/IceStorm/Instance.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef INSTANCE_H
diff --git a/cpp/src/IceStorm/Instrumentation.ice b/cpp/src/IceStorm/Instrumentation.ice
index bb78f850f72..3dca295be82 100644
--- a/cpp/src/IceStorm/Instrumentation.ice
+++ b/cpp/src/IceStorm/Instrumentation.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/InstrumentationI.cpp b/cpp/src/IceStorm/InstrumentationI.cpp
index 2cd1070810f..ded07c9a8b6 100644
--- a/cpp/src/IceStorm/InstrumentationI.cpp
+++ b/cpp/src/IceStorm/InstrumentationI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceStorm/InstrumentationI.h>
diff --git a/cpp/src/IceStorm/InstrumentationI.h b/cpp/src/IceStorm/InstrumentationI.h
index 81e8e78f3de..1f4b62504df 100644
--- a/cpp/src/IceStorm/InstrumentationI.h
+++ b/cpp/src/IceStorm/InstrumentationI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef INSTRUMENTATION_I_H
diff --git a/cpp/src/IceStorm/LLURecord.ice b/cpp/src/IceStorm/LLURecord.ice
index a69f2b1bfac..35b27b0542e 100644
--- a/cpp/src/IceStorm/LLURecord.ice
+++ b/cpp/src/IceStorm/LLURecord.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/LinkRecord.ice b/cpp/src/IceStorm/LinkRecord.ice
index 0e15ced26bc..0090a56f4a3 100644
--- a/cpp/src/IceStorm/LinkRecord.ice
+++ b/cpp/src/IceStorm/LinkRecord.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/Makefile.mk b/cpp/src/IceStorm/Makefile.mk
index 42ae54a5bee..32a8b9a66fc 100644
--- a/cpp/src/IceStorm/Makefile.mk
+++ b/cpp/src/IceStorm/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_libraries := IceStormService
diff --git a/cpp/src/IceStorm/NodeI.cpp b/cpp/src/IceStorm/NodeI.cpp
index da8c134e7c1..d87482bc5e6 100644
--- a/cpp/src/IceStorm/NodeI.cpp
+++ b/cpp/src/IceStorm/NodeI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceStorm/NodeI.h b/cpp/src/IceStorm/NodeI.h
index 73373ddae00..9c3ca39a79d 100644
--- a/cpp/src/IceStorm/NodeI.h
+++ b/cpp/src/IceStorm/NodeI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ELECTION_I_H
diff --git a/cpp/src/IceStorm/Observers.cpp b/cpp/src/IceStorm/Observers.cpp
index 4ffb95d7129..72dc9df1020 100644
--- a/cpp/src/IceStorm/Observers.cpp
+++ b/cpp/src/IceStorm/Observers.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceStorm/Observers.h>
diff --git a/cpp/src/IceStorm/Observers.h b/cpp/src/IceStorm/Observers.h
index 9e89ac3ea0f..c98d0e44eff 100644
--- a/cpp/src/IceStorm/Observers.h
+++ b/cpp/src/IceStorm/Observers.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef OBSERVERS_H
diff --git a/cpp/src/IceStorm/Parser.cpp b/cpp/src/IceStorm/Parser.cpp
index 41ff1c35076..9b97c180983 100644
--- a/cpp/src/IceStorm/Parser.cpp
+++ b/cpp/src/IceStorm/Parser.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/IceStorm/Parser.h b/cpp/src/IceStorm/Parser.h
index fb99fd7df27..a696a4fe012 100644
--- a/cpp/src/IceStorm/Parser.h
+++ b/cpp/src/IceStorm/Parser.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_STORM_PARSER_H
diff --git a/cpp/src/IceStorm/Replica.h b/cpp/src/IceStorm/Replica.h
index 30bc6f13065..e0af5e778d6 100644
--- a/cpp/src/IceStorm/Replica.h
+++ b/cpp/src/IceStorm/Replica.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef REPLICA_H
diff --git a/cpp/src/IceStorm/Scanner.cpp b/cpp/src/IceStorm/Scanner.cpp
index bd614c44465..fa6ad378a91 100644
--- a/cpp/src/IceStorm/Scanner.cpp
+++ b/cpp/src/IceStorm/Scanner.cpp
@@ -466,9 +466,6 @@ char *yytext;
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceStorm/Scanner.l b/cpp/src/IceStorm/Scanner.l
index 7b6f104a28d..47cd435feee 100644
--- a/cpp/src/IceStorm/Scanner.l
+++ b/cpp/src/IceStorm/Scanner.l
@@ -4,9 +4,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp
index e4a4c1b5d3b..3beb25d9ab2 100644
--- a/cpp/src/IceStorm/Service.cpp
+++ b/cpp/src/IceStorm/Service.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#define ICESTORM_SERVICE_API_EXPORTS
diff --git a/cpp/src/IceStorm/Service.h b/cpp/src/IceStorm/Service.h
index acd430ab3ef..a9991943395 100644
--- a/cpp/src/IceStorm/Service.h
+++ b/cpp/src/IceStorm/Service.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICESTORM_SERVICE_H
diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp
index 7c2d298aabc..cbc9aa03df6 100644
--- a/cpp/src/IceStorm/Subscriber.cpp
+++ b/cpp/src/IceStorm/Subscriber.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceStorm/Subscriber.h>
diff --git a/cpp/src/IceStorm/Subscriber.h b/cpp/src/IceStorm/Subscriber.h
index c712b9f37c7..e9d3ebc6f67 100644
--- a/cpp/src/IceStorm/Subscriber.h
+++ b/cpp/src/IceStorm/Subscriber.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef SUBSCRIBER_H
diff --git a/cpp/src/IceStorm/SubscriberRecord.ice b/cpp/src/IceStorm/SubscriberRecord.ice
index 84e34b08ab7..98dd9dd6cf0 100644
--- a/cpp/src/IceStorm/SubscriberRecord.ice
+++ b/cpp/src/IceStorm/SubscriberRecord.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp
index d3a5dbdf5be..269f9ab955a 100644
--- a/cpp/src/IceStorm/TopicI.cpp
+++ b/cpp/src/IceStorm/TopicI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceStorm/TopicI.h>
diff --git a/cpp/src/IceStorm/TopicI.h b/cpp/src/IceStorm/TopicI.h
index 0b5de5cd8bc..be48eea9cfd 100644
--- a/cpp/src/IceStorm/TopicI.h
+++ b/cpp/src/IceStorm/TopicI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef TOPIC_I_H
diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp
index b5080794b62..7e9d10890f6 100644
--- a/cpp/src/IceStorm/TopicManagerI.cpp
+++ b/cpp/src/IceStorm/TopicManagerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceStorm/TopicManagerI.h>
diff --git a/cpp/src/IceStorm/TopicManagerI.h b/cpp/src/IceStorm/TopicManagerI.h
index 18056ae6f40..3a913082363 100644
--- a/cpp/src/IceStorm/TopicManagerI.h
+++ b/cpp/src/IceStorm/TopicManagerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef TOPIC_MANAGER_I_H
diff --git a/cpp/src/IceStorm/TraceLevels.cpp b/cpp/src/IceStorm/TraceLevels.cpp
index d14f9c3887f..f0ee042b89b 100644
--- a/cpp/src/IceStorm/TraceLevels.cpp
+++ b/cpp/src/IceStorm/TraceLevels.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceStorm/TraceLevels.h>
diff --git a/cpp/src/IceStorm/TraceLevels.h b/cpp/src/IceStorm/TraceLevels.h
index 78a0dfe3c34..91f0d1e5903 100644
--- a/cpp/src/IceStorm/TraceLevels.h
+++ b/cpp/src/IceStorm/TraceLevels.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_STORM_TRACE_LEVELS_H
diff --git a/cpp/src/IceStorm/TransientTopicI.cpp b/cpp/src/IceStorm/TransientTopicI.cpp
index 0b89d7d5a2d..014029a58bd 100644
--- a/cpp/src/IceStorm/TransientTopicI.cpp
+++ b/cpp/src/IceStorm/TransientTopicI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceStorm/TransientTopicI.h>
diff --git a/cpp/src/IceStorm/TransientTopicI.h b/cpp/src/IceStorm/TransientTopicI.h
index 4a1b0bc78c8..da745330e7c 100644
--- a/cpp/src/IceStorm/TransientTopicI.h
+++ b/cpp/src/IceStorm/TransientTopicI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef TRANSIENT_TOPIC_I_H
diff --git a/cpp/src/IceStorm/TransientTopicManagerI.cpp b/cpp/src/IceStorm/TransientTopicManagerI.cpp
index 7163d3464ae..2e33a7ce8d2 100644
--- a/cpp/src/IceStorm/TransientTopicManagerI.cpp
+++ b/cpp/src/IceStorm/TransientTopicManagerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceStorm/TransientTopicManagerI.h>
diff --git a/cpp/src/IceStorm/TransientTopicManagerI.h b/cpp/src/IceStorm/TransientTopicManagerI.h
index a2f554cb478..49e617abb27 100644
--- a/cpp/src/IceStorm/TransientTopicManagerI.h
+++ b/cpp/src/IceStorm/TransientTopicManagerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef TRANSIENT_TOPIC_MANAGER_I_H
diff --git a/cpp/src/IceStorm/Util.cpp b/cpp/src/IceStorm/Util.cpp
index bc55a19cf93..3d17d1d5a49 100644
--- a/cpp/src/IceStorm/Util.cpp
+++ b/cpp/src/IceStorm/Util.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceStorm/Util.h>
diff --git a/cpp/src/IceStorm/Util.h b/cpp/src/IceStorm/Util.h
index 706fc4a623f..d70943fb929 100644
--- a/cpp/src/IceStorm/Util.h
+++ b/cpp/src/IceStorm/Util.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef UTIL_H
diff --git a/cpp/src/IceStormLib/Makefile.mk b/cpp/src/IceStormLib/Makefile.mk
index 468a1cd661e..317510ab5af 100644
--- a/cpp/src/IceStormLib/Makefile.mk
+++ b/cpp/src/IceStormLib/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_libraries := IceStorm
diff --git a/cpp/src/IceUtil/ConsoleUtil.cpp b/cpp/src/IceUtil/ConsoleUtil.cpp
index 87ad7d8295c..fd1f5855e02 100644
--- a/cpp/src/IceUtil/ConsoleUtil.cpp
+++ b/cpp/src/IceUtil/ConsoleUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/ConsoleUtil.h>
diff --git a/cpp/src/IceUtil/ConvertUTF.cpp b/cpp/src/IceUtil/ConvertUTF.cpp
index 2df27dc04e9..16fe10d14f5 100644
--- a/cpp/src/IceUtil/ConvertUTF.cpp
+++ b/cpp/src/IceUtil/ConvertUTF.cpp
@@ -24,9 +24,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
/* ---------------------------------------------------------------------
diff --git a/cpp/src/IceUtil/ConvertUTF.h b/cpp/src/IceUtil/ConvertUTF.h
index 0baee6635ed..5aa3f7df4d8 100644
--- a/cpp/src/IceUtil/ConvertUTF.h
+++ b/cpp/src/IceUtil/ConvertUTF.h
@@ -24,9 +24,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_UTIL_CONVERT_UTF_H
diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp
index d45807afe18..d0de08a6365 100644
--- a/cpp/src/IceUtil/CtrlCHandler.cpp
+++ b/cpp/src/IceUtil/CtrlCHandler.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifdef __sun
diff --git a/cpp/src/IceUtil/FileUtil.cpp b/cpp/src/IceUtil/FileUtil.cpp
index ed20da80f3b..7a0d8a66cfd 100644
--- a/cpp/src/IceUtil/FileUtil.cpp
+++ b/cpp/src/IceUtil/FileUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/IceUtil/InputUtil.cpp b/cpp/src/IceUtil/InputUtil.cpp
index 901f06eadac..f3dd98922c3 100644
--- a/cpp/src/IceUtil/InputUtil.cpp
+++ b/cpp/src/IceUtil/InputUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/InputUtil.h>
diff --git a/cpp/src/IceUtil/Makefile.mk b/cpp/src/IceUtil/Makefile.mk
index 4014a3b05a3..2f031256d36 100644
--- a/cpp/src/IceUtil/Makefile.mk
+++ b/cpp/src/IceUtil/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_libraries = IceUtil
diff --git a/cpp/src/IceUtil/MutexProtocol.cpp b/cpp/src/IceUtil/MutexProtocol.cpp
index cd2ee330a12..fc278555666 100644
--- a/cpp/src/IceUtil/MutexProtocol.cpp
+++ b/cpp/src/IceUtil/MutexProtocol.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/MutexProtocol.h>
diff --git a/cpp/src/IceUtil/Options.cpp b/cpp/src/IceUtil/Options.cpp
index bda73d5c7ad..7baf57380f2 100644
--- a/cpp/src/IceUtil/Options.cpp
+++ b/cpp/src/IceUtil/Options.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IceUtil/OutputUtil.cpp b/cpp/src/IceUtil/OutputUtil.cpp
index e152dac98f0..9003b8e93fa 100644
--- a/cpp/src/IceUtil/OutputUtil.cpp
+++ b/cpp/src/IceUtil/OutputUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/OutputUtil.h>
diff --git a/cpp/src/IceUtil/Random.cpp b/cpp/src/IceUtil/Random.cpp
index e7b078f87f7..bcf2b233ad3 100644
--- a/cpp/src/IceUtil/Random.cpp
+++ b/cpp/src/IceUtil/Random.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifdef _WIN32
diff --git a/cpp/src/IceUtil/RecMutex.cpp b/cpp/src/IceUtil/RecMutex.cpp
index 67cb25f8f12..24465292486 100644
--- a/cpp/src/IceUtil/RecMutex.cpp
+++ b/cpp/src/IceUtil/RecMutex.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/RecMutex.h>
diff --git a/cpp/src/IceUtil/Shared.cpp b/cpp/src/IceUtil/Shared.cpp
index 15736067ff1..6250f1ab8bd 100644
--- a/cpp/src/IceUtil/Shared.cpp
+++ b/cpp/src/IceUtil/Shared.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Shared.h>
diff --git a/cpp/src/IceUtil/StringConverter.cpp b/cpp/src/IceUtil/StringConverter.cpp
index d9e862afba4..292f87d5fc4 100644
--- a/cpp/src/IceUtil/StringConverter.cpp
+++ b/cpp/src/IceUtil/StringConverter.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/StringConverter.h>
diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp
index 42e2637a320..33848ba54cd 100644
--- a/cpp/src/IceUtil/StringUtil.cpp
+++ b/cpp/src/IceUtil/StringUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IceUtil/ThreadException.cpp b/cpp/src/IceUtil/ThreadException.cpp
index 5079a867b84..8f047847146 100644
--- a/cpp/src/IceUtil/ThreadException.cpp
+++ b/cpp/src/IceUtil/ThreadException.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/ThreadException.h>
diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp
index 784752a8373..68b953dbb2a 100644
--- a/cpp/src/IceUtil/Time.cpp
+++ b/cpp/src/IceUtil/Time.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp
index d6a4f00f9f1..662807a86f2 100644
--- a/cpp/src/IceUtil/UUID.cpp
+++ b/cpp/src/IceUtil/UUID.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/UUID.h>
diff --git a/cpp/src/IceUtil/Unicode.cpp b/cpp/src/IceUtil/Unicode.cpp
index a49f3ad2b39..608d6306de4 100644
--- a/cpp/src/IceUtil/Unicode.cpp
+++ b/cpp/src/IceUtil/Unicode.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Config.h>
diff --git a/cpp/src/IceUtil/Unicode.h b/cpp/src/IceUtil/Unicode.h
index c675a076a4a..bdae437a5a4 100644
--- a/cpp/src/IceUtil/Unicode.h
+++ b/cpp/src/IceUtil/Unicode.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_UTIL_UNICODE_H
diff --git a/cpp/src/IceUtil/UtilException.cpp b/cpp/src/IceUtil/UtilException.cpp
index 52b5b48e9c7..4c8daaaf236 100644
--- a/cpp/src/IceUtil/UtilException.cpp
+++ b/cpp/src/IceUtil/UtilException.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#if defined(_MSC_VER) && _MSC_VER >= 1700
diff --git a/cpp/src/IceXML/Makefile.mk b/cpp/src/IceXML/Makefile.mk
index d71e17999e0..c6b9315c6ca 100644
--- a/cpp/src/IceXML/Makefile.mk
+++ b/cpp/src/IceXML/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_libraries := IceXML
diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp
index 4512ccf19ce..1a1ad3e8c41 100644
--- a/cpp/src/IceXML/Parser.cpp
+++ b/cpp/src/IceXML/Parser.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceXML/Parser.h>
diff --git a/cpp/src/IceXML/Parser.h b/cpp/src/IceXML/Parser.h
index 7de07a1d0d8..4ee32ea78b8 100644
--- a/cpp/src/IceXML/Parser.h
+++ b/cpp/src/IceXML/Parser.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_XML_PARSER_H
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index 0b2169ee553..7d63961a941 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Slice/CPlusPlusUtil.h>
@@ -519,9 +516,6 @@ Slice::printHeader(Output& out)
"//\n"
"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
"//\n"
-"// This copy of Ice is licensed to you under the terms described in the\n"
-"// ICE_LICENSE file included in this distribution.\n"
-"//\n"
"// **********************************************************************\n"
;
diff --git a/cpp/src/Slice/CPlusPlusUtil.h b/cpp/src/Slice/CPlusPlusUtil.h
index accc29a680c..ac77f16f86a 100644
--- a/cpp/src/Slice/CPlusPlusUtil.h
+++ b/cpp/src/Slice/CPlusPlusUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef C_PLUS_PLUS_UTIL_H
diff --git a/cpp/src/Slice/Checksum.cpp b/cpp/src/Slice/Checksum.cpp
index 078465648c4..d35fda1c921 100644
--- a/cpp/src/Slice/Checksum.cpp
+++ b/cpp/src/Slice/Checksum.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Slice/Checksum.h>
diff --git a/cpp/src/Slice/Checksum.h b/cpp/src/Slice/Checksum.h
index 6476855fe29..ef86fc5784d 100644
--- a/cpp/src/Slice/Checksum.h
+++ b/cpp/src/Slice/Checksum.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef SLICE_CHECKSUM_H
diff --git a/cpp/src/Slice/FileTracker.cpp b/cpp/src/Slice/FileTracker.cpp
index c73dc6f96eb..17eeefd1f2e 100644
--- a/cpp/src/Slice/FileTracker.cpp
+++ b/cpp/src/Slice/FileTracker.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Slice/FileTracker.h>
diff --git a/cpp/src/Slice/FileTracker.h b/cpp/src/Slice/FileTracker.h
index 0a2ce45735d..704004f9e6a 100644
--- a/cpp/src/Slice/FileTracker.h
+++ b/cpp/src/Slice/FileTracker.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef FILE_TRACKER_H
diff --git a/cpp/src/Slice/Grammar.cpp b/cpp/src/Slice/Grammar.cpp
index b45d8bc36a3..d9ef1669a98 100644
--- a/cpp/src/Slice/Grammar.cpp
+++ b/cpp/src/Slice/Grammar.cpp
@@ -77,9 +77,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Slice/GrammarUtil.h>
diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y
index 4874116b2b8..8c5776c78e2 100644
--- a/cpp/src/Slice/Grammar.y
+++ b/cpp/src/Slice/Grammar.y
@@ -4,9 +4,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Slice/GrammarUtil.h>
diff --git a/cpp/src/Slice/GrammarUtil.h b/cpp/src/Slice/GrammarUtil.h
index f70328604b1..5ea716dbaae 100644
--- a/cpp/src/Slice/GrammarUtil.h
+++ b/cpp/src/Slice/GrammarUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef SLICE_GRAMMAR_UTIL_H
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index e7ffced4c50..3e81077a3ff 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
@@ -792,9 +789,6 @@ Slice::JavaOutput::printHeader()
"//\n"
"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
"//\n"
-"// This copy of Ice is licensed to you under the terms described in the\n"
-"// ICE_LICENSE file included in this distribution.\n"
-"//\n"
"// **********************************************************************\n"
;
diff --git a/cpp/src/Slice/JavaUtil.h b/cpp/src/Slice/JavaUtil.h
index 8f2cbd98bcd..8fdbeb38a51 100644
--- a/cpp/src/Slice/JavaUtil.h
+++ b/cpp/src/Slice/JavaUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef JAVA_UTIL_H
diff --git a/cpp/src/Slice/MD5.cpp b/cpp/src/Slice/MD5.cpp
index 94704831141..d11ee1724c8 100644
--- a/cpp/src/Slice/MD5.cpp
+++ b/cpp/src/Slice/MD5.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Slice/MD5.h>
diff --git a/cpp/src/Slice/MD5.h b/cpp/src/Slice/MD5.h
index 4f0fa907d28..4314dfb68d0 100644
--- a/cpp/src/Slice/MD5.h
+++ b/cpp/src/Slice/MD5.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef SLICE_MD5_H
diff --git a/cpp/src/Slice/Makefile.mk b/cpp/src/Slice/Makefile.mk
index 55886bb4ed0..83a0bb90a0d 100644
--- a/cpp/src/Slice/Makefile.mk
+++ b/cpp/src/Slice/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_libraries := Slice
diff --git a/cpp/src/Slice/PHPUtil.cpp b/cpp/src/Slice/PHPUtil.cpp
index db20c8f24aa..e6b31290a59 100644
--- a/cpp/src/Slice/PHPUtil.cpp
+++ b/cpp/src/Slice/PHPUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Slice/PHPUtil.h>
diff --git a/cpp/src/Slice/PHPUtil.h b/cpp/src/Slice/PHPUtil.h
index 7b68a09b107..ac61a0a6232 100644
--- a/cpp/src/Slice/PHPUtil.h
+++ b/cpp/src/Slice/PHPUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef SLICE_PHP_UTIL_H
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 6a8d54d474f..a2ad348fb17 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Functional.h>
diff --git a/cpp/src/Slice/Parser.h b/cpp/src/Slice/Parser.h
index 94b2a4910eb..a36bd1154e5 100644
--- a/cpp/src/Slice/Parser.h
+++ b/cpp/src/Slice/Parser.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef SLICE_PARSER_H
diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index 0a40f3bc128..35e4deeb89f 100644
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Slice/Preprocessor.h>
diff --git a/cpp/src/Slice/Preprocessor.h b/cpp/src/Slice/Preprocessor.h
index 844439c020e..b2130800f58 100644
--- a/cpp/src/Slice/Preprocessor.h
+++ b/cpp/src/Slice/Preprocessor.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef PREPROCESSOR_H
diff --git a/cpp/src/Slice/Python.cpp b/cpp/src/Slice/Python.cpp
index bb1071583b4..c94ddfa212b 100644
--- a/cpp/src/Slice/Python.cpp
+++ b/cpp/src/Slice/Python.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp
index 5d85d998919..55314440dd6 100644
--- a/cpp/src/Slice/PythonUtil.cpp
+++ b/cpp/src/Slice/PythonUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Slice/PythonUtil.h>
@@ -3092,9 +3089,6 @@ Slice::Python::printHeader(IceUtilInternal::Output& out)
"#\n"
"# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
"#\n"
-"# This copy of Ice is licensed to you under the terms described in the\n"
-"# ICE_LICENSE file included in this distribution.\n"
-"#\n"
"# **********************************************************************\n"
;
diff --git a/cpp/src/Slice/PythonUtil.h b/cpp/src/Slice/PythonUtil.h
index 0cfc70e7bd2..2dc69c1cc62 100644
--- a/cpp/src/Slice/PythonUtil.h
+++ b/cpp/src/Slice/PythonUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef SLICE_PYTHON_UTIL_H
diff --git a/cpp/src/Slice/Ruby.cpp b/cpp/src/Slice/Ruby.cpp
index d3d64114013..5e3b5ef2345 100644
--- a/cpp/src/Slice/Ruby.cpp
+++ b/cpp/src/Slice/Ruby.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp
index 0914cc8913c..6ec56cb5bb5 100644
--- a/cpp/src/Slice/RubyUtil.cpp
+++ b/cpp/src/Slice/RubyUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Slice/RubyUtil.h>
@@ -1568,9 +1565,6 @@ Slice::Ruby::printHeader(IceUtilInternal::Output& out)
"#\n"
"# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
"#\n"
-"# This copy of Ice is licensed to you under the terms described in the\n"
-"# ICE_LICENSE file included in this distribution.\n"
-"#\n"
"# **********************************************************************\n"
;
diff --git a/cpp/src/Slice/RubyUtil.h b/cpp/src/Slice/RubyUtil.h
index 5bb79546b26..69ad8f937e8 100644
--- a/cpp/src/Slice/RubyUtil.h
+++ b/cpp/src/Slice/RubyUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef SLICE_RUBY_UTIL_H
diff --git a/cpp/src/Slice/Scanner.cpp b/cpp/src/Slice/Scanner.cpp
index d451e7054ff..6a0ba098cd8 100644
--- a/cpp/src/Slice/Scanner.cpp
+++ b/cpp/src/Slice/Scanner.cpp
@@ -550,9 +550,6 @@ char *slice_text;
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Slice/GrammarUtil.h> // Before Grammer.h, so that YYSTYPE is defined
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index 52480c2c198..8209d01265b 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -4,9 +4,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Slice/GrammarUtil.h> // Before Grammer.h, so that YYSTYPE is defined
diff --git a/cpp/src/Slice/SliceUtil.cpp b/cpp/src/Slice/SliceUtil.cpp
index 84f5573f547..f59a58818dd 100644
--- a/cpp/src/Slice/SliceUtil.cpp
+++ b/cpp/src/Slice/SliceUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Slice/Util.h>
diff --git a/cpp/src/Slice/StringLiteralUtil.cpp b/cpp/src/Slice/StringLiteralUtil.cpp
index bada507a486..f2f1dd8a74c 100644
--- a/cpp/src/Slice/StringLiteralUtil.cpp
+++ b/cpp/src/Slice/StringLiteralUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Slice/Util.h>
diff --git a/cpp/src/Slice/Util.h b/cpp/src/Slice/Util.h
index 3aa09be3c76..caa8ed321bb 100644
--- a/cpp/src/Slice/Util.h
+++ b/cpp/src/Slice/Util.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef SLICE_UTIL_H
diff --git a/cpp/src/icegriddb/DBTypes.ice b/cpp/src/icegriddb/DBTypes.ice
index 5625baf75d1..e24fbf7c2ed 100644
--- a/cpp/src/icegriddb/DBTypes.ice
+++ b/cpp/src/icegriddb/DBTypes.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/icegriddb/IceGridDB.cpp b/cpp/src/icegriddb/IceGridDB.cpp
index ad8cb8858d9..b2b96f44688 100644
--- a/cpp/src/icegriddb/IceGridDB.cpp
+++ b/cpp/src/icegriddb/IceGridDB.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/icegriddb/Makefile.mk b/cpp/src/icegriddb/Makefile.mk
index 09d7fb36c78..2635bca3b22 100644
--- a/cpp/src/icegriddb/Makefile.mk
+++ b/cpp/src/icegriddb/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present 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.
-#
# **********************************************************************
$(project)_programs := icegriddb
diff --git a/cpp/src/iceserviceinstall/Install.cpp b/cpp/src/iceserviceinstall/Install.cpp
index d841d437201..9e5b8890412 100644
--- a/cpp/src/iceserviceinstall/Install.cpp
+++ b/cpp/src/iceserviceinstall/Install.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.cpp b/cpp/src/iceserviceinstall/ServiceInstaller.cpp
index b1bccccfb8c..d42540093f9 100644
--- a/cpp/src/iceserviceinstall/ServiceInstaller.cpp
+++ b/cpp/src/iceserviceinstall/ServiceInstaller.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <ServiceInstaller.h>
diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.h b/cpp/src/iceserviceinstall/ServiceInstaller.h
index 236871ec481..78f181e9671 100644
--- a/cpp/src/iceserviceinstall/ServiceInstaller.h
+++ b/cpp/src/iceserviceinstall/ServiceInstaller.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef ICE_SERVICE_INSTALLER_H
diff --git a/cpp/src/slice2confluence/ConfluenceOutput.cpp b/cpp/src/slice2confluence/ConfluenceOutput.cpp
index 1bf7705f1fe..81bc2488c5e 100644
--- a/cpp/src/slice2confluence/ConfluenceOutput.cpp
+++ b/cpp/src/slice2confluence/ConfluenceOutput.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/ConsoleUtil.h>
diff --git a/cpp/src/slice2confluence/ConfluenceOutput.h b/cpp/src/slice2confluence/ConfluenceOutput.h
index 36b77745e06..912a1bc5262 100644
--- a/cpp/src/slice2confluence/ConfluenceOutput.h
+++ b/cpp/src/slice2confluence/ConfluenceOutput.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef CONFLUENCE_OUTPUT
diff --git a/cpp/src/slice2confluence/Gen.cpp b/cpp/src/slice2confluence/Gen.cpp
index f54207be8fa..ac492c8d47b 100644
--- a/cpp/src/slice2confluence/Gen.cpp
+++ b/cpp/src/slice2confluence/Gen.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/FileUtil.h>
diff --git a/cpp/src/slice2confluence/Gen.h b/cpp/src/slice2confluence/Gen.h
index ec7daebd409..b85854ef7c3 100644
--- a/cpp/src/slice2confluence/Gen.h
+++ b/cpp/src/slice2confluence/Gen.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef GEN_H
diff --git a/cpp/src/slice2confluence/Main.cpp b/cpp/src/slice2confluence/Main.cpp
index 061f0f2155c..f727095a663 100644
--- a/cpp/src/slice2confluence/Main.cpp
+++ b/cpp/src/slice2confluence/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 8bbf1aa21ca..e0e49484a69 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include "Gen.h"
diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h
index 320e5e81412..592b0efd785 100644
--- a/cpp/src/slice2cpp/Gen.h
+++ b/cpp/src/slice2cpp/Gen.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef GEN_H
diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp
index 9b317ec6757..f6229dcbb44 100644
--- a/cpp/src/slice2cpp/Main.cpp
+++ b/cpp/src/slice2cpp/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/slice2cs/CsUtil.cpp b/cpp/src/slice2cs/CsUtil.cpp
index 887b1223fb4..4e855c42673 100644
--- a/cpp/src/slice2cs/CsUtil.cpp
+++ b/cpp/src/slice2cs/CsUtil.cpp
@@ -3,9 +3,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <CsUtil.h>
diff --git a/cpp/src/slice2cs/CsUtil.h b/cpp/src/slice2cs/CsUtil.h
index 128fffd5931..c814fe311b3 100644
--- a/cpp/src/slice2cs/CsUtil.h
+++ b/cpp/src/slice2cs/CsUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef CS_UTIL_H
diff --git a/cpp/src/slice2cs/DotNetNames.cpp b/cpp/src/slice2cs/DotNetNames.cpp
index 713cd939244..88e102695d8 100644
--- a/cpp/src/slice2cs/DotNetNames.cpp
+++ b/cpp/src/slice2cs/DotNetNames.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <DotNetNames.h>
diff --git a/cpp/src/slice2cs/DotNetNames.h b/cpp/src/slice2cs/DotNetNames.h
index 86051d70d66..33ea863ac9b 100644
--- a/cpp/src/slice2cs/DotNetNames.h
+++ b/cpp/src/slice2cs/DotNetNames.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef DOTNETNAMES_H
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index aa83ea80653..5fd2d18e11e 100644
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Functional.h>
@@ -2121,9 +2118,6 @@ Slice::Gen::printHeader()
"//\n"
"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
"//\n"
-"// This copy of Ice is licensed to you under the terms described in the\n"
-"// ICE_LICENSE file included in this distribution.\n"
-"//\n"
"// **********************************************************************\n"
;
diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h
index dec6da394b3..b56de95fb65 100644
--- a/cpp/src/slice2cs/Gen.h
+++ b/cpp/src/slice2cs/Gen.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef GEN_H
diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp
index cb89c6032fe..e5a43892c82 100644
--- a/cpp/src/slice2cs/Main.cpp
+++ b/cpp/src/slice2cs/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp
index 7f01cdc645c..416349e991a 100644
--- a/cpp/src/slice2html/Gen.cpp
+++ b/cpp/src/slice2html/Gen.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Functional.h>
diff --git a/cpp/src/slice2html/Gen.h b/cpp/src/slice2html/Gen.h
index 518153cb93b..923c83f480a 100644
--- a/cpp/src/slice2html/Gen.h
+++ b/cpp/src/slice2html/Gen.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef GEN_H
diff --git a/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp
index c0b76fa5461..c7d24550e36 100644
--- a/cpp/src/slice2html/Main.cpp
+++ b/cpp/src/slice2html/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 9bcb876e192..1bd2f742d6b 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Gen.h>
diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h
index 2da076ecbf7..4608a974b8b 100644
--- a/cpp/src/slice2java/Gen.h
+++ b/cpp/src/slice2java/Gen.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef GEN_H
diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp
index b24b89e5eca..95ce5cf9b27 100644
--- a/cpp/src/slice2java/GenCompat.cpp
+++ b/cpp/src/slice2java/GenCompat.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <GenCompat.h>
diff --git a/cpp/src/slice2java/GenCompat.h b/cpp/src/slice2java/GenCompat.h
index ea2a43a74bd..796d5332a58 100644
--- a/cpp/src/slice2java/GenCompat.h
+++ b/cpp/src/slice2java/GenCompat.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef GEN_COMPAT_H
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 48f61322858..171012dd7f7 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp
index 56478dc9137..d0d80e9ddbd 100644
--- a/cpp/src/slice2js/Gen.cpp
+++ b/cpp/src/slice2js/Gen.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Functional.h>
@@ -97,9 +94,6 @@ printHeader(IceUtilInternal::Output& out)
"//\n"
"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
"//\n"
- "// This copy of Ice is licensed to you under the terms described in the\n"
- "// ICE_LICENSE file included in this distribution.\n"
- "//\n"
"// **********************************************************************\n"
;
diff --git a/cpp/src/slice2js/Gen.h b/cpp/src/slice2js/Gen.h
index 83dfc942fdf..6ca2a1df8ec 100644
--- a/cpp/src/slice2js/Gen.h
+++ b/cpp/src/slice2js/Gen.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef GEN_H
diff --git a/cpp/src/slice2js/JsUtil.cpp b/cpp/src/slice2js/JsUtil.cpp
index 0f02ee20547..a5084be9160 100644
--- a/cpp/src/slice2js/JsUtil.cpp
+++ b/cpp/src/slice2js/JsUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <JsUtil.h>
diff --git a/cpp/src/slice2js/JsUtil.h b/cpp/src/slice2js/JsUtil.h
index 0f2be61e9e0..f8ae5400b57 100644
--- a/cpp/src/slice2js/JsUtil.h
+++ b/cpp/src/slice2js/JsUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef JS_UTIL_H
diff --git a/cpp/src/slice2js/Main.cpp b/cpp/src/slice2js/Main.cpp
index 6b1264dbe75..9abb2ce7cc6 100644
--- a/cpp/src/slice2js/Main.cpp
+++ b/cpp/src/slice2js/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/slice2matlab/Main.cpp b/cpp/src/slice2matlab/Main.cpp
index 107d0e9f6a8..98556847c02 100644
--- a/cpp/src/slice2matlab/Main.cpp
+++ b/cpp/src/slice2matlab/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp
index fad745abc8f..75133d6f0a1 100644
--- a/cpp/src/slice2objc/Gen.cpp
+++ b/cpp/src/slice2objc/Gen.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
@@ -885,9 +882,6 @@ Slice::Gen::printHeader(Output& o)
"//\n"
"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
"//\n"
-"// This copy of Ice is licensed to you under the terms described in the\n"
-"// ICE_LICENSE file included in this distribution.\n"
-"//\n"
"// **********************************************************************\n"
;
diff --git a/cpp/src/slice2objc/Gen.h b/cpp/src/slice2objc/Gen.h
index a9c7d49f520..b347331c1f5 100644
--- a/cpp/src/slice2objc/Gen.h
+++ b/cpp/src/slice2objc/Gen.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef GEN_H
diff --git a/cpp/src/slice2objc/Main.cpp b/cpp/src/slice2objc/Main.cpp
index 4c776ba7153..064ffadff88 100644
--- a/cpp/src/slice2objc/Main.cpp
+++ b/cpp/src/slice2objc/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/slice2objc/ObjCUtil.cpp b/cpp/src/slice2objc/ObjCUtil.cpp
index 45ead2ea1eb..3c323c52da6 100644
--- a/cpp/src/slice2objc/ObjCUtil.cpp
+++ b/cpp/src/slice2objc/ObjCUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <ObjCUtil.h>
diff --git a/cpp/src/slice2objc/ObjCUtil.h b/cpp/src/slice2objc/ObjCUtil.h
index fcef6f7a874..64a58a1eeae 100644
--- a/cpp/src/slice2objc/ObjCUtil.h
+++ b/cpp/src/slice2objc/ObjCUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#ifndef OBJC_UTIL_H
diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
index 7ef95d0da0e..12900e41943 100644
--- a/cpp/src/slice2php/Main.cpp
+++ b/cpp/src/slice2php/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <IceUtil/CtrlCHandler.h>
@@ -1582,9 +1579,6 @@ printHeader(IceUtilInternal::Output& out)
"//\n"
"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
"//\n"
- "// This copy of Ice is licensed to you under the terms described in the\n"
- "// ICE_LICENSE file included in this distribution.\n"
- "//\n"
"// **********************************************************************\n"
;
diff --git a/cpp/src/slice2py/Main.cpp b/cpp/src/slice2py/Main.cpp
index c523748501e..cf34e8cf4ec 100644
--- a/cpp/src/slice2py/Main.cpp
+++ b/cpp/src/slice2py/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Slice/PythonUtil.h>
diff --git a/cpp/src/slice2rb/Main.cpp b/cpp/src/slice2rb/Main.cpp
index b879c74f126..167c5bdaa39 100644
--- a/cpp/src/slice2rb/Main.cpp
+++ b/cpp/src/slice2rb/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present 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.
-//
// **********************************************************************
#include <Slice/RubyUtil.h>