summaryrefslogtreecommitdiff
path: root/cpp/include
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/include')
-rw-r--r--cpp/include/Glacier2/Application.h3
-rw-r--r--cpp/include/Glacier2/Config.h3
-rw-r--r--cpp/include/Glacier2/Glacier2.h3
-rw-r--r--cpp/include/Glacier2/NullPermissionsVerifier.h3
-rw-r--r--cpp/include/Glacier2/SessionHelper.h3
-rw-r--r--cpp/include/Ice/Application.h3
-rw-r--r--cpp/include/Ice/AsyncResult.h3
-rw-r--r--cpp/include/Ice/AsyncResultF.h3
-rw-r--r--cpp/include/Ice/BatchRequestInterceptor.h3
-rw-r--r--cpp/include/Ice/BatchRequestQueueF.h3
-rw-r--r--cpp/include/Ice/Buffer.h3
-rw-r--r--cpp/include/Ice/CommunicatorAsync.h3
-rw-r--r--cpp/include/Ice/Comparable.h3
-rw-r--r--cpp/include/Ice/Config.h3
-rw-r--r--cpp/include/Ice/ConnectionAsync.h3
-rw-r--r--cpp/include/Ice/ConnectionIF.h3
-rw-r--r--cpp/include/Ice/ConsoleUtil.h3
-rw-r--r--cpp/include/Ice/DefaultValueFactory.h3
-rw-r--r--cpp/include/Ice/DispatchInterceptor.h3
-rw-r--r--cpp/include/Ice/Dispatcher.h3
-rw-r--r--cpp/include/Ice/DynamicLibrary.h3
-rw-r--r--cpp/include/Ice/DynamicLibraryF.h3
-rw-r--r--cpp/include/Ice/Exception.h3
-rw-r--r--cpp/include/Ice/ExceptionHelpers.h3
-rw-r--r--cpp/include/Ice/FactoryTable.h3
-rw-r--r--cpp/include/Ice/FactoryTableInit.h3
-rw-r--r--cpp/include/Ice/Format.h3
-rw-r--r--cpp/include/Ice/Functional.h3
-rw-r--r--cpp/include/Ice/GCObject.h3
-rw-r--r--cpp/include/Ice/Handle.h3
-rw-r--r--cpp/include/Ice/Ice.h3
-rw-r--r--cpp/include/Ice/IconvStringConverter.h3
-rw-r--r--cpp/include/Ice/Incoming.h3
-rw-r--r--cpp/include/Ice/IncomingAsync.h3
-rw-r--r--cpp/include/Ice/IncomingAsyncF.h3
-rw-r--r--cpp/include/Ice/Initialize.h3
-rw-r--r--cpp/include/Ice/InputStream.h3
-rw-r--r--cpp/include/Ice/InstanceF.h3
-rw-r--r--cpp/include/Ice/InterfaceByValue.h3
-rw-r--r--cpp/include/Ice/LocalObject.h3
-rw-r--r--cpp/include/Ice/LocalObjectF.h3
-rw-r--r--cpp/include/Ice/LoggerUtil.h3
-rw-r--r--cpp/include/Ice/MetricsAdminI.h3
-rw-r--r--cpp/include/Ice/MetricsFunctional.h3
-rw-r--r--cpp/include/Ice/MetricsObserverI.h3
-rw-r--r--cpp/include/Ice/NativePropertiesAdmin.h3
-rw-r--r--cpp/include/Ice/Object.h3
-rw-r--r--cpp/include/Ice/ObjectF.h3
-rw-r--r--cpp/include/Ice/ObserverHelper.h3
-rw-r--r--cpp/include/Ice/Optional.h3
-rw-r--r--cpp/include/Ice/OutgoingAsync.h3
-rw-r--r--cpp/include/Ice/OutgoingAsyncF.h3
-rw-r--r--cpp/include/Ice/OutputStream.h3
-rw-r--r--cpp/include/Ice/Protocol.h3
-rw-r--r--cpp/include/Ice/Proxy.h3
-rw-r--r--cpp/include/Ice/ProxyF.h3
-rw-r--r--cpp/include/Ice/ProxyFactoryF.h3
-rw-r--r--cpp/include/Ice/ProxyHandle.h3
-rw-r--r--cpp/include/Ice/ReferenceF.h3
-rw-r--r--cpp/include/Ice/RegisterPlugins.h3
-rw-r--r--cpp/include/Ice/RequestHandlerF.h3
-rw-r--r--cpp/include/Ice/ResponseHandlerF.h3
-rw-r--r--cpp/include/Ice/SHA1.h3
-rw-r--r--cpp/include/Ice/ServantManagerF.h3
-rw-r--r--cpp/include/Ice/Service.h3
-rw-r--r--cpp/include/Ice/SliceChecksums.h3
-rw-r--r--cpp/include/Ice/SlicedData.h3
-rw-r--r--cpp/include/Ice/SlicedDataF.h3
-rw-r--r--cpp/include/Ice/StreamHelpers.h3
-rw-r--r--cpp/include/Ice/StringConverter.h3
-rw-r--r--cpp/include/Ice/ThreadPoolF.h3
-rw-r--r--cpp/include/Ice/UUID.h3
-rw-r--r--cpp/include/Ice/UniquePtr.h3
-rw-r--r--cpp/include/Ice/UniqueRef.h3
-rw-r--r--cpp/include/Ice/UserExceptionFactory.h3
-rw-r--r--cpp/include/Ice/Value.h3
-rw-r--r--cpp/include/Ice/ValueF.h3
-rw-r--r--cpp/include/IceBT/IceBT.h3
-rw-r--r--cpp/include/IceBT/Makefile3
-rw-r--r--cpp/include/IceBT/Plugin.h3
-rw-r--r--cpp/include/IceBox/Config.h3
-rw-r--r--cpp/include/IceGrid/Config.h3
-rw-r--r--cpp/include/IceGrid/IceGrid.h3
-rw-r--r--cpp/include/IceGrid/ReplicaGroupFilter.h3
-rw-r--r--cpp/include/IceIAP/IceIAP.h3
-rw-r--r--cpp/include/IcePatch2/ClientUtil.h3
-rw-r--r--cpp/include/IcePatch2/Config.h3
-rw-r--r--cpp/include/IcePatch2/IcePatch2.h3
-rw-r--r--cpp/include/IceSSL/Config.h3
-rw-r--r--cpp/include/IceSSL/IceSSL.h3
-rw-r--r--cpp/include/IceSSL/OpenSSL.h3
-rw-r--r--cpp/include/IceSSL/Plugin.h3
-rw-r--r--cpp/include/IceSSL/SChannel.h3
-rw-r--r--cpp/include/IceSSL/SecureTransport.h3
-rw-r--r--cpp/include/IceSSL/UWP.h3
-rw-r--r--cpp/include/IceStorm/Config.h3
-rw-r--r--cpp/include/IceUtil/Atomic.h3
-rw-r--r--cpp/include/IceUtil/Cond.h3
-rw-r--r--cpp/include/IceUtil/Config.h3
-rw-r--r--cpp/include/IceUtil/ConsoleUtil.h3
-rw-r--r--cpp/include/IceUtil/CountDownLatch.h3
-rw-r--r--cpp/include/IceUtil/CtrlCHandler.h3
-rw-r--r--cpp/include/IceUtil/DisableWarnings.h3
-rw-r--r--cpp/include/IceUtil/Exception.h3
-rw-r--r--cpp/include/IceUtil/FileUtil.h3
-rw-r--r--cpp/include/IceUtil/Functional.h3
-rw-r--r--cpp/include/IceUtil/Handle.h3
-rw-r--r--cpp/include/IceUtil/IceUtil.h3
-rw-r--r--cpp/include/IceUtil/InputUtil.h3
-rw-r--r--cpp/include/IceUtil/Iterator.h3
-rw-r--r--cpp/include/IceUtil/Lock.h3
-rw-r--r--cpp/include/IceUtil/Monitor.h3
-rw-r--r--cpp/include/IceUtil/Mutex.h3
-rw-r--r--cpp/include/IceUtil/MutexProtocol.h3
-rw-r--r--cpp/include/IceUtil/MutexPtrLock.h3
-rw-r--r--cpp/include/IceUtil/MutexPtrTryLock.h3
-rw-r--r--cpp/include/IceUtil/Optional.h3
-rw-r--r--cpp/include/IceUtil/Options.h3
-rw-r--r--cpp/include/IceUtil/OutputUtil.h3
-rw-r--r--cpp/include/IceUtil/PopDisableWarnings.h3
-rw-r--r--cpp/include/IceUtil/PushDisableWarnings.h3
-rw-r--r--cpp/include/IceUtil/Random.h3
-rw-r--r--cpp/include/IceUtil/RecMutex.h3
-rw-r--r--cpp/include/IceUtil/ResourceConfig.h3
-rw-r--r--cpp/include/IceUtil/ScannerConfig.h3
-rw-r--r--cpp/include/IceUtil/ScopedArray.h3
-rw-r--r--cpp/include/IceUtil/Shared.h3
-rw-r--r--cpp/include/IceUtil/StopWatch.h3
-rw-r--r--cpp/include/IceUtil/StringConverter.h3
-rw-r--r--cpp/include/IceUtil/StringUtil.h3
-rw-r--r--cpp/include/IceUtil/Thread.h3
-rw-r--r--cpp/include/IceUtil/ThreadException.h3
-rw-r--r--cpp/include/IceUtil/Time.h3
-rw-r--r--cpp/include/IceUtil/Timer.h3
-rw-r--r--cpp/include/IceUtil/UUID.h3
-rw-r--r--cpp/include/IceUtil/UndefSysMacros.h3
136 files changed, 0 insertions, 408 deletions
diff --git a/cpp/include/Glacier2/Application.h b/cpp/include/Glacier2/Application.h
index fa956217d65..6f0b5e332f0 100644
--- a/cpp/include/Glacier2/Application.h
+++ b/cpp/include/Glacier2/Application.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_APPLICATION_H
diff --git a/cpp/include/Glacier2/Config.h b/cpp/include/Glacier2/Config.h
index c9a86faacc0..593bf34dfb0 100644
--- a/cpp/include/Glacier2/Config.h
+++ b/cpp/include/Glacier2/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 GLACIER2_CONFIG_H
diff --git a/cpp/include/Glacier2/Glacier2.h b/cpp/include/Glacier2/Glacier2.h
index 5de9023bb8f..b0f8b76e6e7 100644
--- a/cpp/include/Glacier2/Glacier2.h
+++ b/cpp/include/Glacier2/Glacier2.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_H
diff --git a/cpp/include/Glacier2/NullPermissionsVerifier.h b/cpp/include/Glacier2/NullPermissionsVerifier.h
index 5b0419d74bd..d27b31f6a7f 100644
--- a/cpp/include/Glacier2/NullPermissionsVerifier.h
+++ b/cpp/include/Glacier2/NullPermissionsVerifier.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_NULL_PERMISSIONS_VERIFIER_H
diff --git a/cpp/include/Glacier2/SessionHelper.h b/cpp/include/Glacier2/SessionHelper.h
index 07618f6d9c2..964117daf9f 100644
--- a/cpp/include/Glacier2/SessionHelper.h
+++ b/cpp/include/Glacier2/SessionHelper.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_HELPER_H
diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h
index daa7c1434f8..891d87ef076 100644
--- a/cpp/include/Ice/Application.h
+++ b/cpp/include/Ice/Application.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_APPLICATION_H
diff --git a/cpp/include/Ice/AsyncResult.h b/cpp/include/Ice/AsyncResult.h
index 17d57f99273..4f63029fa4c 100644
--- a/cpp/include/Ice/AsyncResult.h
+++ b/cpp/include/Ice/AsyncResult.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_ASYNC_RESULT_H
diff --git a/cpp/include/Ice/AsyncResultF.h b/cpp/include/Ice/AsyncResultF.h
index d12a8f2c1f5..de8ad2663ca 100644
--- a/cpp/include/Ice/AsyncResultF.h
+++ b/cpp/include/Ice/AsyncResultF.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_ASYNC_RESULT_F_H
diff --git a/cpp/include/Ice/BatchRequestInterceptor.h b/cpp/include/Ice/BatchRequestInterceptor.h
index c068385a8f2..9b6191a398e 100644
--- a/cpp/include/Ice/BatchRequestInterceptor.h
+++ b/cpp/include/Ice/BatchRequestInterceptor.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_INTERCEPTOR_H
diff --git a/cpp/include/Ice/BatchRequestQueueF.h b/cpp/include/Ice/BatchRequestQueueF.h
index 4265dc9c6b5..bc060d79a05 100644
--- a/cpp/include/Ice/BatchRequestQueueF.h
+++ b/cpp/include/Ice/BatchRequestQueueF.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_F_H
diff --git a/cpp/include/Ice/Buffer.h b/cpp/include/Ice/Buffer.h
index 4a8de4319aa..6c6c61c74ef 100644
--- a/cpp/include/Ice/Buffer.h
+++ b/cpp/include/Ice/Buffer.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_BUFFER_H
diff --git a/cpp/include/Ice/CommunicatorAsync.h b/cpp/include/Ice/CommunicatorAsync.h
index 7f63be2ea02..3f533d651e5 100644
--- a/cpp/include/Ice/CommunicatorAsync.h
+++ b/cpp/include/Ice/CommunicatorAsync.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_ASYNC_H
diff --git a/cpp/include/Ice/Comparable.h b/cpp/include/Ice/Comparable.h
index 8d9f522221a..7c2f5ad95da 100644
--- a/cpp/include/Ice/Comparable.h
+++ b/cpp/include/Ice/Comparable.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_COMPARABLE_H
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h
index 8f055757337..291bc05c294 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/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_CONFIG_H
diff --git a/cpp/include/Ice/ConnectionAsync.h b/cpp/include/Ice/ConnectionAsync.h
index bbc7b3c1db3..8825b143446 100644
--- a/cpp/include/Ice/ConnectionAsync.h
+++ b/cpp/include/Ice/ConnectionAsync.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_ASYNC_H
diff --git a/cpp/include/Ice/ConnectionIF.h b/cpp/include/Ice/ConnectionIF.h
index b53d45e8311..659649948d7 100644
--- a/cpp/include/Ice/ConnectionIF.h
+++ b/cpp/include/Ice/ConnectionIF.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_CONNECTIONI_F_H
diff --git a/cpp/include/Ice/ConsoleUtil.h b/cpp/include/Ice/ConsoleUtil.h
index 6cc562a3788..0854ff2b563 100644
--- a/cpp/include/Ice/ConsoleUtil.h
+++ b/cpp/include/Ice/ConsoleUtil.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_CONSOLE_UTIL_H
diff --git a/cpp/include/Ice/DefaultValueFactory.h b/cpp/include/Ice/DefaultValueFactory.h
index e524b83cff7..feb07731fcf 100644
--- a/cpp/include/Ice/DefaultValueFactory.h
+++ b/cpp/include/Ice/DefaultValueFactory.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_DEFAULT_VALUE_FACTORY_H
diff --git a/cpp/include/Ice/DispatchInterceptor.h b/cpp/include/Ice/DispatchInterceptor.h
index c451eab6e27..a0af296e99e 100644
--- a/cpp/include/Ice/DispatchInterceptor.h
+++ b/cpp/include/Ice/DispatchInterceptor.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_DISPATCH_INTERCEPTOR_H
diff --git a/cpp/include/Ice/Dispatcher.h b/cpp/include/Ice/Dispatcher.h
index 5e10f9a567e..9ec33940275 100644
--- a/cpp/include/Ice/Dispatcher.h
+++ b/cpp/include/Ice/Dispatcher.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_DISPATCHER_H
diff --git a/cpp/include/Ice/DynamicLibrary.h b/cpp/include/Ice/DynamicLibrary.h
index d8e88f57bfa..b9a9205d5e7 100644
--- a/cpp/include/Ice/DynamicLibrary.h
+++ b/cpp/include/Ice/DynamicLibrary.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_DYNAMIC_LIBRARY_H
diff --git a/cpp/include/Ice/DynamicLibraryF.h b/cpp/include/Ice/DynamicLibraryF.h
index 2be797280f5..f465efffc7c 100644
--- a/cpp/include/Ice/DynamicLibraryF.h
+++ b/cpp/include/Ice/DynamicLibraryF.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_DYNAMIC_LIBRARY_F_H
diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h
index bd3b60193ae..df3b1f6bc5a 100644
--- a/cpp/include/Ice/Exception.h
+++ b/cpp/include/Ice/Exception.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_EXCEPTION_H
diff --git a/cpp/include/Ice/ExceptionHelpers.h b/cpp/include/Ice/ExceptionHelpers.h
index 993429a9baa..22d2d26c902 100644
--- a/cpp/include/Ice/ExceptionHelpers.h
+++ b/cpp/include/Ice/ExceptionHelpers.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_EXCEPTION_HELPERS_H
diff --git a/cpp/include/Ice/FactoryTable.h b/cpp/include/Ice/FactoryTable.h
index be8951060ef..e0064be94c8 100644
--- a/cpp/include/Ice/FactoryTable.h
+++ b/cpp/include/Ice/FactoryTable.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_FACTORYTABLE_H
diff --git a/cpp/include/Ice/FactoryTableInit.h b/cpp/include/Ice/FactoryTableInit.h
index 0ffd8fe7337..60c751564ea 100644
--- a/cpp/include/Ice/FactoryTableInit.h
+++ b/cpp/include/Ice/FactoryTableInit.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_FACTORYTABLEINIT_H
diff --git a/cpp/include/Ice/Format.h b/cpp/include/Ice/Format.h
index 121be354294..ea0c203a02b 100644
--- a/cpp/include/Ice/Format.h
+++ b/cpp/include/Ice/Format.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_FORMAT_H
diff --git a/cpp/include/Ice/Functional.h b/cpp/include/Ice/Functional.h
index 0f578ed638b..b04bd48d418 100644
--- a/cpp/include/Ice/Functional.h
+++ b/cpp/include/Ice/Functional.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_FUNCTIONAL_H
diff --git a/cpp/include/Ice/GCObject.h b/cpp/include/Ice/GCObject.h
index ff23cbfae49..19242ea25ad 100644
--- a/cpp/include/Ice/GCObject.h
+++ b/cpp/include/Ice/GCObject.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_GC_OBJECT_H
diff --git a/cpp/include/Ice/Handle.h b/cpp/include/Ice/Handle.h
index 69052ad5979..db3cbb95929 100644
--- a/cpp/include/Ice/Handle.h
+++ b/cpp/include/Ice/Handle.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_HANDLE_H
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index e09c5c23d01..c2ad572ea8f 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.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_ICE_H
diff --git a/cpp/include/Ice/IconvStringConverter.h b/cpp/include/Ice/IconvStringConverter.h
index e2c4ae2d9e6..634fba965a2 100644
--- a/cpp/include/Ice/IconvStringConverter.h
+++ b/cpp/include/Ice/IconvStringConverter.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_ICONV_STRING_CONVERTER
diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h
index e8adad513c4..e378650a65d 100644
--- a/cpp/include/Ice/Incoming.h
+++ b/cpp/include/Ice/Incoming.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_H
diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h
index 63c1435af68..746b11afb84 100644
--- a/cpp/include/Ice/IncomingAsync.h
+++ b/cpp/include/Ice/IncomingAsync.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_ASYNC_H
diff --git a/cpp/include/Ice/IncomingAsyncF.h b/cpp/include/Ice/IncomingAsyncF.h
index 64c0a3a1f68..8f4a257d71a 100644
--- a/cpp/include/Ice/IncomingAsyncF.h
+++ b/cpp/include/Ice/IncomingAsyncF.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_ASYNC_F_H
diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h
index 1fe9fd828cf..3df5d289d09 100644
--- a/cpp/include/Ice/Initialize.h
+++ b/cpp/include/Ice/Initialize.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_INITIALIZE_H
diff --git a/cpp/include/Ice/InputStream.h b/cpp/include/Ice/InputStream.h
index a36c403c448..decd266abe8 100644
--- a/cpp/include/Ice/InputStream.h
+++ b/cpp/include/Ice/InputStream.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_INPUT_STREAM_H
diff --git a/cpp/include/Ice/InstanceF.h b/cpp/include/Ice/InstanceF.h
index 80618f56ea7..69bfaf2f786 100644
--- a/cpp/include/Ice/InstanceF.h
+++ b/cpp/include/Ice/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_INSTANCE_F_H
diff --git a/cpp/include/Ice/InterfaceByValue.h b/cpp/include/Ice/InterfaceByValue.h
index e1540935d80..77c45e21246 100644
--- a/cpp/include/Ice/InterfaceByValue.h
+++ b/cpp/include/Ice/InterfaceByValue.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_INTERFACE_BY_VALUE_H
diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h
index dedfe0178cd..5f6616ddcfe 100644
--- a/cpp/include/Ice/LocalObject.h
+++ b/cpp/include/Ice/LocalObject.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_LOCAL_OBJECT_H
diff --git a/cpp/include/Ice/LocalObjectF.h b/cpp/include/Ice/LocalObjectF.h
index 2e14b9ac5ef..8086d0c8e52 100644
--- a/cpp/include/Ice/LocalObjectF.h
+++ b/cpp/include/Ice/LocalObjectF.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_LOCAL_OBJECT_F_H
diff --git a/cpp/include/Ice/LoggerUtil.h b/cpp/include/Ice/LoggerUtil.h
index 17c569f88ad..901f2ec7f27 100644
--- a/cpp/include/Ice/LoggerUtil.h
+++ b/cpp/include/Ice/LoggerUtil.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_UTIL_H
diff --git a/cpp/include/Ice/MetricsAdminI.h b/cpp/include/Ice/MetricsAdminI.h
index f74ed2f278e..51a9965cf1c 100644
--- a/cpp/include/Ice/MetricsAdminI.h
+++ b/cpp/include/Ice/MetricsAdminI.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_METRICSADMIN_I_H
diff --git a/cpp/include/Ice/MetricsFunctional.h b/cpp/include/Ice/MetricsFunctional.h
index 41504cc1fc8..32207cd26ad 100644
--- a/cpp/include/Ice/MetricsFunctional.h
+++ b/cpp/include/Ice/MetricsFunctional.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_METRICSFUNCTIONAL_H
diff --git a/cpp/include/Ice/MetricsObserverI.h b/cpp/include/Ice/MetricsObserverI.h
index 8e65dd0a74c..d064695c20b 100644
--- a/cpp/include/Ice/MetricsObserverI.h
+++ b/cpp/include/Ice/MetricsObserverI.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 ICEMX_METRICSOBSERVER_I_H
diff --git a/cpp/include/Ice/NativePropertiesAdmin.h b/cpp/include/Ice/NativePropertiesAdmin.h
index 87908fa34e2..591f8b30b27 100644
--- a/cpp/include/Ice/NativePropertiesAdmin.h
+++ b/cpp/include/Ice/NativePropertiesAdmin.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_H
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h
index c752e8f3fac..925908ddce4 100644
--- a/cpp/include/Ice/Object.h
+++ b/cpp/include/Ice/Object.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_H
diff --git a/cpp/include/Ice/ObjectF.h b/cpp/include/Ice/ObjectF.h
index 2a490e25d7d..2118e5242a2 100644
--- a/cpp/include/Ice/ObjectF.h
+++ b/cpp/include/Ice/ObjectF.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_F_H
diff --git a/cpp/include/Ice/ObserverHelper.h b/cpp/include/Ice/ObserverHelper.h
index 74655b8d663..930b81f4a85 100644
--- a/cpp/include/Ice/ObserverHelper.h
+++ b/cpp/include/Ice/ObserverHelper.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_OBSERVERHELPER_H
diff --git a/cpp/include/Ice/Optional.h b/cpp/include/Ice/Optional.h
index 899be0aa1ac..5b329c17610 100644
--- a/cpp/include/Ice/Optional.h
+++ b/cpp/include/Ice/Optional.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.
-//
// **********************************************************************
//
diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
index 7fdf54493e2..725cede24b7 100644
--- a/cpp/include/Ice/OutgoingAsync.h
+++ b/cpp/include/Ice/OutgoingAsync.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_OUTGOING_ASYNC_H
diff --git a/cpp/include/Ice/OutgoingAsyncF.h b/cpp/include/Ice/OutgoingAsyncF.h
index 51b76238f7d..bc6ee2eaa3d 100644
--- a/cpp/include/Ice/OutgoingAsyncF.h
+++ b/cpp/include/Ice/OutgoingAsyncF.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_OUTGOING_ASYNC_F_H
diff --git a/cpp/include/Ice/OutputStream.h b/cpp/include/Ice/OutputStream.h
index 2d8aaeaf029..4aeec5ab31a 100644
--- a/cpp/include/Ice/OutputStream.h
+++ b/cpp/include/Ice/OutputStream.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_OUTPUT_STREAM_H
diff --git a/cpp/include/Ice/Protocol.h b/cpp/include/Ice/Protocol.h
index f8c49dcdec4..a4026a9557f 100644
--- a/cpp/include/Ice/Protocol.h
+++ b/cpp/include/Ice/Protocol.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_H
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index 08445dfc75f..3bbd25fe25f 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.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_H
diff --git a/cpp/include/Ice/ProxyF.h b/cpp/include/Ice/ProxyF.h
index a109f5595ec..d14735a3567 100644
--- a/cpp/include/Ice/ProxyF.h
+++ b/cpp/include/Ice/ProxyF.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_F_H
diff --git a/cpp/include/Ice/ProxyFactoryF.h b/cpp/include/Ice/ProxyFactoryF.h
index 78708f92c51..ffa016cc1f4 100644
--- a/cpp/include/Ice/ProxyFactoryF.h
+++ b/cpp/include/Ice/ProxyFactoryF.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_F_H
diff --git a/cpp/include/Ice/ProxyHandle.h b/cpp/include/Ice/ProxyHandle.h
index 07dbe60d73b..27480dfb09a 100644
--- a/cpp/include/Ice/ProxyHandle.h
+++ b/cpp/include/Ice/ProxyHandle.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_HANDLE_H
diff --git a/cpp/include/Ice/ReferenceF.h b/cpp/include/Ice/ReferenceF.h
index f287e961c5d..b9f3f0c1f03 100644
--- a/cpp/include/Ice/ReferenceF.h
+++ b/cpp/include/Ice/ReferenceF.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_F_H
diff --git a/cpp/include/Ice/RegisterPlugins.h b/cpp/include/Ice/RegisterPlugins.h
index 11d3f5ca320..e2900f5951f 100644
--- a/cpp/include/Ice/RegisterPlugins.h
+++ b/cpp/include/Ice/RegisterPlugins.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_H
diff --git a/cpp/include/Ice/RequestHandlerF.h b/cpp/include/Ice/RequestHandlerF.h
index 7876382f18d..ab401191b8b 100644
--- a/cpp/include/Ice/RequestHandlerF.h
+++ b/cpp/include/Ice/RequestHandlerF.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_F_H
diff --git a/cpp/include/Ice/ResponseHandlerF.h b/cpp/include/Ice/ResponseHandlerF.h
index 01e70023d6b..593aa95e716 100644
--- a/cpp/include/Ice/ResponseHandlerF.h
+++ b/cpp/include/Ice/ResponseHandlerF.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_F_H
diff --git a/cpp/include/Ice/SHA1.h b/cpp/include/Ice/SHA1.h
index bfc8cea3243..e70db769f22 100644
--- a/cpp/include/Ice/SHA1.h
+++ b/cpp/include/Ice/SHA1.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_SHA1_H
diff --git a/cpp/include/Ice/ServantManagerF.h b/cpp/include/Ice/ServantManagerF.h
index 0968ec3277f..c43b9afb7e1 100644
--- a/cpp/include/Ice/ServantManagerF.h
+++ b/cpp/include/Ice/ServantManagerF.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_F_H
diff --git a/cpp/include/Ice/Service.h b/cpp/include/Ice/Service.h
index fd7a8a27fde..3a21de4c84b 100644
--- a/cpp/include/Ice/Service.h
+++ b/cpp/include/Ice/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 ICE_SERVICE_H
diff --git a/cpp/include/Ice/SliceChecksums.h b/cpp/include/Ice/SliceChecksums.h
index 2e0a6babc98..dfb23ff90bc 100644
--- a/cpp/include/Ice/SliceChecksums.h
+++ b/cpp/include/Ice/SliceChecksums.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_SLICE_CHECKSUM_H
diff --git a/cpp/include/Ice/SlicedData.h b/cpp/include/Ice/SlicedData.h
index 08e7b5ccc5a..0de33978e7a 100644
--- a/cpp/include/Ice/SlicedData.h
+++ b/cpp/include/Ice/SlicedData.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_SLICED_DATA_H
diff --git a/cpp/include/Ice/SlicedDataF.h b/cpp/include/Ice/SlicedDataF.h
index 662e22f77b6..ba506a2a7a6 100644
--- a/cpp/include/Ice/SlicedDataF.h
+++ b/cpp/include/Ice/SlicedDataF.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_SLICED_DATA_F_H
diff --git a/cpp/include/Ice/StreamHelpers.h b/cpp/include/Ice/StreamHelpers.h
index 59bc1406fde..40ddbfcdbb4 100644
--- a/cpp/include/Ice/StreamHelpers.h
+++ b/cpp/include/Ice/StreamHelpers.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_HELPERS_H
diff --git a/cpp/include/Ice/StringConverter.h b/cpp/include/Ice/StringConverter.h
index 3bfb7beb867..f98ee2561be 100644
--- a/cpp/include/Ice/StringConverter.h
+++ b/cpp/include/Ice/StringConverter.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_CONVERTER_H
diff --git a/cpp/include/Ice/ThreadPoolF.h b/cpp/include/Ice/ThreadPoolF.h
index 2144154bb78..575b7da5d11 100644
--- a/cpp/include/Ice/ThreadPoolF.h
+++ b/cpp/include/Ice/ThreadPoolF.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_F_H
diff --git a/cpp/include/Ice/UUID.h b/cpp/include/Ice/UUID.h
index ab3806842a0..36084a36caf 100644
--- a/cpp/include/Ice/UUID.h
+++ b/cpp/include/Ice/UUID.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_UUID_H
diff --git a/cpp/include/Ice/UniquePtr.h b/cpp/include/Ice/UniquePtr.h
index 37c335dd431..1400a6f71c8 100644
--- a/cpp/include/Ice/UniquePtr.h
+++ b/cpp/include/Ice/UniquePtr.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_UNIQUE_PTR_H
diff --git a/cpp/include/Ice/UniqueRef.h b/cpp/include/Ice/UniqueRef.h
index 6da164e378b..5be41e39955 100644
--- a/cpp/include/Ice/UniqueRef.h
+++ b/cpp/include/Ice/UniqueRef.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_UNIQUE_REF_H
diff --git a/cpp/include/Ice/UserExceptionFactory.h b/cpp/include/Ice/UserExceptionFactory.h
index f56742b394f..e1c7139188e 100644
--- a/cpp/include/Ice/UserExceptionFactory.h
+++ b/cpp/include/Ice/UserExceptionFactory.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_USER_EXCEPTION_FACTORY_H
diff --git a/cpp/include/Ice/Value.h b/cpp/include/Ice/Value.h
index 11ac8de6465..c5c021a457b 100644
--- a/cpp/include/Ice/Value.h
+++ b/cpp/include/Ice/Value.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_H
diff --git a/cpp/include/Ice/ValueF.h b/cpp/include/Ice/ValueF.h
index 18344ddf729..f5aa31adfb3 100644
--- a/cpp/include/Ice/ValueF.h
+++ b/cpp/include/Ice/ValueF.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_F_H
diff --git a/cpp/include/IceBT/IceBT.h b/cpp/include/IceBT/IceBT.h
index 82033b21680..8fb4a393805 100644
--- a/cpp/include/IceBT/IceBT.h
+++ b/cpp/include/IceBT/IceBT.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_ICE_BT_H
diff --git a/cpp/include/IceBT/Makefile b/cpp/include/IceBT/Makefile
index 65c4ff437e6..68465fe71c9 100644
--- a/cpp/include/IceBT/Makefile
+++ b/cpp/include/IceBT/Makefile
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
top_srcdir = ../..
diff --git a/cpp/include/IceBT/Plugin.h b/cpp/include/IceBT/Plugin.h
index 5cf5030edf0..9b80afa7ef2 100644
--- a/cpp/include/IceBT/Plugin.h
+++ b/cpp/include/IceBT/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 ICE_BT_PLUGIN_H
diff --git a/cpp/include/IceBox/Config.h b/cpp/include/IceBox/Config.h
index 68dbcce10c0..91daa406d4f 100644
--- a/cpp/include/IceBox/Config.h
+++ b/cpp/include/IceBox/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 ICEBOX_CONFIG_H
diff --git a/cpp/include/IceGrid/Config.h b/cpp/include/IceGrid/Config.h
index b01e5839a0b..2c0b7de71f1 100644
--- a/cpp/include/IceGrid/Config.h
+++ b/cpp/include/IceGrid/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_GRID_CONFIG_H
diff --git a/cpp/include/IceGrid/IceGrid.h b/cpp/include/IceGrid/IceGrid.h
index 13f3ab086e2..216ba10167e 100644
--- a/cpp/include/IceGrid/IceGrid.h
+++ b/cpp/include/IceGrid/IceGrid.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_H
diff --git a/cpp/include/IceGrid/ReplicaGroupFilter.h b/cpp/include/IceGrid/ReplicaGroupFilter.h
index 849fa9fe71e..4e093421224 100644
--- a/cpp/include/IceGrid/ReplicaGroupFilter.h
+++ b/cpp/include/IceGrid/ReplicaGroupFilter.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_H
diff --git a/cpp/include/IceIAP/IceIAP.h b/cpp/include/IceIAP/IceIAP.h
index 2244b634282..34e730607a1 100644
--- a/cpp/include/IceIAP/IceIAP.h
+++ b/cpp/include/IceIAP/IceIAP.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_ICE_IAP_H
diff --git a/cpp/include/IcePatch2/ClientUtil.h b/cpp/include/IcePatch2/ClientUtil.h
index a38f5c0df89..b569e5d4385 100644
--- a/cpp/include/IcePatch2/ClientUtil.h
+++ b/cpp/include/IcePatch2/ClientUtil.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_CLIENT_UTIL_H
diff --git a/cpp/include/IcePatch2/Config.h b/cpp/include/IcePatch2/Config.h
index a5395aa807a..91fd1f02387 100644
--- a/cpp/include/IcePatch2/Config.h
+++ b/cpp/include/IcePatch2/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_PATCH2_CONFIG_H
diff --git a/cpp/include/IcePatch2/IcePatch2.h b/cpp/include/IcePatch2/IcePatch2.h
index 579f26e6842..c0efdc9637f 100644
--- a/cpp/include/IcePatch2/IcePatch2.h
+++ b/cpp/include/IcePatch2/IcePatch2.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.
-//
// **********************************************************************
#include <IcePatch2/Config.h>
diff --git a/cpp/include/IceSSL/Config.h b/cpp/include/IceSSL/Config.h
index 0048ac5a763..fa452f2db37 100644
--- a/cpp/include/IceSSL/Config.h
+++ b/cpp/include/IceSSL/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 ICESSL_CONFIG_H
diff --git a/cpp/include/IceSSL/IceSSL.h b/cpp/include/IceSSL/IceSSL.h
index 804c5b9d567..b6456dc839a 100644
--- a/cpp/include/IceSSL/IceSSL.h
+++ b/cpp/include/IceSSL/IceSSL.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_ICESSL_H
diff --git a/cpp/include/IceSSL/OpenSSL.h b/cpp/include/IceSSL/OpenSSL.h
index 299d7609b34..22b43f47f42 100644
--- a/cpp/include/IceSSL/OpenSSL.h
+++ b/cpp/include/IceSSL/OpenSSL.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_H
diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h
index b5411132c5d..4a745d2e35c 100644
--- a/cpp/include/IceSSL/Plugin.h
+++ b/cpp/include/IceSSL/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 ICESSL_PLUGIN_H
diff --git a/cpp/include/IceSSL/SChannel.h b/cpp/include/IceSSL/SChannel.h
index ef2635c8211..29d25cab30c 100644
--- a/cpp/include/IceSSL/SChannel.h
+++ b/cpp/include/IceSSL/SChannel.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_H
diff --git a/cpp/include/IceSSL/SecureTransport.h b/cpp/include/IceSSL/SecureTransport.h
index 26a8d1ff2b1..ca9b234353c 100644
--- a/cpp/include/IceSSL/SecureTransport.h
+++ b/cpp/include/IceSSL/SecureTransport.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_H
diff --git a/cpp/include/IceSSL/UWP.h b/cpp/include/IceSSL/UWP.h
index 1f3fcaa80f0..6f687293543 100644
--- a/cpp/include/IceSSL/UWP.h
+++ b/cpp/include/IceSSL/UWP.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_H
diff --git a/cpp/include/IceStorm/Config.h b/cpp/include/IceStorm/Config.h
index 5486f042599..b92a40da748 100644
--- a/cpp/include/IceStorm/Config.h
+++ b/cpp/include/IceStorm/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_STORM_CONFIG_H
diff --git a/cpp/include/IceUtil/Atomic.h b/cpp/include/IceUtil/Atomic.h
index b28cda09ea9..3492bd56e3e 100644
--- a/cpp/include/IceUtil/Atomic.h
+++ b/cpp/include/IceUtil/Atomic.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_ATOMIC_H
diff --git a/cpp/include/IceUtil/Cond.h b/cpp/include/IceUtil/Cond.h
index 3164412143a..19b561435c4 100644
--- a/cpp/include/IceUtil/Cond.h
+++ b/cpp/include/IceUtil/Cond.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_COND_H
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index 15d5107fe37..66d8c6ac257 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/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_UTIL_CONFIG_H
diff --git a/cpp/include/IceUtil/ConsoleUtil.h b/cpp/include/IceUtil/ConsoleUtil.h
index 2d23afeddc8..03c60c429b3 100644
--- a/cpp/include/IceUtil/ConsoleUtil.h
+++ b/cpp/include/IceUtil/ConsoleUtil.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_CONSOLE_UTIL_H
diff --git a/cpp/include/IceUtil/CountDownLatch.h b/cpp/include/IceUtil/CountDownLatch.h
index 8ba54983cc1..a319b7969a5 100644
--- a/cpp/include/IceUtil/CountDownLatch.h
+++ b/cpp/include/IceUtil/CountDownLatch.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_COUNT_DOWN_LATCH_H
diff --git a/cpp/include/IceUtil/CtrlCHandler.h b/cpp/include/IceUtil/CtrlCHandler.h
index 1084e974ad0..6792d182117 100644
--- a/cpp/include/IceUtil/CtrlCHandler.h
+++ b/cpp/include/IceUtil/CtrlCHandler.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_CTRL_C_HANDLER_H
diff --git a/cpp/include/IceUtil/DisableWarnings.h b/cpp/include/IceUtil/DisableWarnings.h
index d9bf9fc6072..8d1576cbfc3 100644
--- a/cpp/include/IceUtil/DisableWarnings.h
+++ b/cpp/include/IceUtil/DisableWarnings.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_DISABLEWARNINGS_H
diff --git a/cpp/include/IceUtil/Exception.h b/cpp/include/IceUtil/Exception.h
index 34504404eba..84ce16bbace 100644
--- a/cpp/include/IceUtil/Exception.h
+++ b/cpp/include/IceUtil/Exception.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_EXCEPTION_H
diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h
index b17aaac1317..8f76a91b529 100644
--- a/cpp/include/IceUtil/FileUtil.h
+++ b/cpp/include/IceUtil/FileUtil.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_FILE_UTIL_H
diff --git a/cpp/include/IceUtil/Functional.h b/cpp/include/IceUtil/Functional.h
index e804bc4737c..2c8d8871b7d 100644
--- a/cpp/include/IceUtil/Functional.h
+++ b/cpp/include/IceUtil/Functional.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_FUNCTIONAL_H
diff --git a/cpp/include/IceUtil/Handle.h b/cpp/include/IceUtil/Handle.h
index 616125fca70..c203fbd3774 100644
--- a/cpp/include/IceUtil/Handle.h
+++ b/cpp/include/IceUtil/Handle.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_HANDLE_H
diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h
index 6b4cdba4c39..6d0a162168c 100644
--- a/cpp/include/IceUtil/IceUtil.h
+++ b/cpp/include/IceUtil/IceUtil.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_ICE_UTIL_H
diff --git a/cpp/include/IceUtil/InputUtil.h b/cpp/include/IceUtil/InputUtil.h
index cc011797411..225017674b8 100644
--- a/cpp/include/IceUtil/InputUtil.h
+++ b/cpp/include/IceUtil/InputUtil.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_INPUT_UTIL_H
diff --git a/cpp/include/IceUtil/Iterator.h b/cpp/include/IceUtil/Iterator.h
index dda895cda2f..c9afa342f74 100644
--- a/cpp/include/IceUtil/Iterator.h
+++ b/cpp/include/IceUtil/Iterator.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_ITERATOR_H
diff --git a/cpp/include/IceUtil/Lock.h b/cpp/include/IceUtil/Lock.h
index 2afe2fe5614..5faa4d32059 100644
--- a/cpp/include/IceUtil/Lock.h
+++ b/cpp/include/IceUtil/Lock.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_LOCK_H
diff --git a/cpp/include/IceUtil/Monitor.h b/cpp/include/IceUtil/Monitor.h
index c3975937e9e..cd08fb281d4 100644
--- a/cpp/include/IceUtil/Monitor.h
+++ b/cpp/include/IceUtil/Monitor.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_MONITOR_H
diff --git a/cpp/include/IceUtil/Mutex.h b/cpp/include/IceUtil/Mutex.h
index edd06f0a3f1..7a13df276b7 100644
--- a/cpp/include/IceUtil/Mutex.h
+++ b/cpp/include/IceUtil/Mutex.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_UTIL_MUTEX_H
diff --git a/cpp/include/IceUtil/MutexProtocol.h b/cpp/include/IceUtil/MutexProtocol.h
index 09f0325ebe5..9f998272adc 100644
--- a/cpp/include/IceUtil/MutexProtocol.h
+++ b/cpp/include/IceUtil/MutexProtocol.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_MUTEX_PROTOCOL_H
diff --git a/cpp/include/IceUtil/MutexPtrLock.h b/cpp/include/IceUtil/MutexPtrLock.h
index b0ac59b6df4..8930d80605d 100644
--- a/cpp/include/IceUtil/MutexPtrLock.h
+++ b/cpp/include/IceUtil/MutexPtrLock.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_MUTEX_PTR_LOCK_H
diff --git a/cpp/include/IceUtil/MutexPtrTryLock.h b/cpp/include/IceUtil/MutexPtrTryLock.h
index cc94c1a6f33..4cf76045e6d 100644
--- a/cpp/include/IceUtil/MutexPtrTryLock.h
+++ b/cpp/include/IceUtil/MutexPtrTryLock.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_MUTEX_PTR_TRY_LOCK_H
diff --git a/cpp/include/IceUtil/Optional.h b/cpp/include/IceUtil/Optional.h
index 7f4c8639eb1..6e6206e6ec1 100644
--- a/cpp/include/IceUtil/Optional.h
+++ b/cpp/include/IceUtil/Optional.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_OPTIONAL_H
diff --git a/cpp/include/IceUtil/Options.h b/cpp/include/IceUtil/Options.h
index bcf7e9c6f09..9d06e969f22 100644
--- a/cpp/include/IceUtil/Options.h
+++ b/cpp/include/IceUtil/Options.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_OPTIONS_H
diff --git a/cpp/include/IceUtil/OutputUtil.h b/cpp/include/IceUtil/OutputUtil.h
index bc666d031ba..e1e34b5628e 100644
--- a/cpp/include/IceUtil/OutputUtil.h
+++ b/cpp/include/IceUtil/OutputUtil.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_OUTPUT_UTIL_H
diff --git a/cpp/include/IceUtil/PopDisableWarnings.h b/cpp/include/IceUtil/PopDisableWarnings.h
index 52665b3d6c4..726e972bb33 100644
--- a/cpp/include/IceUtil/PopDisableWarnings.h
+++ b/cpp/include/IceUtil/PopDisableWarnings.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.
-//
// **********************************************************************
// No pragma once as this file can be included several times in a translation
diff --git a/cpp/include/IceUtil/PushDisableWarnings.h b/cpp/include/IceUtil/PushDisableWarnings.h
index ad7a60105c2..a2b6f5b1bee 100644
--- a/cpp/include/IceUtil/PushDisableWarnings.h
+++ b/cpp/include/IceUtil/PushDisableWarnings.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.
-//
// **********************************************************************
// No pragma once as this file can be included several times in a translation
diff --git a/cpp/include/IceUtil/Random.h b/cpp/include/IceUtil/Random.h
index 3f18d9fc489..ef144e2f7e1 100644
--- a/cpp/include/IceUtil/Random.h
+++ b/cpp/include/IceUtil/Random.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_RANDOM_H
diff --git a/cpp/include/IceUtil/RecMutex.h b/cpp/include/IceUtil/RecMutex.h
index 99924434625..95126a0aba0 100644
--- a/cpp/include/IceUtil/RecMutex.h
+++ b/cpp/include/IceUtil/RecMutex.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_RMUTEX_H
diff --git a/cpp/include/IceUtil/ResourceConfig.h b/cpp/include/IceUtil/ResourceConfig.h
index 2a36b30af25..e93e2e0f47b 100644
--- a/cpp/include/IceUtil/ResourceConfig.h
+++ b/cpp/include/IceUtil/ResourceConfig.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_RESOURCE_CONFIG_H
diff --git a/cpp/include/IceUtil/ScannerConfig.h b/cpp/include/IceUtil/ScannerConfig.h
index c445d139778..26fc3949642 100644
--- a/cpp/include/IceUtil/ScannerConfig.h
+++ b/cpp/include/IceUtil/ScannerConfig.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_SCANNER_CONFIG_H
diff --git a/cpp/include/IceUtil/ScopedArray.h b/cpp/include/IceUtil/ScopedArray.h
index 18a8db4143e..8040019ecb1 100644
--- a/cpp/include/IceUtil/ScopedArray.h
+++ b/cpp/include/IceUtil/ScopedArray.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_SCOPED_ARRAY_H
diff --git a/cpp/include/IceUtil/Shared.h b/cpp/include/IceUtil/Shared.h
index d0aad9307c6..900a59fccfc 100644
--- a/cpp/include/IceUtil/Shared.h
+++ b/cpp/include/IceUtil/Shared.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_SHARED_H
diff --git a/cpp/include/IceUtil/StopWatch.h b/cpp/include/IceUtil/StopWatch.h
index 80632d8e2ac..e6e3f6ec841 100644
--- a/cpp/include/IceUtil/StopWatch.h
+++ b/cpp/include/IceUtil/StopWatch.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_STOPWATCH_H
diff --git a/cpp/include/IceUtil/StringConverter.h b/cpp/include/IceUtil/StringConverter.h
index 61b684cdba7..bb94b06e22b 100644
--- a/cpp/include/IceUtil/StringConverter.h
+++ b/cpp/include/IceUtil/StringConverter.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_STRING_CONVERTER_H
diff --git a/cpp/include/IceUtil/StringUtil.h b/cpp/include/IceUtil/StringUtil.h
index 31670780c7b..83307013fc8 100644
--- a/cpp/include/IceUtil/StringUtil.h
+++ b/cpp/include/IceUtil/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_UTIL_STRING_UTIL_H
diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h
index 2c675306dcc..847da352fd9 100644
--- a/cpp/include/IceUtil/Thread.h
+++ b/cpp/include/IceUtil/Thread.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_THREAD_H
diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h
index 5b196256154..316e672fe87 100644
--- a/cpp/include/IceUtil/ThreadException.h
+++ b/cpp/include/IceUtil/ThreadException.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_THREAD_EXCEPTION_H
diff --git a/cpp/include/IceUtil/Time.h b/cpp/include/IceUtil/Time.h
index c5119d46a04..e3b87489540 100644
--- a/cpp/include/IceUtil/Time.h
+++ b/cpp/include/IceUtil/Time.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_TIME_H
diff --git a/cpp/include/IceUtil/Timer.h b/cpp/include/IceUtil/Timer.h
index aece7a126f8..b258e2e2d50 100644
--- a/cpp/include/IceUtil/Timer.h
+++ b/cpp/include/IceUtil/Timer.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_TIMER_H
diff --git a/cpp/include/IceUtil/UUID.h b/cpp/include/IceUtil/UUID.h
index b9ba24a9ba9..51e6fb56437 100644
--- a/cpp/include/IceUtil/UUID.h
+++ b/cpp/include/IceUtil/UUID.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_UUID_H
diff --git a/cpp/include/IceUtil/UndefSysMacros.h b/cpp/include/IceUtil/UndefSysMacros.h
index c07f40dfa47..9d9b94857f7 100644
--- a/cpp/include/IceUtil/UndefSysMacros.h
+++ b/cpp/include/IceUtil/UndefSysMacros.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_UNDEF_SYS_MACROS_H