summaryrefslogtreecommitdiff
path: root/cpp/include
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/include')
-rw-r--r--cpp/include/Glacier2/Application.h4
-rw-r--r--cpp/include/Glacier2/Config.h4
-rw-r--r--cpp/include/Glacier2/Glacier2.h4
-rw-r--r--cpp/include/Glacier2/NullPermissionsVerifier.h4
-rw-r--r--cpp/include/Glacier2/SessionHelper.h4
-rw-r--r--cpp/include/Ice/Application.h4
-rw-r--r--cpp/include/Ice/AsyncResult.h4
-rw-r--r--cpp/include/Ice/AsyncResultF.h4
-rw-r--r--cpp/include/Ice/BatchRequestInterceptor.h4
-rw-r--r--cpp/include/Ice/BatchRequestQueueF.h4
-rw-r--r--cpp/include/Ice/Buffer.h4
-rw-r--r--cpp/include/Ice/CommunicatorAsync.h4
-rw-r--r--cpp/include/Ice/Comparable.h4
-rw-r--r--cpp/include/Ice/Config.h4
-rw-r--r--cpp/include/Ice/ConnectionAsync.h4
-rw-r--r--cpp/include/Ice/ConnectionIF.h4
-rw-r--r--cpp/include/Ice/ConsoleUtil.h4
-rw-r--r--cpp/include/Ice/DefaultValueFactory.h4
-rw-r--r--cpp/include/Ice/DispatchInterceptor.h4
-rw-r--r--cpp/include/Ice/Dispatcher.h4
-rw-r--r--cpp/include/Ice/DynamicLibrary.h4
-rw-r--r--cpp/include/Ice/DynamicLibraryF.h4
-rw-r--r--cpp/include/Ice/Exception.h4
-rw-r--r--cpp/include/Ice/ExceptionHelpers.h4
-rw-r--r--cpp/include/Ice/FactoryTable.h4
-rw-r--r--cpp/include/Ice/FactoryTableInit.h4
-rw-r--r--cpp/include/Ice/Format.h4
-rw-r--r--cpp/include/Ice/Functional.h4
-rw-r--r--cpp/include/Ice/GCObject.h4
-rw-r--r--cpp/include/Ice/Handle.h4
-rw-r--r--cpp/include/Ice/Ice.h4
-rw-r--r--cpp/include/Ice/IconvStringConverter.h4
-rw-r--r--cpp/include/Ice/Incoming.h4
-rw-r--r--cpp/include/Ice/IncomingAsync.h4
-rw-r--r--cpp/include/Ice/IncomingAsyncF.h4
-rw-r--r--cpp/include/Ice/Initialize.h4
-rw-r--r--cpp/include/Ice/InputStream.h4
-rw-r--r--cpp/include/Ice/InstanceF.h4
-rw-r--r--cpp/include/Ice/InterfaceByValue.h4
-rw-r--r--cpp/include/Ice/LocalObject.h4
-rw-r--r--cpp/include/Ice/LocalObjectF.h4
-rw-r--r--cpp/include/Ice/LoggerUtil.h4
-rw-r--r--cpp/include/Ice/MetricsAdminI.h4
-rw-r--r--cpp/include/Ice/MetricsFunctional.h4
-rw-r--r--cpp/include/Ice/MetricsObserverI.h4
-rw-r--r--cpp/include/Ice/NativePropertiesAdmin.h4
-rw-r--r--cpp/include/Ice/Object.h4
-rw-r--r--cpp/include/Ice/ObjectF.h4
-rw-r--r--cpp/include/Ice/ObserverHelper.h4
-rw-r--r--cpp/include/Ice/Optional.h4
-rw-r--r--cpp/include/Ice/OutgoingAsync.h4
-rw-r--r--cpp/include/Ice/OutgoingAsyncF.h4
-rw-r--r--cpp/include/Ice/OutputStream.h4
-rw-r--r--cpp/include/Ice/Protocol.h4
-rw-r--r--cpp/include/Ice/Proxy.h4
-rw-r--r--cpp/include/Ice/ProxyF.h4
-rw-r--r--cpp/include/Ice/ProxyFactoryF.h4
-rw-r--r--cpp/include/Ice/ProxyHandle.h4
-rw-r--r--cpp/include/Ice/ReferenceF.h4
-rw-r--r--cpp/include/Ice/RegisterPlugins.h4
-rw-r--r--cpp/include/Ice/RequestHandlerF.h4
-rw-r--r--cpp/include/Ice/ResponseHandlerF.h4
-rw-r--r--cpp/include/Ice/SHA1.h4
-rw-r--r--cpp/include/Ice/ServantManagerF.h4
-rw-r--r--cpp/include/Ice/Service.h4
-rw-r--r--cpp/include/Ice/SliceChecksums.h4
-rw-r--r--cpp/include/Ice/SlicedData.h4
-rw-r--r--cpp/include/Ice/SlicedDataF.h4
-rw-r--r--cpp/include/Ice/StreamHelpers.h4
-rw-r--r--cpp/include/Ice/StringConverter.h4
-rw-r--r--cpp/include/Ice/ThreadPoolF.h4
-rw-r--r--cpp/include/Ice/UUID.h4
-rw-r--r--cpp/include/Ice/UniquePtr.h4
-rw-r--r--cpp/include/Ice/UniqueRef.h4
-rw-r--r--cpp/include/Ice/UserExceptionFactory.h4
-rw-r--r--cpp/include/Ice/Value.h4
-rw-r--r--cpp/include/Ice/ValueF.h4
-rw-r--r--cpp/include/IceBT/IceBT.h4
-rw-r--r--cpp/include/IceBT/Makefile4
-rw-r--r--cpp/include/IceBT/Plugin.h4
-rw-r--r--cpp/include/IceBox/Config.h4
-rw-r--r--cpp/include/IceGrid/Config.h4
-rw-r--r--cpp/include/IceGrid/IceGrid.h4
-rw-r--r--cpp/include/IceGrid/ReplicaGroupFilter.h4
-rw-r--r--cpp/include/IceIAP/IceIAP.h4
-rw-r--r--cpp/include/IcePatch2/ClientUtil.h4
-rw-r--r--cpp/include/IcePatch2/Config.h4
-rw-r--r--cpp/include/IcePatch2/IcePatch2.h4
-rw-r--r--cpp/include/IceSSL/Config.h4
-rw-r--r--cpp/include/IceSSL/IceSSL.h4
-rw-r--r--cpp/include/IceSSL/OpenSSL.h4
-rw-r--r--cpp/include/IceSSL/Plugin.h4
-rw-r--r--cpp/include/IceSSL/SChannel.h4
-rw-r--r--cpp/include/IceSSL/SecureTransport.h4
-rw-r--r--cpp/include/IceSSL/UWP.h4
-rw-r--r--cpp/include/IceStorm/Config.h4
-rw-r--r--cpp/include/IceUtil/Atomic.h4
-rw-r--r--cpp/include/IceUtil/Cond.h4
-rw-r--r--cpp/include/IceUtil/Config.h4
-rw-r--r--cpp/include/IceUtil/ConsoleUtil.h4
-rw-r--r--cpp/include/IceUtil/CountDownLatch.h4
-rw-r--r--cpp/include/IceUtil/CtrlCHandler.h4
-rw-r--r--cpp/include/IceUtil/DisableWarnings.h4
-rw-r--r--cpp/include/IceUtil/Exception.h4
-rw-r--r--cpp/include/IceUtil/FileUtil.h4
-rw-r--r--cpp/include/IceUtil/Functional.h4
-rw-r--r--cpp/include/IceUtil/Handle.h4
-rw-r--r--cpp/include/IceUtil/IceUtil.h4
-rw-r--r--cpp/include/IceUtil/InputUtil.h4
-rw-r--r--cpp/include/IceUtil/Iterator.h4
-rw-r--r--cpp/include/IceUtil/Lock.h4
-rw-r--r--cpp/include/IceUtil/Monitor.h4
-rw-r--r--cpp/include/IceUtil/Mutex.h4
-rw-r--r--cpp/include/IceUtil/MutexProtocol.h4
-rw-r--r--cpp/include/IceUtil/MutexPtrLock.h4
-rw-r--r--cpp/include/IceUtil/MutexPtrTryLock.h4
-rw-r--r--cpp/include/IceUtil/Optional.h4
-rw-r--r--cpp/include/IceUtil/Options.h4
-rw-r--r--cpp/include/IceUtil/OutputUtil.h4
-rw-r--r--cpp/include/IceUtil/PopDisableWarnings.h4
-rw-r--r--cpp/include/IceUtil/PushDisableWarnings.h4
-rw-r--r--cpp/include/IceUtil/Random.h4
-rw-r--r--cpp/include/IceUtil/RecMutex.h4
-rw-r--r--cpp/include/IceUtil/ResourceConfig.h6
-rw-r--r--cpp/include/IceUtil/ScannerConfig.h4
-rw-r--r--cpp/include/IceUtil/ScopedArray.h4
-rw-r--r--cpp/include/IceUtil/Shared.h4
-rw-r--r--cpp/include/IceUtil/StopWatch.h4
-rw-r--r--cpp/include/IceUtil/StringConverter.h4
-rw-r--r--cpp/include/IceUtil/StringUtil.h4
-rw-r--r--cpp/include/IceUtil/Thread.h4
-rw-r--r--cpp/include/IceUtil/ThreadException.h4
-rw-r--r--cpp/include/IceUtil/Time.h4
-rw-r--r--cpp/include/IceUtil/Timer.h4
-rw-r--r--cpp/include/IceUtil/UUID.h4
-rw-r--r--cpp/include/IceUtil/UndefSysMacros.h4
136 files changed, 137 insertions, 409 deletions
diff --git a/cpp/include/Glacier2/Application.h b/cpp/include/Glacier2/Application.h
index 6f0b5e332f0..bd4927fc4c5 100644
--- a/cpp/include/Glacier2/Application.h
+++ b/cpp/include/Glacier2/Application.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GLACIER2_APPLICATION_H
#define GLACIER2_APPLICATION_H
diff --git a/cpp/include/Glacier2/Config.h b/cpp/include/Glacier2/Config.h
index 593bf34dfb0..6c8b422a3a9 100644
--- a/cpp/include/Glacier2/Config.h
+++ b/cpp/include/Glacier2/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GLACIER2_CONFIG_H
#define GLACIER2_CONFIG_H
diff --git a/cpp/include/Glacier2/Glacier2.h b/cpp/include/Glacier2/Glacier2.h
index b0f8b76e6e7..c6e10e1ac44 100644
--- a/cpp/include/Glacier2/Glacier2.h
+++ b/cpp/include/Glacier2/Glacier2.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GLACIER2_H
#define GLACIER2_H
diff --git a/cpp/include/Glacier2/NullPermissionsVerifier.h b/cpp/include/Glacier2/NullPermissionsVerifier.h
index d27b31f6a7f..7a26ebc2f7a 100644
--- a/cpp/include/Glacier2/NullPermissionsVerifier.h
+++ b/cpp/include/Glacier2/NullPermissionsVerifier.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GLACIER2_NULL_PERMISSIONS_VERIFIER_H
#define GLACIER2_NULL_PERMISSIONS_VERIFIER_H
diff --git a/cpp/include/Glacier2/SessionHelper.h b/cpp/include/Glacier2/SessionHelper.h
index 964117daf9f..2a68e663237 100644
--- a/cpp/include/Glacier2/SessionHelper.h
+++ b/cpp/include/Glacier2/SessionHelper.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GLACIER2_SESSION_HELPER_H
#define GLACIER2_SESSION_HELPER_H
diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h
index 891d87ef076..973b8728413 100644
--- a/cpp/include/Ice/Application.h
+++ b/cpp/include/Ice/Application.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_APPLICATION_H
#define ICE_APPLICATION_H
diff --git a/cpp/include/Ice/AsyncResult.h b/cpp/include/Ice/AsyncResult.h
index 4f63029fa4c..672ef1af7b8 100644
--- a/cpp/include/Ice/AsyncResult.h
+++ b/cpp/include/Ice/AsyncResult.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ASYNC_RESULT_H
#define ICE_ASYNC_RESULT_H
diff --git a/cpp/include/Ice/AsyncResultF.h b/cpp/include/Ice/AsyncResultF.h
index de8ad2663ca..79feb963464 100644
--- a/cpp/include/Ice/AsyncResultF.h
+++ b/cpp/include/Ice/AsyncResultF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ASYNC_RESULT_F_H
#define ICE_ASYNC_RESULT_F_H
diff --git a/cpp/include/Ice/BatchRequestInterceptor.h b/cpp/include/Ice/BatchRequestInterceptor.h
index 9b6191a398e..a65fbef8424 100644
--- a/cpp/include/Ice/BatchRequestInterceptor.h
+++ b/cpp/include/Ice/BatchRequestInterceptor.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BATCH_REQUEST_INTERCEPTOR_H
#define ICE_BATCH_REQUEST_INTERCEPTOR_H
diff --git a/cpp/include/Ice/BatchRequestQueueF.h b/cpp/include/Ice/BatchRequestQueueF.h
index bc060d79a05..fb91acff907 100644
--- a/cpp/include/Ice/BatchRequestQueueF.h
+++ b/cpp/include/Ice/BatchRequestQueueF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BATCH_REQUEST_QUEUE_F_H
#define ICE_BATCH_REQUEST_QUEUE_F_H
diff --git a/cpp/include/Ice/Buffer.h b/cpp/include/Ice/Buffer.h
index 6c6c61c74ef..5ac50dcf4f6 100644
--- a/cpp/include/Ice/Buffer.h
+++ b/cpp/include/Ice/Buffer.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BUFFER_H
#define ICE_BUFFER_H
diff --git a/cpp/include/Ice/CommunicatorAsync.h b/cpp/include/Ice/CommunicatorAsync.h
index 3f533d651e5..85cc9e78056 100644
--- a/cpp/include/Ice/CommunicatorAsync.h
+++ b/cpp/include/Ice/CommunicatorAsync.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_COMMUNICATOR_ASYNC_H
#define ICE_COMMUNICATOR_ASYNC_H
diff --git a/cpp/include/Ice/Comparable.h b/cpp/include/Ice/Comparable.h
index 7c2f5ad95da..de93991f346 100644
--- a/cpp/include/Ice/Comparable.h
+++ b/cpp/include/Ice/Comparable.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_COMPARABLE_H
#define ICE_COMPARABLE_H
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h
index 291bc05c294..10fe77f48d0 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONFIG_H
#define ICE_CONFIG_H
diff --git a/cpp/include/Ice/ConnectionAsync.h b/cpp/include/Ice/ConnectionAsync.h
index 8825b143446..7a62256f6ff 100644
--- a/cpp/include/Ice/ConnectionAsync.h
+++ b/cpp/include/Ice/ConnectionAsync.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECTION_ASYNC_H
#define ICE_CONNECTION_ASYNC_H
diff --git a/cpp/include/Ice/ConnectionIF.h b/cpp/include/Ice/ConnectionIF.h
index 659649948d7..ae1dd9c1a56 100644
--- a/cpp/include/Ice/ConnectionIF.h
+++ b/cpp/include/Ice/ConnectionIF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECTIONI_F_H
#define ICE_CONNECTIONI_F_H
diff --git a/cpp/include/Ice/ConsoleUtil.h b/cpp/include/Ice/ConsoleUtil.h
index 0854ff2b563..11d2bb542bc 100644
--- a/cpp/include/Ice/ConsoleUtil.h
+++ b/cpp/include/Ice/ConsoleUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONSOLE_UTIL_H
#define ICE_CONSOLE_UTIL_H
diff --git a/cpp/include/Ice/DefaultValueFactory.h b/cpp/include/Ice/DefaultValueFactory.h
index feb07731fcf..645e8f18940 100644
--- a/cpp/include/Ice/DefaultValueFactory.h
+++ b/cpp/include/Ice/DefaultValueFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_DEFAULT_VALUE_FACTORY_H
#define ICE_DEFAULT_VALUE_FACTORY_H
diff --git a/cpp/include/Ice/DispatchInterceptor.h b/cpp/include/Ice/DispatchInterceptor.h
index a0af296e99e..c436902af8f 100644
--- a/cpp/include/Ice/DispatchInterceptor.h
+++ b/cpp/include/Ice/DispatchInterceptor.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_DISPATCH_INTERCEPTOR_H
#define ICE_DISPATCH_INTERCEPTOR_H
diff --git a/cpp/include/Ice/Dispatcher.h b/cpp/include/Ice/Dispatcher.h
index 9ec33940275..46939d85532 100644
--- a/cpp/include/Ice/Dispatcher.h
+++ b/cpp/include/Ice/Dispatcher.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_DISPATCHER_H
#define ICE_DISPATCHER_H
diff --git a/cpp/include/Ice/DynamicLibrary.h b/cpp/include/Ice/DynamicLibrary.h
index b9a9205d5e7..ed092d4d315 100644
--- a/cpp/include/Ice/DynamicLibrary.h
+++ b/cpp/include/Ice/DynamicLibrary.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_DYNAMIC_LIBRARY_H
#define ICE_DYNAMIC_LIBRARY_H
diff --git a/cpp/include/Ice/DynamicLibraryF.h b/cpp/include/Ice/DynamicLibraryF.h
index f465efffc7c..e4628355e72 100644
--- a/cpp/include/Ice/DynamicLibraryF.h
+++ b/cpp/include/Ice/DynamicLibraryF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_DYNAMIC_LIBRARY_F_H
#define ICE_DYNAMIC_LIBRARY_F_H
diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h
index df3b1f6bc5a..64f5636c66c 100644
--- a/cpp/include/Ice/Exception.h
+++ b/cpp/include/Ice/Exception.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_EXCEPTION_H
#define ICE_EXCEPTION_H
diff --git a/cpp/include/Ice/ExceptionHelpers.h b/cpp/include/Ice/ExceptionHelpers.h
index 22d2d26c902..eb799ff298b 100644
--- a/cpp/include/Ice/ExceptionHelpers.h
+++ b/cpp/include/Ice/ExceptionHelpers.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_EXCEPTION_HELPERS_H
#define ICE_EXCEPTION_HELPERS_H
diff --git a/cpp/include/Ice/FactoryTable.h b/cpp/include/Ice/FactoryTable.h
index e0064be94c8..8da37f8f3fa 100644
--- a/cpp/include/Ice/FactoryTable.h
+++ b/cpp/include/Ice/FactoryTable.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_FACTORYTABLE_H
#define ICE_FACTORYTABLE_H
diff --git a/cpp/include/Ice/FactoryTableInit.h b/cpp/include/Ice/FactoryTableInit.h
index 60c751564ea..5c50d71b66f 100644
--- a/cpp/include/Ice/FactoryTableInit.h
+++ b/cpp/include/Ice/FactoryTableInit.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_FACTORYTABLEINIT_H
#define ICE_FACTORYTABLEINIT_H
diff --git a/cpp/include/Ice/Format.h b/cpp/include/Ice/Format.h
index ea0c203a02b..5cb76ec5345 100644
--- a/cpp/include/Ice/Format.h
+++ b/cpp/include/Ice/Format.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_FORMAT_H
#define ICE_FORMAT_H
diff --git a/cpp/include/Ice/Functional.h b/cpp/include/Ice/Functional.h
index b04bd48d418..e0fefa1c3f3 100644
--- a/cpp/include/Ice/Functional.h
+++ b/cpp/include/Ice/Functional.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_FUNCTIONAL_H
#define ICE_FUNCTIONAL_H
diff --git a/cpp/include/Ice/GCObject.h b/cpp/include/Ice/GCObject.h
index 19242ea25ad..d08f680b31d 100644
--- a/cpp/include/Ice/GCObject.h
+++ b/cpp/include/Ice/GCObject.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GC_OBJECT_H
#define ICE_GC_OBJECT_H
diff --git a/cpp/include/Ice/Handle.h b/cpp/include/Ice/Handle.h
index db3cbb95929..8455518e188 100644
--- a/cpp/include/Ice/Handle.h
+++ b/cpp/include/Ice/Handle.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_HANDLE_H
#define ICE_HANDLE_H
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index c2ad572ea8f..0a4d4d3c3d2 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ICE_H
#define ICE_ICE_H
diff --git a/cpp/include/Ice/IconvStringConverter.h b/cpp/include/Ice/IconvStringConverter.h
index 634fba965a2..81aaf544f2e 100644
--- a/cpp/include/Ice/IconvStringConverter.h
+++ b/cpp/include/Ice/IconvStringConverter.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ICONV_STRING_CONVERTER
#define ICE_ICONV_STRING_CONVERTER
diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h
index e378650a65d..e7e78d6993c 100644
--- a/cpp/include/Ice/Incoming.h
+++ b/cpp/include/Ice/Incoming.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INCOMING_H
#define ICE_INCOMING_H
diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h
index 746b11afb84..451cc139ea5 100644
--- a/cpp/include/Ice/IncomingAsync.h
+++ b/cpp/include/Ice/IncomingAsync.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INCOMING_ASYNC_H
#define ICE_INCOMING_ASYNC_H
diff --git a/cpp/include/Ice/IncomingAsyncF.h b/cpp/include/Ice/IncomingAsyncF.h
index 8f4a257d71a..269ab7728d1 100644
--- a/cpp/include/Ice/IncomingAsyncF.h
+++ b/cpp/include/Ice/IncomingAsyncF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INCOMING_ASYNC_F_H
#define ICE_INCOMING_ASYNC_F_H
diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h
index 3df5d289d09..3629cde00ba 100644
--- a/cpp/include/Ice/Initialize.h
+++ b/cpp/include/Ice/Initialize.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INITIALIZE_H
#define ICE_INITIALIZE_H
diff --git a/cpp/include/Ice/InputStream.h b/cpp/include/Ice/InputStream.h
index decd266abe8..c9ffe9c20b0 100644
--- a/cpp/include/Ice/InputStream.h
+++ b/cpp/include/Ice/InputStream.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INPUT_STREAM_H
#define ICE_INPUT_STREAM_H
diff --git a/cpp/include/Ice/InstanceF.h b/cpp/include/Ice/InstanceF.h
index 69bfaf2f786..bf5a48f9554 100644
--- a/cpp/include/Ice/InstanceF.h
+++ b/cpp/include/Ice/InstanceF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INSTANCE_F_H
#define ICE_INSTANCE_F_H
diff --git a/cpp/include/Ice/InterfaceByValue.h b/cpp/include/Ice/InterfaceByValue.h
index 77c45e21246..56901a625ac 100644
--- a/cpp/include/Ice/InterfaceByValue.h
+++ b/cpp/include/Ice/InterfaceByValue.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INTERFACE_BY_VALUE_H
#define ICE_INTERFACE_BY_VALUE_H
diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h
index 5f6616ddcfe..75d03dabe07 100644
--- a/cpp/include/Ice/LocalObject.h
+++ b/cpp/include/Ice/LocalObject.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_LOCAL_OBJECT_H
#define ICE_LOCAL_OBJECT_H
diff --git a/cpp/include/Ice/LocalObjectF.h b/cpp/include/Ice/LocalObjectF.h
index 8086d0c8e52..8037a06695e 100644
--- a/cpp/include/Ice/LocalObjectF.h
+++ b/cpp/include/Ice/LocalObjectF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_LOCAL_OBJECT_F_H
#define ICE_LOCAL_OBJECT_F_H
diff --git a/cpp/include/Ice/LoggerUtil.h b/cpp/include/Ice/LoggerUtil.h
index 901f2ec7f27..8696a75562a 100644
--- a/cpp/include/Ice/LoggerUtil.h
+++ b/cpp/include/Ice/LoggerUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_LOGGER_UTIL_H
#define ICE_LOGGER_UTIL_H
diff --git a/cpp/include/Ice/MetricsAdminI.h b/cpp/include/Ice/MetricsAdminI.h
index 51a9965cf1c..d4c0585effd 100644
--- a/cpp/include/Ice/MetricsAdminI.h
+++ b/cpp/include/Ice/MetricsAdminI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_METRICSADMIN_I_H
#define ICE_METRICSADMIN_I_H
diff --git a/cpp/include/Ice/MetricsFunctional.h b/cpp/include/Ice/MetricsFunctional.h
index 32207cd26ad..3d4dc819dff 100644
--- a/cpp/include/Ice/MetricsFunctional.h
+++ b/cpp/include/Ice/MetricsFunctional.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_METRICSFUNCTIONAL_H
#define ICE_METRICSFUNCTIONAL_H
diff --git a/cpp/include/Ice/MetricsObserverI.h b/cpp/include/Ice/MetricsObserverI.h
index d064695c20b..d2a3eea8a80 100644
--- a/cpp/include/Ice/MetricsObserverI.h
+++ b/cpp/include/Ice/MetricsObserverI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEMX_METRICSOBSERVER_I_H
#define ICEMX_METRICSOBSERVER_I_H
diff --git a/cpp/include/Ice/NativePropertiesAdmin.h b/cpp/include/Ice/NativePropertiesAdmin.h
index 591f8b30b27..849a0a35703 100644
--- a/cpp/include/Ice/NativePropertiesAdmin.h
+++ b/cpp/include/Ice/NativePropertiesAdmin.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROPERTIES_ADMIN_H
#define ICE_PROPERTIES_ADMIN_H
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h
index 925908ddce4..f6a8bebb77c 100644
--- a/cpp/include/Ice/Object.h
+++ b/cpp/include/Ice/Object.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_OBJECT_H
#define ICE_OBJECT_H
diff --git a/cpp/include/Ice/ObjectF.h b/cpp/include/Ice/ObjectF.h
index 2118e5242a2..980df752fcd 100644
--- a/cpp/include/Ice/ObjectF.h
+++ b/cpp/include/Ice/ObjectF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_OBJECT_F_H
#define ICE_OBJECT_F_H
diff --git a/cpp/include/Ice/ObserverHelper.h b/cpp/include/Ice/ObserverHelper.h
index 930b81f4a85..7a4919f3e9b 100644
--- a/cpp/include/Ice/ObserverHelper.h
+++ b/cpp/include/Ice/ObserverHelper.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_OBSERVERHELPER_H
#define ICE_OBSERVERHELPER_H
diff --git a/cpp/include/Ice/Optional.h b/cpp/include/Ice/Optional.h
index 5b329c17610..083faeaa9f0 100644
--- a/cpp/include/Ice/Optional.h
+++ b/cpp/include/Ice/Optional.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
//
// Ice::optional is a placeholder for std::optional:
diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
index 725cede24b7..aebb165a11d 100644
--- a/cpp/include/Ice/OutgoingAsync.h
+++ b/cpp/include/Ice/OutgoingAsync.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_OUTGOING_ASYNC_H
#define ICE_OUTGOING_ASYNC_H
diff --git a/cpp/include/Ice/OutgoingAsyncF.h b/cpp/include/Ice/OutgoingAsyncF.h
index bc6ee2eaa3d..86885db1214 100644
--- a/cpp/include/Ice/OutgoingAsyncF.h
+++ b/cpp/include/Ice/OutgoingAsyncF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_OUTGOING_ASYNC_F_H
#define ICE_OUTGOING_ASYNC_F_H
diff --git a/cpp/include/Ice/OutputStream.h b/cpp/include/Ice/OutputStream.h
index 4aeec5ab31a..4d119a850e4 100644
--- a/cpp/include/Ice/OutputStream.h
+++ b/cpp/include/Ice/OutputStream.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_OUTPUT_STREAM_H
#define ICE_OUTPUT_STREAM_H
diff --git a/cpp/include/Ice/Protocol.h b/cpp/include/Ice/Protocol.h
index a4026a9557f..6aef6ae0668 100644
--- a/cpp/include/Ice/Protocol.h
+++ b/cpp/include/Ice/Protocol.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROTOCOL_H
#define ICE_PROTOCOL_H
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index 3bbd25fe25f..c52ca6a59cb 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROXY_H
#define ICE_PROXY_H
diff --git a/cpp/include/Ice/ProxyF.h b/cpp/include/Ice/ProxyF.h
index d14735a3567..63bcebbe57b 100644
--- a/cpp/include/Ice/ProxyF.h
+++ b/cpp/include/Ice/ProxyF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROXY_F_H
#define ICE_PROXY_F_H
diff --git a/cpp/include/Ice/ProxyFactoryF.h b/cpp/include/Ice/ProxyFactoryF.h
index ffa016cc1f4..7e62e6b7114 100644
--- a/cpp/include/Ice/ProxyFactoryF.h
+++ b/cpp/include/Ice/ProxyFactoryF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROXY_FACTORY_F_H
#define ICE_PROXY_FACTORY_F_H
diff --git a/cpp/include/Ice/ProxyHandle.h b/cpp/include/Ice/ProxyHandle.h
index 27480dfb09a..21eb55ee578 100644
--- a/cpp/include/Ice/ProxyHandle.h
+++ b/cpp/include/Ice/ProxyHandle.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROXY_HANDLE_H
#define ICE_PROXY_HANDLE_H
diff --git a/cpp/include/Ice/ReferenceF.h b/cpp/include/Ice/ReferenceF.h
index b9f3f0c1f03..97d5cc4d69f 100644
--- a/cpp/include/Ice/ReferenceF.h
+++ b/cpp/include/Ice/ReferenceF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REFERENCE_F_H
#define ICE_REFERENCE_F_H
diff --git a/cpp/include/Ice/RegisterPlugins.h b/cpp/include/Ice/RegisterPlugins.h
index e2900f5951f..ee2545ee448 100644
--- a/cpp/include/Ice/RegisterPlugins.h
+++ b/cpp/include/Ice/RegisterPlugins.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REGISTER_PLUGINS_H
#define ICE_REGISTER_PLUGINS_H
diff --git a/cpp/include/Ice/RequestHandlerF.h b/cpp/include/Ice/RequestHandlerF.h
index ab401191b8b..325f304ab83 100644
--- a/cpp/include/Ice/RequestHandlerF.h
+++ b/cpp/include/Ice/RequestHandlerF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REQUEST_HANDLER_F_H
#define ICE_REQUEST_HANDLER_F_H
diff --git a/cpp/include/Ice/ResponseHandlerF.h b/cpp/include/Ice/ResponseHandlerF.h
index 593aa95e716..53e86505b35 100644
--- a/cpp/include/Ice/ResponseHandlerF.h
+++ b/cpp/include/Ice/ResponseHandlerF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_RESPONSE_HANDLER_F_H
#define ICE_RESPONSE_HANDLER_F_H
diff --git a/cpp/include/Ice/SHA1.h b/cpp/include/Ice/SHA1.h
index e70db769f22..526d8a64d64 100644
--- a/cpp/include/Ice/SHA1.h
+++ b/cpp/include/Ice/SHA1.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SHA1_H
#define ICE_SHA1_H
diff --git a/cpp/include/Ice/ServantManagerF.h b/cpp/include/Ice/ServantManagerF.h
index c43b9afb7e1..0892c000aad 100644
--- a/cpp/include/Ice/ServantManagerF.h
+++ b/cpp/include/Ice/ServantManagerF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SERVANT_MANAGER_F_H
#define ICE_SERVANT_MANAGER_F_H
diff --git a/cpp/include/Ice/Service.h b/cpp/include/Ice/Service.h
index 3a21de4c84b..6a1a1c93789 100644
--- a/cpp/include/Ice/Service.h
+++ b/cpp/include/Ice/Service.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SERVICE_H
#define ICE_SERVICE_H
diff --git a/cpp/include/Ice/SliceChecksums.h b/cpp/include/Ice/SliceChecksums.h
index dfb23ff90bc..1f6a43341b0 100644
--- a/cpp/include/Ice/SliceChecksums.h
+++ b/cpp/include/Ice/SliceChecksums.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SLICE_CHECKSUM_H
#define ICE_SLICE_CHECKSUM_H
diff --git a/cpp/include/Ice/SlicedData.h b/cpp/include/Ice/SlicedData.h
index 0de33978e7a..ee57acb34bf 100644
--- a/cpp/include/Ice/SlicedData.h
+++ b/cpp/include/Ice/SlicedData.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SLICED_DATA_H
#define ICE_SLICED_DATA_H
diff --git a/cpp/include/Ice/SlicedDataF.h b/cpp/include/Ice/SlicedDataF.h
index ba506a2a7a6..83842a02508 100644
--- a/cpp/include/Ice/SlicedDataF.h
+++ b/cpp/include/Ice/SlicedDataF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SLICED_DATA_F_H
#define ICE_SLICED_DATA_F_H
diff --git a/cpp/include/Ice/StreamHelpers.h b/cpp/include/Ice/StreamHelpers.h
index 40ddbfcdbb4..5c5fd267e02 100644
--- a/cpp/include/Ice/StreamHelpers.h
+++ b/cpp/include/Ice/StreamHelpers.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STREAM_HELPERS_H
#define ICE_STREAM_HELPERS_H
diff --git a/cpp/include/Ice/StringConverter.h b/cpp/include/Ice/StringConverter.h
index f98ee2561be..025063c845f 100644
--- a/cpp/include/Ice/StringConverter.h
+++ b/cpp/include/Ice/StringConverter.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STRING_CONVERTER_H
#define ICE_STRING_CONVERTER_H
diff --git a/cpp/include/Ice/ThreadPoolF.h b/cpp/include/Ice/ThreadPoolF.h
index 575b7da5d11..29db5dbf5f6 100644
--- a/cpp/include/Ice/ThreadPoolF.h
+++ b/cpp/include/Ice/ThreadPoolF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_THREAD_POOL_F_H
#define ICE_THREAD_POOL_F_H
diff --git a/cpp/include/Ice/UUID.h b/cpp/include/Ice/UUID.h
index 36084a36caf..5a036e4a3ac 100644
--- a/cpp/include/Ice/UUID.h
+++ b/cpp/include/Ice/UUID.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UUID_H
#define ICE_UUID_H
diff --git a/cpp/include/Ice/UniquePtr.h b/cpp/include/Ice/UniquePtr.h
index 1400a6f71c8..c1ba3e5ee73 100644
--- a/cpp/include/Ice/UniquePtr.h
+++ b/cpp/include/Ice/UniquePtr.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UNIQUE_PTR_H
#define ICE_UNIQUE_PTR_H
diff --git a/cpp/include/Ice/UniqueRef.h b/cpp/include/Ice/UniqueRef.h
index 5be41e39955..b506cf99b32 100644
--- a/cpp/include/Ice/UniqueRef.h
+++ b/cpp/include/Ice/UniqueRef.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UNIQUE_REF_H
#define ICE_UNIQUE_REF_H
diff --git a/cpp/include/Ice/UserExceptionFactory.h b/cpp/include/Ice/UserExceptionFactory.h
index e1c7139188e..61feafb42a9 100644
--- a/cpp/include/Ice/UserExceptionFactory.h
+++ b/cpp/include/Ice/UserExceptionFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_USER_EXCEPTION_FACTORY_H
#define ICE_USER_EXCEPTION_FACTORY_H
diff --git a/cpp/include/Ice/Value.h b/cpp/include/Ice/Value.h
index c5c021a457b..f5033d1fc9f 100644
--- a/cpp/include/Ice/Value.h
+++ b/cpp/include/Ice/Value.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_VALUE_H
#define ICE_VALUE_H
diff --git a/cpp/include/Ice/ValueF.h b/cpp/include/Ice/ValueF.h
index f5aa31adfb3..414be673592 100644
--- a/cpp/include/Ice/ValueF.h
+++ b/cpp/include/Ice/ValueF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_VALUE_F_H
#define ICE_VALUE_F_H
diff --git a/cpp/include/IceBT/IceBT.h b/cpp/include/IceBT/IceBT.h
index 8fb4a393805..68a6bfa5e3b 100644
--- a/cpp/include/IceBT/IceBT.h
+++ b/cpp/include/IceBT/IceBT.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_ICE_BT_H
#define ICE_BT_ICE_BT_H
diff --git a/cpp/include/IceBT/Makefile b/cpp/include/IceBT/Makefile
index 68465fe71c9..820453ffb8d 100644
--- a/cpp/include/IceBT/Makefile
+++ b/cpp/include/IceBT/Makefile
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
top_srcdir = ../..
diff --git a/cpp/include/IceBT/Plugin.h b/cpp/include/IceBT/Plugin.h
index 9b80afa7ef2..eed2e876927 100644
--- a/cpp/include/IceBT/Plugin.h
+++ b/cpp/include/IceBT/Plugin.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_PLUGIN_H
#define ICE_BT_PLUGIN_H
diff --git a/cpp/include/IceBox/Config.h b/cpp/include/IceBox/Config.h
index 91daa406d4f..b0ba82174f2 100644
--- a/cpp/include/IceBox/Config.h
+++ b/cpp/include/IceBox/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEBOX_CONFIG_H
#define ICEBOX_CONFIG_H
diff --git a/cpp/include/IceGrid/Config.h b/cpp/include/IceGrid/Config.h
index 2c0b7de71f1..c17a7ec9870 100644
--- a/cpp/include/IceGrid/Config.h
+++ b/cpp/include/IceGrid/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_CONFIG_H
#define ICE_GRID_CONFIG_H
diff --git a/cpp/include/IceGrid/IceGrid.h b/cpp/include/IceGrid/IceGrid.h
index 216ba10167e..9221e1bc892 100644
--- a/cpp/include/IceGrid/IceGrid.h
+++ b/cpp/include/IceGrid/IceGrid.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_H
#define ICEGRID_H
diff --git a/cpp/include/IceGrid/ReplicaGroupFilter.h b/cpp/include/IceGrid/ReplicaGroupFilter.h
index 4e093421224..6b78c81fe02 100644
--- a/cpp/include/IceGrid/ReplicaGroupFilter.h
+++ b/cpp/include/IceGrid/ReplicaGroupFilter.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_H
#define ICEGRID_H
diff --git a/cpp/include/IceIAP/IceIAP.h b/cpp/include/IceIAP/IceIAP.h
index 34e730607a1..5d4bdd20ac4 100644
--- a/cpp/include/IceIAP/IceIAP.h
+++ b/cpp/include/IceIAP/IceIAP.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_IAP_ICE_IAP_H
#define ICE_IAP_ICE_IAP_H
diff --git a/cpp/include/IcePatch2/ClientUtil.h b/cpp/include/IcePatch2/ClientUtil.h
index b569e5d4385..c733e867d08 100644
--- a/cpp/include/IcePatch2/ClientUtil.h
+++ b/cpp/include/IcePatch2/ClientUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PATCH2_CLIENT_UTIL_H
#define ICE_PATCH2_CLIENT_UTIL_H
diff --git a/cpp/include/IcePatch2/Config.h b/cpp/include/IcePatch2/Config.h
index 91fd1f02387..f123e2d246b 100644
--- a/cpp/include/IcePatch2/Config.h
+++ b/cpp/include/IcePatch2/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PATCH2_CONFIG_H
#define ICE_PATCH2_CONFIG_H
diff --git a/cpp/include/IcePatch2/IcePatch2.h b/cpp/include/IcePatch2/IcePatch2.h
index c0efdc9637f..1b19ebf0482 100644
--- a/cpp/include/IcePatch2/IcePatch2.h
+++ b/cpp/include/IcePatch2/IcePatch2.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IcePatch2/Config.h>
#include <IcePatch2/FileInfo.h>
diff --git a/cpp/include/IceSSL/Config.h b/cpp/include/IceSSL/Config.h
index fa452f2db37..d251dfaf4b2 100644
--- a/cpp/include/IceSSL/Config.h
+++ b/cpp/include/IceSSL/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_CONFIG_H
#define ICESSL_CONFIG_H
diff --git a/cpp/include/IceSSL/IceSSL.h b/cpp/include/IceSSL/IceSSL.h
index b6456dc839a..b5e01a9814f 100644
--- a/cpp/include/IceSSL/IceSSL.h
+++ b/cpp/include/IceSSL/IceSSL.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_ICESSL_H
#define ICESSL_ICESSL_H
diff --git a/cpp/include/IceSSL/OpenSSL.h b/cpp/include/IceSSL/OpenSSL.h
index 22b43f47f42..54647d1a718 100644
--- a/cpp/include/IceSSL/OpenSSL.h
+++ b/cpp/include/IceSSL/OpenSSL.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_OPENSSL_H
#define ICESSL_OPENSSL_H
diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h
index 4a745d2e35c..2958200d15c 100644
--- a/cpp/include/IceSSL/Plugin.h
+++ b/cpp/include/IceSSL/Plugin.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_PLUGIN_H
#define ICESSL_PLUGIN_H
diff --git a/cpp/include/IceSSL/SChannel.h b/cpp/include/IceSSL/SChannel.h
index 29d25cab30c..c021484593c 100644
--- a/cpp/include/IceSSL/SChannel.h
+++ b/cpp/include/IceSSL/SChannel.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_SCHANNEL_H
#define ICESSL_SCHANNEL_H
diff --git a/cpp/include/IceSSL/SecureTransport.h b/cpp/include/IceSSL/SecureTransport.h
index ca9b234353c..eae04a9090a 100644
--- a/cpp/include/IceSSL/SecureTransport.h
+++ b/cpp/include/IceSSL/SecureTransport.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_H
#define ICESSL_SECURE_TRANSPORT_H
diff --git a/cpp/include/IceSSL/UWP.h b/cpp/include/IceSSL/UWP.h
index 6f687293543..8e4eac86622 100644
--- a/cpp/include/IceSSL/UWP.h
+++ b/cpp/include/IceSSL/UWP.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_UWP_H
#define ICESSL_UWP_H
diff --git a/cpp/include/IceStorm/Config.h b/cpp/include/IceStorm/Config.h
index b92a40da748..0bac5fc0514 100644
--- a/cpp/include/IceStorm/Config.h
+++ b/cpp/include/IceStorm/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STORM_CONFIG_H
#define ICE_STORM_CONFIG_H
diff --git a/cpp/include/IceUtil/Atomic.h b/cpp/include/IceUtil/Atomic.h
index 3492bd56e3e..1530162517e 100644
--- a/cpp/include/IceUtil/Atomic.h
+++ b/cpp/include/IceUtil/Atomic.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_ATOMIC_H
#define ICE_UTIL_ATOMIC_H
diff --git a/cpp/include/IceUtil/Cond.h b/cpp/include/IceUtil/Cond.h
index 19b561435c4..eca7512d0a2 100644
--- a/cpp/include/IceUtil/Cond.h
+++ b/cpp/include/IceUtil/Cond.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_COND_H
#define ICE_UTIL_COND_H
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index 66d8c6ac257..03558aad620 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_CONFIG_H
#define ICE_UTIL_CONFIG_H
diff --git a/cpp/include/IceUtil/ConsoleUtil.h b/cpp/include/IceUtil/ConsoleUtil.h
index 03c60c429b3..0083c7a9075 100644
--- a/cpp/include/IceUtil/ConsoleUtil.h
+++ b/cpp/include/IceUtil/ConsoleUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_CONSOLE_UTIL_H
#define ICE_UTIL_CONSOLE_UTIL_H
diff --git a/cpp/include/IceUtil/CountDownLatch.h b/cpp/include/IceUtil/CountDownLatch.h
index a319b7969a5..7622df6ca6b 100644
--- a/cpp/include/IceUtil/CountDownLatch.h
+++ b/cpp/include/IceUtil/CountDownLatch.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_COUNT_DOWN_LATCH_H
#define ICE_UTIL_COUNT_DOWN_LATCH_H
diff --git a/cpp/include/IceUtil/CtrlCHandler.h b/cpp/include/IceUtil/CtrlCHandler.h
index 6792d182117..079306831a4 100644
--- a/cpp/include/IceUtil/CtrlCHandler.h
+++ b/cpp/include/IceUtil/CtrlCHandler.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_CTRL_C_HANDLER_H
#define ICE_UTIL_CTRL_C_HANDLER_H
diff --git a/cpp/include/IceUtil/DisableWarnings.h b/cpp/include/IceUtil/DisableWarnings.h
index 8d1576cbfc3..e12ac380a4d 100644
--- a/cpp/include/IceUtil/DisableWarnings.h
+++ b/cpp/include/IceUtil/DisableWarnings.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_DISABLEWARNINGS_H
#define ICE_UTIL_DISABLEWARNINGS_H
diff --git a/cpp/include/IceUtil/Exception.h b/cpp/include/IceUtil/Exception.h
index 84ce16bbace..249dd05701e 100644
--- a/cpp/include/IceUtil/Exception.h
+++ b/cpp/include/IceUtil/Exception.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_EXCEPTION_H
#define ICE_UTIL_EXCEPTION_H
diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h
index 8f76a91b529..42a8a64f943 100644
--- a/cpp/include/IceUtil/FileUtil.h
+++ b/cpp/include/IceUtil/FileUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_FILE_UTIL_H
#define ICE_FILE_UTIL_H
diff --git a/cpp/include/IceUtil/Functional.h b/cpp/include/IceUtil/Functional.h
index 2c8d8871b7d..da05997889b 100644
--- a/cpp/include/IceUtil/Functional.h
+++ b/cpp/include/IceUtil/Functional.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_FUNCTIONAL_H
#define ICE_UTIL_FUNCTIONAL_H
diff --git a/cpp/include/IceUtil/Handle.h b/cpp/include/IceUtil/Handle.h
index c203fbd3774..57bd499a8ce 100644
--- a/cpp/include/IceUtil/Handle.h
+++ b/cpp/include/IceUtil/Handle.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_HANDLE_H
#define ICE_UTIL_HANDLE_H
diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h
index 6d0a162168c..8ed206929c9 100644
--- a/cpp/include/IceUtil/IceUtil.h
+++ b/cpp/include/IceUtil/IceUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_ICE_UTIL_H
#define ICE_UTIL_ICE_UTIL_H
diff --git a/cpp/include/IceUtil/InputUtil.h b/cpp/include/IceUtil/InputUtil.h
index 225017674b8..7b808757295 100644
--- a/cpp/include/IceUtil/InputUtil.h
+++ b/cpp/include/IceUtil/InputUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_INPUT_UTIL_H
#define ICE_UTIL_INPUT_UTIL_H
diff --git a/cpp/include/IceUtil/Iterator.h b/cpp/include/IceUtil/Iterator.h
index c9afa342f74..948305ba318 100644
--- a/cpp/include/IceUtil/Iterator.h
+++ b/cpp/include/IceUtil/Iterator.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_ITERATOR_H
#define ICE_UTIL_ITERATOR_H
diff --git a/cpp/include/IceUtil/Lock.h b/cpp/include/IceUtil/Lock.h
index 5faa4d32059..ad713e349a0 100644
--- a/cpp/include/IceUtil/Lock.h
+++ b/cpp/include/IceUtil/Lock.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_LOCK_H
#define ICE_UTIL_LOCK_H
diff --git a/cpp/include/IceUtil/Monitor.h b/cpp/include/IceUtil/Monitor.h
index cd08fb281d4..9e8cc8f0140 100644
--- a/cpp/include/IceUtil/Monitor.h
+++ b/cpp/include/IceUtil/Monitor.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_MONITOR_H
#define ICE_UTIL_MONITOR_H
diff --git a/cpp/include/IceUtil/Mutex.h b/cpp/include/IceUtil/Mutex.h
index 7a13df276b7..5060b1a0fdd 100644
--- a/cpp/include/IceUtil/Mutex.h
+++ b/cpp/include/IceUtil/Mutex.h
@@ -1,9 +1,7 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_MUTEX_H
#define ICE_UTIL_MUTEX_H
diff --git a/cpp/include/IceUtil/MutexProtocol.h b/cpp/include/IceUtil/MutexProtocol.h
index 9f998272adc..4a0295c944d 100644
--- a/cpp/include/IceUtil/MutexProtocol.h
+++ b/cpp/include/IceUtil/MutexProtocol.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_MUTEX_PROTOCOL_H
#define ICE_UTIL_MUTEX_PROTOCOL_H
diff --git a/cpp/include/IceUtil/MutexPtrLock.h b/cpp/include/IceUtil/MutexPtrLock.h
index 8930d80605d..83e5497545c 100644
--- a/cpp/include/IceUtil/MutexPtrLock.h
+++ b/cpp/include/IceUtil/MutexPtrLock.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_MUTEX_PTR_LOCK_H
#define ICE_UTIL_MUTEX_PTR_LOCK_H
diff --git a/cpp/include/IceUtil/MutexPtrTryLock.h b/cpp/include/IceUtil/MutexPtrTryLock.h
index 4cf76045e6d..66f313fee9b 100644
--- a/cpp/include/IceUtil/MutexPtrTryLock.h
+++ b/cpp/include/IceUtil/MutexPtrTryLock.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_MUTEX_PTR_TRY_LOCK_H
#define ICE_UTIL_MUTEX_PTR_TRY_LOCK_H
diff --git a/cpp/include/IceUtil/Optional.h b/cpp/include/IceUtil/Optional.h
index 6e6206e6ec1..a4266aeeb6c 100644
--- a/cpp/include/IceUtil/Optional.h
+++ b/cpp/include/IceUtil/Optional.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_OPTIONAL_H
#define ICE_UTIL_OPTIONAL_H
diff --git a/cpp/include/IceUtil/Options.h b/cpp/include/IceUtil/Options.h
index 9d06e969f22..6b9d7a5f669 100644
--- a/cpp/include/IceUtil/Options.h
+++ b/cpp/include/IceUtil/Options.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_OPTIONS_H
#define ICE_UTIL_OPTIONS_H
diff --git a/cpp/include/IceUtil/OutputUtil.h b/cpp/include/IceUtil/OutputUtil.h
index e1e34b5628e..4a712643473 100644
--- a/cpp/include/IceUtil/OutputUtil.h
+++ b/cpp/include/IceUtil/OutputUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_OUTPUT_UTIL_H
#define ICE_UTIL_OUTPUT_UTIL_H
diff --git a/cpp/include/IceUtil/PopDisableWarnings.h b/cpp/include/IceUtil/PopDisableWarnings.h
index 726e972bb33..317bbc87164 100644
--- a/cpp/include/IceUtil/PopDisableWarnings.h
+++ b/cpp/include/IceUtil/PopDisableWarnings.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
// No pragma once as this file can be included several times in a translation
// unit
diff --git a/cpp/include/IceUtil/PushDisableWarnings.h b/cpp/include/IceUtil/PushDisableWarnings.h
index a2b6f5b1bee..40aae0668d9 100644
--- a/cpp/include/IceUtil/PushDisableWarnings.h
+++ b/cpp/include/IceUtil/PushDisableWarnings.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
// No pragma once as this file can be included several times in a translation
// unit
diff --git a/cpp/include/IceUtil/Random.h b/cpp/include/IceUtil/Random.h
index ef144e2f7e1..ac946927648 100644
--- a/cpp/include/IceUtil/Random.h
+++ b/cpp/include/IceUtil/Random.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_RANDOM_H
#define ICE_UTIL_RANDOM_H
diff --git a/cpp/include/IceUtil/RecMutex.h b/cpp/include/IceUtil/RecMutex.h
index 95126a0aba0..a0d094362db 100644
--- a/cpp/include/IceUtil/RecMutex.h
+++ b/cpp/include/IceUtil/RecMutex.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_RMUTEX_H
#define ICE_UTIL_RMUTEX_H
diff --git a/cpp/include/IceUtil/ResourceConfig.h b/cpp/include/IceUtil/ResourceConfig.h
index e93e2e0f47b..4bf0c68d158 100644
--- a/cpp/include/IceUtil/ResourceConfig.h
+++ b/cpp/include/IceUtil/ResourceConfig.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_RESOURCE_CONFIG_H
#define ICE_UTIL_RESOURCE_CONFIG_H
@@ -13,7 +11,7 @@
#define ICE_STRING_VERSION "3.7.2\0"
#define ICE_SO_VERSION "37\0"
#define ICE_COMPANY_NAME "ZeroC, Inc.\0"
-#define ICE_COPYRIGHT "\251 2003-present ZeroC, Inc.\0"
+#define ICE_COPYRIGHT "\251 ZeroC, Inc.\0"
#define ICE_PRODUCT_NAME "Ice\0"
#ifdef ICE_CPP11_MAPPING
diff --git a/cpp/include/IceUtil/ScannerConfig.h b/cpp/include/IceUtil/ScannerConfig.h
index 26fc3949642..2a94a677ab9 100644
--- a/cpp/include/IceUtil/ScannerConfig.h
+++ b/cpp/include/IceUtil/ScannerConfig.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_SCANNER_CONFIG_H
#define ICE_UTIL_SCANNER_CONFIG_H
diff --git a/cpp/include/IceUtil/ScopedArray.h b/cpp/include/IceUtil/ScopedArray.h
index 8040019ecb1..6ccfce63c06 100644
--- a/cpp/include/IceUtil/ScopedArray.h
+++ b/cpp/include/IceUtil/ScopedArray.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_SCOPED_ARRAY_H
#define ICE_UTIL_SCOPED_ARRAY_H
diff --git a/cpp/include/IceUtil/Shared.h b/cpp/include/IceUtil/Shared.h
index 900a59fccfc..67272f157d5 100644
--- a/cpp/include/IceUtil/Shared.h
+++ b/cpp/include/IceUtil/Shared.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_SHARED_H
#define ICE_UTIL_SHARED_H
diff --git a/cpp/include/IceUtil/StopWatch.h b/cpp/include/IceUtil/StopWatch.h
index e6e3f6ec841..f8b9aab5fd5 100644
--- a/cpp/include/IceUtil/StopWatch.h
+++ b/cpp/include/IceUtil/StopWatch.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_STOPWATCH_H
#define ICE_UTIL_STOPWATCH_H
diff --git a/cpp/include/IceUtil/StringConverter.h b/cpp/include/IceUtil/StringConverter.h
index bb94b06e22b..ff01f23f77a 100644
--- a/cpp/include/IceUtil/StringConverter.h
+++ b/cpp/include/IceUtil/StringConverter.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_STRING_CONVERTER_H
#define ICE_UTIL_STRING_CONVERTER_H
diff --git a/cpp/include/IceUtil/StringUtil.h b/cpp/include/IceUtil/StringUtil.h
index 83307013fc8..0891f00fab4 100644
--- a/cpp/include/IceUtil/StringUtil.h
+++ b/cpp/include/IceUtil/StringUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_STRING_UTIL_H
#define ICE_UTIL_STRING_UTIL_H
diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h
index 847da352fd9..744110e2593 100644
--- a/cpp/include/IceUtil/Thread.h
+++ b/cpp/include/IceUtil/Thread.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_THREAD_H
#define ICE_UTIL_THREAD_H
diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h
index 316e672fe87..0b13fcffe6b 100644
--- a/cpp/include/IceUtil/ThreadException.h
+++ b/cpp/include/IceUtil/ThreadException.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_THREAD_EXCEPTION_H
#define ICE_UTIL_THREAD_EXCEPTION_H
diff --git a/cpp/include/IceUtil/Time.h b/cpp/include/IceUtil/Time.h
index e3b87489540..ec7dd6abf6d 100644
--- a/cpp/include/IceUtil/Time.h
+++ b/cpp/include/IceUtil/Time.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_TIME_H
#define ICE_UTIL_TIME_H
diff --git a/cpp/include/IceUtil/Timer.h b/cpp/include/IceUtil/Timer.h
index b258e2e2d50..177a7f8337a 100644
--- a/cpp/include/IceUtil/Timer.h
+++ b/cpp/include/IceUtil/Timer.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_TIMER_H
#define ICE_UTIL_TIMER_H
diff --git a/cpp/include/IceUtil/UUID.h b/cpp/include/IceUtil/UUID.h
index 51e6fb56437..8e831e17879 100644
--- a/cpp/include/IceUtil/UUID.h
+++ b/cpp/include/IceUtil/UUID.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_UUID_H
#define ICE_UTIL_UUID_H
diff --git a/cpp/include/IceUtil/UndefSysMacros.h b/cpp/include/IceUtil/UndefSysMacros.h
index 9d9b94857f7..4743bfe1303 100644
--- a/cpp/include/IceUtil/UndefSysMacros.h
+++ b/cpp/include/IceUtil/UndefSysMacros.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_UNDEF_SYS_MACROS_H
#define ICE_UTIL_UNDEF_SYS_MACROS_H