210 files changed, 209 insertions, 216 deletions
diff --git a/3way.h b/3way.h
index 485ad19d..bafc02f9 100644
--- a/3way.h
+++ b/3way.h
@@ -1,4 +1,4 @@
-// 3way.h - written and placed in the public domain by Wei Dai
+// 3way.h - originally written and placed in the public domain by Wei Dai
 
 //! \file 3way.h
 //! \brief Classes for the 3-Way block cipher
diff --git a/adler32.cpp b/adler32.cpp
index f48e9b73..75c2e659 100644
--- a/adler32.cpp
+++ b/adler32.cpp
@@ -1,4 +1,4 @@
-// adler32.cpp - written and placed in the public domain by Wei Dai
+// adler32.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "adler32.h"
diff --git a/adler32.h b/adler32.h
index 37dc11a9..3c62748b 100644
--- a/adler32.h
+++ b/adler32.h
@@ -1,4 +1,4 @@
-// adler32.h - written and placed in the public domain by Wei Dai
+// adler32.h - originally written and placed in the public domain by Wei Dai
 
 //! \file
 //! \headerfile adler32.h
diff --git a/aes.h b/aes.h
index 217738bd..e95d2102 100644
--- a/aes.h
+++ b/aes.h
@@ -1,4 +1,4 @@
-// aes.h - written and placed in the public domain by Wei Dai
+// aes.h - originally written and placed in the public domain by Wei Dai
 
 //! \file
 //! \brief Class file for the AES cipher (Rijndael)
diff --git a/algebra.cpp b/algebra.cpp
index c40e900e..252819c3 100644
--- a/algebra.cpp
+++ b/algebra.cpp
@@ -1,4 +1,4 @@
-// algebra.cpp - written and placed in the public domain by Wei Dai
+// algebra.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/algebra.h b/algebra.h
index 1559cb47..20c26934 100644
--- a/algebra.h
+++ b/algebra.h
@@ -1,4 +1,4 @@
-// algebra.h - written and placed in the public domain by Wei Dai
+// algebra.h - originally written and placed in the public domain by Wei Dai
 
 //! \file algebra.h
 //! \brief Classes for performing mathematics over different fields
diff --git a/algparam.cpp b/algparam.cpp
index 5ef155fd..79ebcc9d 100644
--- a/algparam.cpp
+++ b/algparam.cpp
@@ -1,4 +1,4 @@
-// algparam.cpp - written and placed in the public domain by Wei Dai
+// algparam.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/algparam.h b/algparam.h
index 33be4b0c..58af9eed 100644
--- a/algparam.h
+++ b/algparam.h
@@ -1,4 +1,4 @@
-// algparam.h - written and placed in the public domain by Wei Dai
+// algparam.h - originally written and placed in the public domain by Wei Dai
 
 //! \file
 //! \headerfile algparam.h
diff --git a/arc4.cpp b/arc4.cpp
index 3f3b588c..7046b727 100644
--- a/arc4.cpp
+++ b/arc4.cpp
@@ -1,4 +1,4 @@
-// arc4.cpp - written and placed in the public domain by Wei Dai
+// arc4.cpp - originally written and placed in the public domain by Wei Dai
 
 // The ARC4 algorithm was first revealed in an anonymous email to the
 // cypherpunks mailing list. This file originally contained some
diff --git a/arc4.h b/arc4.h
index f8a8b51c..e7fdfc2e 100644
--- a/arc4.h
+++ b/arc4.h
@@ -1,4 +1,4 @@
-// arc4.h - written and placed in the public domain by Wei Dai
+// arc4.h - originally written and placed in the public domain by Wei Dai
 
 //! \file arc4.h
 //! \brief Classes for ARC4 cipher
diff --git a/argnames.h b/argnames.h
index 04b025b4..e80115b8 100644
--- a/argnames.h
+++ b/argnames.h
@@ -1,4 +1,4 @@
-// argnames.h - written and placed in the public domain by Wei Dai
+// argnames.h - originally written and placed in the public domain by Wei Dai
 
 //! \file argnames.h
 //! \brief Standard names for retrieving values by name when working with \p NameValuePairs
diff --git a/asn.cpp b/asn.cpp
index e2ab727c..8c0d30ff 100644
--- a/asn.cpp
+++ b/asn.cpp
@@ -1,4 +1,4 @@
-// asn.cpp - written and placed in the public domain by Wei Dai
+// asn.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "config.h"
diff --git a/asn.h b/asn.h
index 002d849b..f05209ec 100644
--- a/asn.h
+++ b/asn.h
@@ -1,4 +1,4 @@
-// asn.h - written and placed in the public domain by Wei Dai
+// asn.h - originally written and placed in the public domain by Wei Dai
 
 //! \file asn.h
 //! \brief Classes and functions for working with ANS.1 objects
diff --git a/authenc.cpp b/authenc.cpp
index 08d4c99c..fd446b73 100644
--- a/authenc.cpp
+++ b/authenc.cpp
@@ -1,4 +1,4 @@
-// authenc.cpp - written and placed in the public domain by Wei Dai
+// authenc.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/authenc.h b/authenc.h
index 5882c743..5f9f2b1a 100644
--- a/authenc.h
+++ b/authenc.h
@@ -1,4 +1,4 @@
-// authenc.h - written and placed in the public domain by Wei Dai
+// authenc.h - originally written and placed in the public domain by Wei Dai
 
 //! \file
 //! \headerfile authenc.h
diff --git a/base64.cpp b/base64.cpp
index 6f4a11cc..9ba4226e 100644
--- a/base64.cpp
+++ b/base64.cpp
@@ -1,4 +1,4 @@
-// base64.cpp - written and placed in the public domain by Wei Dai
+// base64.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "base64.h"
diff --git a/base64.h b/base64.h
index 93c8d7c6..54961bd6 100644
--- a/base64.h
+++ b/base64.h
@@ -1,4 +1,4 @@
-// base64.h - written and placed in the public domain by Wei Dai
+// base64.h - originally written and placed in the public domain by Wei Dai
 
 //! \file base64.h
 //! \brief Classes for the Base64Encoder, Base64Decoder, Base64URLEncoder and Base64URLDecoder
diff --git a/basecode.cpp b/basecode.cpp
index 954d11cb..c96087ec 100644
--- a/basecode.cpp
+++ b/basecode.cpp
@@ -1,4 +1,4 @@
-// basecode.cpp - written and placed in the public domain by Wei Dai
+// basecode.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "config.h"
diff --git a/basecode.h b/basecode.h
index 2e420be1..2e617eb4 100644
--- a/basecode.h
+++ b/basecode.h
@@ -1,4 +1,4 @@
-// basecode.h - written and placed in the public domain by Wei Dai
+// basecode.h - originally written and placed in the public domain by Wei Dai
 
 //! \file
 //! \brief Base classes for working with encoders and decoders.
diff --git a/bench.h b/bench.h
index bf966ffc..5f7f3ea7 100644
--- a/bench.h
+++ b/bench.h
@@ -1,4 +1,4 @@
-// bench.h - written and placed in the public domain by Wei Dai
+// bench.h - originally written and placed in the public domain by Wei Dai
 
 #ifndef CRYPTOPP_BENCH_H
 #define CRYPTOPP_BENCH_H
diff --git a/bench1.cpp b/bench1.cpp
index bf31d4ac..9b57f7ea 100644
--- a/bench1.cpp
+++ b/bench1.cpp
@@ -1,4 +1,4 @@
-// bench1.cpp - written and placed in the public domain by Wei Dai
+// bench1.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "cryptlib.h"
 #include "bench.h"
diff --git a/bench2.cpp b/bench2.cpp
index c0db1f00..c209bff9 100644
--- a/bench2.cpp
+++ b/bench2.cpp
@@ -1,4 +1,4 @@
-// bench2.cpp - written and placed in the public domain by Wei Dai
+// bench2.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "cryptlib.h"
 #include "bench.h"
diff --git a/blowfish.cpp b/blowfish.cpp
index 7fe9a56f..e615da3b 100644
--- a/blowfish.cpp
+++ b/blowfish.cpp
@@ -1,4 +1,4 @@
-// blowfish.cpp - written and placed in the public domain by Wei Dai
+// blowfish.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "blowfish.h"
diff --git a/blowfish.h b/blowfish.h
index d14b0231..bc37ca0d 100644
--- a/blowfish.h
+++ b/blowfish.h
@@ -1,4 +1,4 @@
-// blowfish.h - written and placed in the public domain by Wei Dai
+// blowfish.h - originally written and placed in the public domain by Wei Dai
 
 //! \file blowfish.h
 //! \brief Classes for the Blowfish block cipher
diff --git a/blumshub.cpp b/blumshub.cpp
index 3e7345cd..353f6ecc 100644
--- a/blumshub.cpp
+++ b/blumshub.cpp
@@ -1,4 +1,4 @@
-// blumshub.cpp - written and placed in the public domain by Wei Dai
+// blumshub.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "blumshub.h"
diff --git a/blumshub.h b/blumshub.h
index 486e4075..54fbc0f0 100644
--- a/blumshub.h
+++ b/blumshub.h
@@ -1,4 +1,4 @@
-// blumshub.h - written and placed in the public domain by Wei Dai
+// blumshub.h - originally written and placed in the public domain by Wei Dai
 
 //! \file
 //! \headerfile blumshub.h
diff --git a/camellia.h b/camellia.h
index dae09718..1e6e39c5 100644
--- a/camellia.h
+++ b/camellia.h
@@ -1,4 +1,4 @@
-// camellia.h - written and placed in the public domain by Wei Dai
+// camellia.h - originally written and placed in the public domain by Wei Dai
 
 //! \file camellia.h
 //! \brief Classes for the Cameliia block cipher
diff --git a/cast.cpp b/cast.cpp
index 6c1babb9..010fef04 100644
--- a/cast.cpp
+++ b/cast.cpp
@@ -1,4 +1,4 @@
-// cast.cpp - written and placed in the public domain by Wei Dai and Leonard Janke
+// cast.cpp - originally written and placed in the public domain by Wei Dai and Leonard Janke
 // based on Steve Reid's public domain cast.c
 
 #include "pch.h"
diff --git a/cast.h b/cast.h
index f2dc9242..32561c85 100644
--- a/cast.h
+++ b/cast.h
@@ -1,4 +1,4 @@
-// cast.h - written and placed in the public domain by Wei Dai
+// cast.h - originally written and placed in the public domain by Wei Dai
 
 //! \file cast.h
 //! \brief Classes for the CAST-128 and CAST-256 block ciphers
diff --git a/cbcmac.h b/cbcmac.h
index d4745b6b..985a34d1 100644
--- a/cbcmac.h
+++ b/cbcmac.h
@@ -1,4 +1,4 @@
-// cbcmac.h - written and placed in the public domain by Wei Dai
+// cbcmac.h - originally written and placed in the public domain by Wei Dai
 
 //! \file
 //! \headerfile cbcmac.h
diff --git a/ccm.cpp b/ccm.cpp
index 97d05614..0d40397e 100644
--- a/ccm.cpp
+++ b/ccm.cpp
@@ -1,4 +1,4 @@
-// ccm.cpp - written and placed in the public domain by Wei Dai
+// ccm.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/ccm.h b/ccm.h
index 722bb27d..1b94c064 100644
--- a/ccm.h
+++ b/ccm.h
@@ -1,4 +1,4 @@
-// ccm.h - written and placed in the public domain by Wei Dai
+// ccm.h - originally written and placed in the public domain by Wei Dai
 
 //! \file ccm.h
 //! \brief CCM block cipher mode of operation
diff --git a/channels.cpp b/channels.cpp
index 32496f54..2082ad67 100644
--- a/channels.cpp
+++ b/channels.cpp
@@ -1,4 +1,4 @@
-// channels.cpp - written and placed in the public domain by Wei Dai
+// channels.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/channels.h b/channels.h
index 93eb4406..deacca0d 100644
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
-// channels.h - written and placed in the public domain by Wei Dai
+// channels.h - originally written and placed in the public domain by Wei Dai
 
 //! \file
 //! \headerfile channels.h
diff --git a/cmac.cpp b/cmac.cpp
index ce8563cf..09ce4d31 100644
--- a/cmac.cpp
+++ b/cmac.cpp
@@ -1,4 +1,4 @@
-// cmac.cpp - written and placed in the public domain by Wei Dai
+// cmac.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/cmac.h b/cmac.h
index 169eda9e..60482277 100644
--- a/cmac.h
+++ b/cmac.h
@@ -1,4 +1,4 @@
-// cmac.h - written and placed in the public domain by Wei Dai
+// cmac.h - originally written and placed in the public domain by Wei Dai
 
 //! \file cmac.h
 //! \brief Classes for CMAC message authentication code
diff --git a/config.h b/config.h
index 13e4a2da..d1fb9d43 100644
--- a/config.h
+++ b/config.h
@@ -1,4 +1,4 @@
-// config.h - written and placed in the public domain by Wei Dai
+// config.h - originally written and placed in the public domain by Wei Dai
 
 //! \file config.h
 //! \brief Library configuration file
diff --git a/cpu.cpp b/cpu.cpp
index f1a9f6ab..e8bf611b 100644
--- a/cpu.cpp
+++ b/cpu.cpp
@@ -1,4 +1,4 @@
-// cpu.cpp - written and placed in the public domain by Wei Dai
+// cpu.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "config.h"
diff --git a/cpu.h b/cpu.h
index 78c0f3f2..3c96457e 100644
--- a/cpu.h
+++ b/cpu.h
@@ -1,4 +1,4 @@
-// cpu.h - written and placed in the public domain by Wei Dai
+// cpu.h - originally written and placed in the public domain by Wei Dai
 //         updated for ARM by Jeffrey Walton
 
 //! \file cpu.h
diff --git a/crc.cpp b/crc.cpp
index 738d1238..1add0d84 100644
--- a/crc.cpp
+++ b/crc.cpp
@@ -1,4 +1,4 @@
-// crc.cpp - written and placed in the public domain by Wei Dai
+// crc.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "crc.h"
diff --git a/crc.h b/crc.h
index fdabe97e..61923d58 100644
--- a/crc.h
+++ b/crc.h
@@ -1,4 +1,4 @@
-// crc.h - written and placed in the public domain by Wei Dai
+// crc.h - originally written and placed in the public domain by Wei Dai
 
 //! \file
 //! \headerfile crc.h
diff --git a/cryptlib.cpp b/cryptlib.cpp
index 0c4f7703..f202f539 100644
--- a/cryptlib.cpp
+++ b/cryptlib.cpp
@@ -1,4 +1,4 @@
-// cryptlib.cpp - written and placed in the public domain by Wei Dai
+// cryptlib.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "config.h"
diff --git a/cryptlib.h b/cryptlib.h
index d5193dba..0e6011bc 100644
--- a/cryptlib.h
+++ b/cryptlib.h
@@ -1,4 +1,4 @@
-// cryptlib.h - written and placed in the public domain by Wei Dai
+// cryptlib.h - originally written and placed in the public domain by Wei Dai
 
 //! \file cryptlib.h
 //! \brief Abstract base classes that provide a uniform interface to this library.
diff --git a/datatest.cpp b/datatest.cpp
index d4f5c0ab..b7be1063 100644
--- a/datatest.cpp
+++ b/datatest.cpp
@@ -1,4 +1,4 @@
-// datatest.cpp - written and placed in the public domain by Wei Dai
+// datatest.cpp - originally written and placed in the public domain by Wei Dai
 
 #define CRYPTOPP_DEFAULT_NO_DLL
 #define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
diff --git a/default.cpp b/default.cpp
index 99ba4ba4..8cbdb7ac 100644
--- a/default.cpp
+++ b/default.cpp
@@ -1,4 +1,4 @@
-// default.cpp - written and placed in the public domain by Wei Dai
+// default.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "config.h"
diff --git a/default.h b/default.h
index b23174d9..9dd20d08 100644
--- a/default.h
+++ b/default.h
@@ -1,4 +1,4 @@
-// default.h - written and placed in the public domain by Wei Dai
+// default.h - originally written and placed in the public domain by Wei Dai
 
 //! \file default.h
 //! \brief Classes for DefaultEncryptor, DefaultDecryptor, DefaultEncryptorWithMAC and DefaultDecryptorWithMAC
diff --git a/des.h b/des.h
index 0389cfbd..3ef8c837 100644
--- a/des.h
+++ b/des.h
@@ -1,4 +1,4 @@
-// des.h - written and placed in the public domain by Wei Dai
+// des.h - originally written and placed in the public domain by Wei Dai
 
 //! \file des.h
 //! \brief Classes for DES, 2-key Triple-DES, 3-key Triple-DES and DESX
diff --git a/dh.cpp b/dh.cpp
index b33132b0..5a0e7d1d 100644
--- a/dh.cpp
+++ b/dh.cpp
@@ -1,4 +1,4 @@
-// dh.cpp - written and placed in the public domain by Wei Dai
+// dh.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/dh.h b/dh.h
index 35379b43..a71897a6 100644
--- a/dh.h
+++ b/dh.h
@@ -1,4 +1,4 @@
-// dh.h - written and placed in the public domain by Wei Dai
+// dh.h - originally written and placed in the public domain by Wei Dai
 
 //! \file dh.h
 //! \brief Classes for Diffie-Hellman key exchange
diff --git a/dh2.cpp b/dh2.cpp
index b8060968..08378366 100644
--- a/dh2.cpp
+++ b/dh2.cpp
@@ -1,4 +1,4 @@
-// dh2.cpp - written and placed in the public domain by Wei Dai
+// dh2.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "dh2.h"
diff --git a/dh2.h b/dh2.h
index 70a7b050..2163de27 100644
--- a/dh2.h
+++ b/dh2.h
@@ -1,4 +1,4 @@
-// dh2.h - written and placed in the public domain by Wei Dai
+// dh2.h - originally written and placed in the public domain by Wei Dai
 
 //! \file dh2.h
 //! \brief Classes for Unified Diffie-Hellman key exchange
diff --git a/dll.cpp b/dll.cpp
index 118c9c19..c7bfdc51 100644
--- a/dll.cpp
+++ b/dll.cpp
@@ -1,4 +1,4 @@
-// dll.cpp - written and placed in the public domain by Wei Dai
+// dll.cpp - originally written and placed in the public domain by Wei Dai
 
 #define CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES
 #define CRYPTOPP_DEFAULT_NO_DLL
diff --git a/dll.h b/dll.h
index bdaf054e..a15096e9 100644
--- a/dll.h
+++ b/dll.h
@@ -1,4 +1,4 @@
-// dll.h - written and placed in the public domain by Wei Dai
+// dll.h - originally written and placed in the public domain by Wei Dai
 
 //! \file
 //! \headerfile dll.h
diff --git a/dmac.h b/dmac.h
index b797a12d..1af7e04a 100644
--- a/dmac.h
+++ b/dmac.h
@@ -1,4 +1,4 @@
-// dmac.h - written and placed in the public domain by Wei Dai
+// dmac.h - originally written and placed in the public domain by Wei Dai
 
 //! \file
 //! \headerfile dmac.h
diff --git a/dsa.cpp b/dsa.cpp
index 0141fcdc..6bc187a9 100644
--- a/dsa.cpp
+++ b/dsa.cpp
@@ -1,4 +1,4 @@
-// dsa.cpp - written and placed in the public domain by Wei Dai
+// dsa.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/dsa.h b/dsa.h
index faaa2fba..8ea4773f 100644
--- a/dsa.h
+++ b/dsa.h
@@ -1,4 +1,4 @@
-// dsa.h - written and placed in the public domain by Wei Dai
+// dsa.h - originally written and placed in the public domain by Wei Dai
 
 //! \file dsa.h
 //! \brief Classes for the DSA signature algorithm
diff --git a/eax.cpp b/eax.cpp
index 437b502f..ef4f2a9f 100644
--- a/eax.cpp
+++ b/eax.cpp
@@ -1,4 +1,4 @@
-// eax.cpp - written and placed in the public domain by Wei Dai
+// eax.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "eax.h"
diff --git a/eax.h b/eax.h
index b3e6de4d..fd02c5ca 100644
--- a/eax.h
+++ b/eax.h
@@ -1,4 +1,4 @@
-// eax.h - written and placed in the public domain by Wei Dai
+// eax.h - originally written and placed in the public domain by Wei Dai
 
 //! \file eax.h
 //! \brief EAX block cipher mode of operation
diff --git a/ec2n.cpp b/ec2n.cpp
index 33a9d454..3b6cf2a2 100644
--- a/ec2n.cpp
+++ b/ec2n.cpp
@@ -1,4 +1,4 @@
-// ec2n.cpp - written and placed in the public domain by Wei Dai
+// ec2n.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/ec2n.h b/ec2n.h
index 8795a5a7..1d4c9824 100644
--- a/ec2n.h
+++ b/ec2n.h
@@ -1,4 +1,4 @@
-// ec2n.h - written and placed in the public domain by Wei Dai
+// ec2n.h - originally written and placed in the public domain by Wei Dai
 
 //! \file
 //! \headerfile ec2n.h
diff --git a/eccrypto.cpp b/eccrypto.cpp
index 133194ea..6c384597 100644
--- a/eccrypto.cpp
+++ b/eccrypto.cpp
@@ -1,4 +1,4 @@
-// eccrypto.cpp - written and placed in the public domain by Wei Dai
+// eccrypto.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/eccrypto.h b/eccrypto.h
index b9f5ecec..6a5c7620 100644
--- a/eccrypto.h
+++ b/eccrypto.h
@@ -1,4 +1,4 @@
-// eccrypto.h - written and placed in the public domain by Wei Dai
+// eccrypto.h - originally written and placed in the public domain by Wei Dai
 //              deterministic signatures added by by Douglas Roark
 
 //! \file eccrypto.h
diff --git a/ecp.cpp b/ecp.cpp
index eae99eb1..73f66685 100644
--- a/ecp.cpp
+++ b/ecp.cpp
@@ -1,4 +1,4 @@
-// ecp.cpp - written and placed in the public domain by Wei Dai
+// ecp.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/ecp.h b/ecp.h
index 4f6c35f7..4b5604a0 100644
--- a/ecp.h
+++ b/ecp.h
@@ -1,4 +1,4 @@
-// ecp.h - written and placed in the public domain by Wei Dai
+// ecp.h - originally written and placed in the public domain by Wei Dai
 
 //! \file ecp.h
 //! \brief Classes for Elliptic Curves over prime fields
diff --git a/elgamal.cpp b/elgamal.cpp
index 650a4cc5..13c2a9be 100644
--- a/elgamal.cpp
+++ b/elgamal.cpp
@@ -1,4 +1,4 @@
-// elgamal.cpp - written and placed in the public domain by Wei Dai
+// elgamal.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "elgamal.h"
diff --git a/elgamal.h b/elgamal.h
index 4c763ac1..1b7906c8 100644
--- a/elgamal.h
+++ b/elgamal.h
@@ -1,4 +1,4 @@
-// elgamal.h - written and placed in the public domain by Wei Dai
+// elgamal.h - originally written and placed in the public domain by Wei Dai
 
 //! \file elgamal.h
 //! \brief Classes and functions for ElGamal key agreement and encryption schemes
diff --git a/emsa2.cpp b/emsa2.cpp
index fb387d2f..1cde59c5 100644
--- a/emsa2.cpp
+++ b/emsa2.cpp
@@ -1,4 +1,4 @@
-// emsa2.cpp - written and placed in the public domain by Wei Dai
+// emsa2.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "emsa2.h"
diff --git a/emsa2.h b/emsa2.h
index 82ae417e..1ee4b76b 100644
--- a/emsa2.h
+++ b/emsa2.h
@@ -1,4 +1,4 @@
-// emsa2.h - written and placed in the public domain by Wei Dai
+// emsa2.h - originally written and placed in the public domain by Wei Dai
 
 //! \file emsa2.h
 //! \brief Classes and functions for various padding schemes used in public key algorithms
diff --git a/eprecomp.cpp b/eprecomp.cpp
index 3a021b66..75103089 100644
--- a/eprecomp.cpp
+++ b/eprecomp.cpp
@@ -1,4 +1,4 @@
-// eprecomp.cpp - written and placed in the public domain by Wei Dai
+// eprecomp.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/eprecomp.h b/eprecomp.h
index 611f4f21..57b99f1d 100644
--- a/eprecomp.h
+++ b/eprecomp.h
@@ -1,4 +1,4 @@
-// eprecomp.h - written and placed in the public domain by Wei Dai
+// eprecomp.h - originally written and placed in the public domain by Wei Dai
 
 //! \file eprecomp.h
 //! \brief Classes for precomputation in a group
diff --git a/esign.cpp b/esign.cpp
index 58ee56d7..cf78729c 100644
--- a/esign.cpp
+++ b/esign.cpp
@@ -1,4 +1,4 @@
-// esign.cpp - written and placed in the public domain by Wei Dai
+// esign.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "config.h"
diff --git a/esign.h b/esign.h
index 3eabf13f..4ea631a8 100644
--- a/esign.h
+++ b/esign.h
@@ -1,4 +1,4 @@
-// esign.h - written and placed in the public domain by Wei Dai
+// esign.h - originally written and placed in the public domain by Wei Dai
 
 //! \file esign.h
 //! \brief Classes providing ESIGN signature schemes as defined in IEEE P1363a
diff --git a/factory.h b/factory.h
index 112a5294..c3aa9163 100644
--- a/factory.h
+++ b/factory.h
@@ -1,4 +1,4 @@
-// factory.h - written and placed in the public domain by Wei Dai
+// factory.h - originally written and placed in the public domain by Wei Dai
 
 //! \file factory.h
 //! \brief Classes and functions for registering and locating library objects
diff --git a/files.cpp b/files.cpp
index 9a5168bb..6c0d1f13 100644
--- a/files.cpp
+++ b/files.cpp
@@ -1,4 +1,4 @@
-// files.cpp - written and placed in the public domain by Wei Dai
+// files.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/files.h b/files.h
index 3375fb25..1235b2e5 100644
--- a/files.h
+++ b/files.h
@@ -1,4 +1,4 @@
-// files.h - written and placed in the public domain by Wei Dai
+// files.h - originally written and placed in the public domain by Wei Dai
 
 //! \file files.h
 //! \brief Classes providing file-based library services
diff --git a/filters.cpp b/filters.cpp
index 28d2276c..bd2e44e5 100644
--- a/filters.cpp
+++ b/filters.cpp
@@ -1,4 +1,4 @@
-// filters.cpp - written and placed in the public domain by Wei Dai
+// filters.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "config.h"
diff --git a/filters.h b/filters.h
index 2e6b8c11..574e27a9 100644
--- a/filters.h
+++ b/filters.h
@@ -1,4 +1,4 @@
-// filters.h - written and placed in the public domain by Wei Dai
+// filters.h - originally written and placed in the public domain by Wei Dai
 
 //! \file filters.h
 //! \brief Implementation of BufferedTransformation's attachment interface.
diff --git a/fips140.cpp b/fips140.cpp
index 1c442e89..ebf0225e 100644
--- a/fips140.cpp
+++ b/fips140.cpp
@@ -1,4 +1,4 @@
-// fips140.cpp - written and placed in the public domain by Wei Dai
+// fips140.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/fips140.h b/fips140.h
index ec37158d..ecf60147 100644
--- a/fips140.h
+++ b/fips140.h
@@ -1,4 +1,4 @@
-// fips140.h - written and placed in the public domain by Wei Dai
+// fips140.h - originally written and placed in the public domain by Wei Dai
 
 //! \file fips140.h
 //! \brief Classes and functions for the FIPS 140-2 validated library
diff --git a/fipsalgt.cpp b/fipsalgt.cpp
index d20a9b9e..f0d4fe43 100644
--- a/fipsalgt.cpp
+++ b/fipsalgt.cpp
@@ -1,4 +1,4 @@
-// fipsalgt.cpp - written and placed in the public domain by Wei Dai
+// fipsalgt.cpp - originally written and placed in the public domain by Wei Dai
 
 // This file implements the various algorithm tests needed to pass FIPS 140 validation.
 // They're preserved here (commented out) in case Crypto++ needs to be revalidated.
diff --git a/fipstest.cpp b/fipstest.cpp
index 35a35452..119d65d7 100644
--- a/fipstest.cpp
+++ b/fipstest.cpp
@@ -1,4 +1,4 @@
-// fipstest.cpp - written and placed in the public domain by Wei Dai
+// fipstest.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "config.h"
diff --git a/gcm.cpp b/gcm.cpp
index a9552e6e..0337879b 100644
--- a/gcm.cpp
+++ b/gcm.cpp
@@ -1,4 +1,4 @@
-// gcm.cpp - written and placed in the public domain by Wei Dai
+// gcm.cpp - originally written and placed in the public domain by Wei Dai
 //           ARM and Aarch64 added by Jeffrey Walton. The ARM carryless
 //           multiply routines are less efficient because they shadowed x86.
 //           The precomputed key table integration makes it tricky to use the
diff --git a/gcm.h b/gcm.h
index d2a4347f..de5fe8b5 100644
--- a/gcm.h
+++ b/gcm.h
@@ -1,4 +1,4 @@
-// gcm.h - written and placed in the public domain by Wei Dai
+// gcm.h - originally written and placed in the public domain by Wei Dai
 
 //! \file gcm.h
 //! \brief GCM block cipher mode of operation
diff --git a/gf256.cpp b/gf256.cpp
index 3649f755..c432344f 100644
--- a/gf256.cpp
+++ b/gf256.cpp
@@ -1,4 +1,4 @@
-// gf256.cpp - written and placed in the public domain by Wei Dai
+// gf256.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "gf256.h"
diff --git a/gf256.h b/gf256.h
index 13500f33..4a3cd83d 100644
--- a/gf256.h
+++ b/gf256.h
@@ -1,4 +1,4 @@
-// gf256.h - written and placed in the public domain by Wei Dai
+// gf256.h - originally written and placed in the public domain by Wei Dai
 
 //! \file gf256.h
 //! \brief Classes and functions for schemes over GF(256)
diff --git a/gf2_32.cpp b/gf2_32.cpp
index 084a1da3..ab4169ca 100644
--- a/gf2_32.cpp
+++ b/gf2_32.cpp
@@ -1,4 +1,4 @@
-// gf2_32.cpp - written and placed in the public domain by Wei Dai
+// gf2_32.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "misc.h"
diff --git a/gf2_32.h b/gf2_32.h
index 30d68a86..845c7c02 100644
--- a/gf2_32.h
+++ b/gf2_32.h
@@ -1,4 +1,4 @@
-// gf2_32.h - written and placed in the public domain by Wei Dai
+// gf2_32.h - originally written and placed in the public domain by Wei Dai
 
 //! \file gf2_32.h
 //! \brief Classes and functions for schemes over GF(2^32)
diff --git a/gf2n.cpp b/gf2n.cpp
index 2bc5331a..7a41e3b5 100644
--- a/gf2n.cpp
+++ b/gf2n.cpp
@@ -1,4 +1,4 @@
-// gf2n.cpp - written and placed in the public domain by Wei Dai
+// gf2n.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "config.h"
diff --git a/gf2n.h b/gf2n.h
index 29a1e407..6dc18310 100644
--- a/gf2n.h
+++ b/gf2n.h
@@ -1,4 +1,4 @@
-// gf2n.h - written and placed in the public domain by Wei Dai
+// gf2n.h - originally written and placed in the public domain by Wei Dai
 
 //! \file gf2n.h
 //! \brief Classes and functions for schemes over GF(2^n)
diff --git a/gfpcrypt.cpp b/gfpcrypt.cpp
index 3badb261..9b6b2ec1 100644
--- a/gfpcrypt.cpp
+++ b/gfpcrypt.cpp
@@ -1,4 +1,4 @@
-// dsa.cpp - written and placed in the public domain by Wei Dai
+// dsa.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "config.h"
diff --git a/gfpcrypt.h b/gfpcrypt.h
index 7c22b040..9cba973b 100644
--- a/gfpcrypt.h
+++ b/gfpcrypt.h
@@ -1,4 +1,4 @@
-// gfpcrypt.h - written and placed in the public domain by Wei Dai
+// gfpcrypt.h - originally written and placed in the public domain by Wei Dai
 //              RFC6979 deterministic signatures (DL_Algorithm_DSA_RFC6979) added by by Douglas Roark
 //              ECGDSA (DL_Algorithm_GDSA_ISO15946) added by Jeffrey Walton
 
diff --git a/gost.h b/gost.h
index 55f9ec5e..153bfbb0 100644
--- a/gost.h
+++ b/gost.h
@@ -1,4 +1,4 @@
-// gost.h - written and placed in the public domain by Wei Dai
+// gost.h - originally written and placed in the public domain by Wei Dai
 
 //! \file gost.h
 //! \brief Classes for the GIST block cipher
diff --git a/gzip.cpp b/gzip.cpp
index 836f63cf..04568386 100644
--- a/gzip.cpp
+++ b/gzip.cpp
@@ -1,4 +1,4 @@
-// gzip.cpp - written and placed in the public domain by Wei Dai
+// gzip.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "gzip.h"
diff --git a/gzip.h b/gzip.h
index 8850cf60..74304d81 100644
--- a/gzip.h
+++ b/gzip.h
@@ -1,4 +1,4 @@
-// gzip.h - written and placed in the public domain by Wei Dai
+// gzip.h - originally written and placed in the public domain by Wei Dai
 
 //! \file gzip.h
 //! \brief GZIP compression and decompression (RFC 1952)
diff --git a/hex.cpp b/hex.cpp
index dbf1cf64..133c97e7 100644
--- a/hex.cpp
+++ b/hex.cpp
@@ -1,4 +1,4 @@
-// hex.cpp - written and placed in the public domain by Wei Dai
+// hex.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/hex.h b/hex.h
index 0e533017..798a0fc5 100644
--- a/hex.h
+++ b/hex.h
@@ -1,4 +1,4 @@
-// hex.h - written and placed in the public domain by Wei Dai
+// hex.h - originally written and placed in the public domain by Wei Dai
 
 //! \file hex.h
 //! \brief Classes for HexEncoder and HexDecoder
diff --git a/hmac.cpp b/hmac.cpp
index bb0d9e52..bda66530 100644
--- a/hmac.cpp
+++ b/hmac.cpp
@@ -1,4 +1,4 @@
-// hmac.cpp - written and placed in the public domain by Wei Dai
+// hmac.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/hmac.h b/hmac.h
index f6c1499a..f4f60f7b 100644
--- a/hmac.h
+++ b/hmac.h
@@ -1,4 +1,4 @@
-// hmac.h - written and placed in the public domain by Wei Dai
+// hmac.h - originally written and placed in the public domain by Wei Dai
 
 //! \file hmac.h
 //! \brief Classes for HMAC message authentication codes
diff --git a/hrtimer.cpp b/hrtimer.cpp
index c8869dcb..82e15d44 100644
--- a/hrtimer.cpp
+++ b/hrtimer.cpp
@@ -1,4 +1,4 @@
-// hrtimer.cpp - written and placed in the public domain by Wei Dai
+// hrtimer.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "hrtimer.h"
diff --git a/ida.cpp b/ida.cpp
index cecee352..d42317f4 100644
--- a/ida.cpp
+++ b/ida.cpp
@@ -1,4 +1,4 @@
-// ida.cpp - written and placed in the public domain by Wei Dai
+// ida.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "config.h"
diff --git a/ida.h b/ida.h
index 0532a816..2750e4d7 100644
--- a/ida.h
+++ b/ida.h
@@ -1,4 +1,4 @@
-// ida.h - written and placed in the public domain by Wei Dai
+// ida.h - originally written and placed in the public domain by Wei Dai
 
 //! \file ida.h
 //! \brief Classes for Rabin's Information Dispersal and Shamir's Secret Sharing algorithms
diff --git a/idea.cpp b/idea.cpp
index 3f2c34a9..dde2fdb4 100644
--- a/idea.cpp
+++ b/idea.cpp
@@ -1,4 +1,4 @@
-// idea.cpp - written and placed in the public domain by Wei Dai
+// idea.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "idea.h"
diff --git a/idea.h b/idea.h
index 75dd98ea..ec1f8c83 100644
--- a/idea.h
+++ b/idea.h
@@ -1,4 +1,4 @@
-// idea.h - written and placed in the public domain by Wei Dai
+// idea.h - originally written and placed in the public domain by Wei Dai
 
 //! \file idea.h
 //! \brief Classes for the IDEA block cipher
diff --git a/integer.cpp b/integer.cpp
index 8ab235a4..6b0a6cda 100644
--- a/integer.cpp
+++ b/integer.cpp
@@ -1,4 +1,4 @@
-// integer.cpp - written and placed in the public domain by Wei Dai
+// integer.cpp - originally written and placed in the public domain by Wei Dai
 // contains public domain code contributed by Alister Lee and Leonard Janke
 
 #include "pch.h"
diff --git a/integer.h b/integer.h
index 6c6ad8a4..f6bf0621 100644
--- a/integer.h
+++ b/integer.h
@@ -1,4 +1,4 @@
-// integer.h - written and placed in the public domain by Wei Dai
+// integer.h - originally written and placed in the public domain by Wei Dai
 
 //! \file integer.h
 //! \brief Multiple precision integer with arithmetic operations
diff --git a/iterhash.cpp b/iterhash.cpp
index c674dd48..722d4f77 100644
--- a/iterhash.cpp
+++ b/iterhash.cpp
@@ -1,4 +1,4 @@
-// iterhash.cpp - written and placed in the public domain by Wei Dai
+// iterhash.cpp - originally written and placed in the public domain by Wei Dai
 
 #ifndef __GNUC__
 #define CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES
diff --git a/keccak.h b/keccak.h
index b4e2a018..ba94eaca 100644
--- a/keccak.h
+++ b/keccak.h
@@ -1,4 +1,4 @@
-// keccak.h - written and placed in the public domain by Wei Dai
+// keccak.h - originally written and placed in the public domain by Wei Dai
 
 //! \file keccak.h
 //! \brief Classes for Keccak message digests
diff --git a/lubyrack.h b/lubyrack.h
index 3808e931..25a75e84 100644
--- a/lubyrack.h
+++ b/lubyrack.h
@@ -1,4 +1,4 @@
-// lubyrack.h - written and placed in the public domain by Wei Dai
+// lubyrack.h - originally written and placed in the public domain by Wei Dai
 
 //! \file lubyrack.h
 //! \brief Classes for the Luby-Rackoff block cipher
diff --git a/luc.cpp b/luc.cpp
index 707b6f5e..6abe2e48 100644
--- a/luc.cpp
+++ b/luc.cpp
@@ -1,4 +1,4 @@
-// luc.cpp - written and placed in the public domain by Wei Dai
+// luc.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "luc.h"
diff --git a/luc.h b/luc.h
index 9ee44b96..49032a13 100644
--- a/luc.h
+++ b/luc.h
@@ -1,4 +1,4 @@
-// luc.h - written and placed in the public domain by Wei Dai
+// luc.h - originally written and placed in the public domain by Wei Dai
 
 //! \file luc.h
 //! \brief Classes for the LUC cryptosystem
diff --git a/mars.cpp b/mars.cpp
index af7e12fd..9fff388b 100644
--- a/mars.cpp
+++ b/mars.cpp
@@ -1,4 +1,4 @@
-// mars.cpp - written and placed in the public domain by Wei Dai
+// mars.cpp - originally written and placed in the public domain by Wei Dai
 
 // includes IBM's key setup "tweak" proposed in August 1999 (http://www.research.ibm.com/security/key-setup.txt)
 
diff --git a/mars.h b/mars.h
index a1060bc3..c9a1ce2f 100644
--- a/mars.h
+++ b/mars.h
@@ -1,4 +1,4 @@
-// mars.h - written and placed in the public domain by Wei Dai
+// mars.h - originally written and placed in the public domain by Wei Dai
 
 //! \file mars.h
 //! \brief Classes for the MARS block cipher (IBM AES submission)
diff --git a/mdc.h b/mdc.h
index 249e6e31..a84996e0 100644
--- a/mdc.h
+++ b/mdc.h
@@ -1,4 +1,4 @@
-// mdc.h - written and placed in the public domain by Wei Dai
+// mdc.h - originally written and placed in the public domain by Wei Dai
 
 #ifndef CRYPTOPP_MDC_H
 #define CRYPTOPP_MDC_H
diff --git a/misc.cpp b/misc.cpp
index d77c2c33..7bc646a2 100644
--- a/misc.cpp
+++ b/misc.cpp
@@ -1,4 +1,4 @@
-// misc.cpp - written and placed in the public domain by Wei Dai
+// misc.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "config.h"
diff --git a/misc.h b/misc.h
index 42b07f40..657a679e 100644
--- a/misc.h
+++ b/misc.h
@@ -1,5 +1,5 @@
 
-// misc.h - written and placed in the public domain by Wei Dai
+// misc.h - originally written and placed in the public domain by Wei Dai
 
 //! \file misc.h
 //! \brief Utility functions for the Crypto++ library.
diff --git a/modarith.h b/modarith.h
index 452bb580..5fff4275 100644
--- a/modarith.h
+++ b/modarith.h
@@ -1,4 +1,4 @@
-// modarith.h - written and placed in the public domain by Wei Dai
+// modarith.h - originally written and placed in the public domain by Wei Dai
 
 //! \file modarith.h
 //! \brief Class file for performing modular arithmetic.
diff --git a/modes.cpp b/modes.cpp
index 5bd6af13..03e8ba80 100644
--- a/modes.cpp
+++ b/modes.cpp
@@ -1,4 +1,4 @@
-// modes.cpp - written and placed in the public domain by Wei Dai
+// modes.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/modes.h b/modes.h
index 20c1de61..eb1a3ef6 100644
--- a/modes.h
+++ b/modes.h
@@ -1,4 +1,4 @@
-// modes.h - written and placed in the public domain by Wei Dai
+// modes.h - originally written and placed in the public domain by Wei Dai
 
 //! \file modes.h
 //! \brief Class file for modes of operation.
diff --git a/mqueue.cpp b/mqueue.cpp
index 8c071e27..3e473025 100644
--- a/mqueue.cpp
+++ b/mqueue.cpp
@@ -1,4 +1,4 @@
-// mqueue.cpp - written and placed in the public domain by Wei Dai
+// mqueue.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/mqv.cpp b/mqv.cpp
index 3bf6a252..5602eb05 100644
--- a/mqv.cpp
+++ b/mqv.cpp
@@ -1,4 +1,4 @@
-// mqv.cpp - written and placed in the public domain by Wei Dai
+// mqv.cpp - originally written and placed in the public domain by Wei Dai
 //           HMQV provided by Jeffrey Walton, Ray Clayton and Uri Blumenthal.
 //           FHMQV provided by Uri Blumenthal.
 
diff --git a/mqv.h b/mqv.h
index dd5ca134..c51a8452 100644
--- a/mqv.h
+++ b/mqv.h
@@ -1,4 +1,4 @@
-// mqv.h - written and placed in the public domain by Wei Dai
+// mqv.h - originally written and placed in the public domain by Wei Dai
 
 //! \file mqv.h
 //! \brief Classes for Menezes–Qu–Vanstone (MQV) key agreement
diff --git a/nbtheory.cpp b/nbtheory.cpp
index 6b81ce9c..8383d91c 100644
--- a/nbtheory.cpp
+++ b/nbtheory.cpp
@@ -1,4 +1,4 @@
-// nbtheory.cpp - written and placed in the public domain by Wei Dai
+// nbtheory.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/nbtheory.h b/nbtheory.h
index 54275810..8d7e4714 100644
--- a/nbtheory.h
+++ b/nbtheory.h
@@ -1,4 +1,4 @@
-// nbtheory.h - written and placed in the public domain by Wei Dai
+// nbtheory.h - originally written and placed in the public domain by Wei Dai
 
 //! \file nbtheory.h
 //! \brief Classes and functions  for number theoretic operations
diff --git a/network.cpp b/network.cpp
index acafae8a..31b3d1b6 100644
--- a/network.cpp
+++ b/network.cpp
@@ -1,4 +1,4 @@
-// network.cpp - written and placed in the public domain by Wei Dai
+// network.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/oaep.cpp b/oaep.cpp
index d2be610e..08d75a99 100644
--- a/oaep.cpp
+++ b/oaep.cpp
@@ -1,4 +1,4 @@
-// oaep.cpp - written and placed in the public domain by Wei Dai
+// oaep.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/oids.h b/oids.h
index ddaaff41..96c0b34f 100644
--- a/oids.h
+++ b/oids.h
@@ -1,4 +1,4 @@
-// oids.h - written and placed in the public domain by Wei Dai
+// oids.h - originally written and placed in the public domain by Wei Dai
 
 //! \file oids.h
 //! \brief ASN.1 object identifiers for algorthms and schemes
diff --git a/osrng.cpp b/osrng.cpp
index 337976c6..5f8f1639 100644
--- a/osrng.cpp
+++ b/osrng.cpp
@@ -1,4 +1,4 @@
-// osrng.cpp - written and placed in the public domain by Wei Dai
+// osrng.cpp - originally written and placed in the public domain by Wei Dai
 
 // Thanks to Leonard Janke for the suggestion for AutoSeededRandomPool.
 
diff --git a/osrng.h b/osrng.h
index c4631d84..a8dff745 100644
--- a/osrng.h
+++ b/osrng.h
@@ -1,4 +1,4 @@
-// osrng.h - written and placed in the public domain by Wei Dai
+// osrng.h - originally written and placed in the public domain by Wei Dai
 
 //! \file osrng.h
 //! \brief Classes for access to the operating system's random number generators
diff --git a/panama.cpp b/panama.cpp
index bd4ae802..b4b2b93e 100644
--- a/panama.cpp
+++ b/panama.cpp
@@ -1,4 +1,4 @@
-// panama.cpp - written and placed in the public domain by Wei Dai
+// panama.cpp - originally written and placed in the public domain by Wei Dai
 
 // use "cl /EP /P /DCRYPTOPP_GENERATE_X64_MASM panama.cpp" to generate MASM code
 
diff --git a/panama.h b/panama.h
index 1ec040e8..9fc3a2ea 100644
--- a/panama.h
+++ b/panama.h
@@ -1,4 +1,4 @@
-// panama.h - written and placed in the public domain by Wei Dai
+// panama.h - originally written and placed in the public domain by Wei Dai
 
 //! \file panama.h
 //! \brief Classes for Panama hash and stream cipher
diff --git a/pch.h b/pch.h
index 4be29001..2c77fd52 100644
--- a/pch.h
+++ b/pch.h
@@ -1,4 +1,4 @@
-// pch.h - written and placed in the public domain by Wei Dai
+// pch.h - originally written and placed in the public domain by Wei Dai
 
 //! \headerfile pch.h
 //! \brief Precompiled header file
diff --git a/pkcspad.cpp b/pkcspad.cpp
index a45751ff..322a5a26 100644
--- a/pkcspad.cpp
+++ b/pkcspad.cpp
@@ -1,4 +1,4 @@
-// pkcspad.cpp - written and placed in the public domain by Wei Dai
+// pkcspad.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/pkcspad.h b/pkcspad.h
index 8b8005e2..b75bce6a 100644
--- a/pkcspad.h
+++ b/pkcspad.h
@@ -1,4 +1,4 @@
-// pkcspad.h - written and placed in the public domain by Wei Dai
+// pkcspad.h - originally written and placed in the public domain by Wei Dai
 
 //! \file pkcspad.h
 //! \brief Classes for PKCS padding schemes
diff --git a/polynomi.cpp b/polynomi.cpp
index b88545bc..2305f80a 100644
--- a/polynomi.cpp
+++ b/polynomi.cpp
@@ -1,4 +1,4 @@
-// polynomi.cpp - written and placed in the public domain by Wei Dai
+// polynomi.cpp - originally written and placed in the public domain by Wei Dai
 
 // Part of the code for polynomial evaluation and interpolation
 // originally came from Hal Finney's public domain secsplit.c.
diff --git a/polynomi.h b/polynomi.h
index 7f8fe39c..2b904204 100644
--- a/polynomi.h
+++ b/polynomi.h
@@ -1,4 +1,4 @@
-// polynomi.h - written and placed in the public domain by Wei Dai
+// polynomi.h - originally written and placed in the public domain by Wei Dai
 
 //! \file
 //! \headerfile polynomi.h
diff --git a/pssr.cpp b/pssr.cpp
index 559408da..914b921f 100644
--- a/pssr.cpp
+++ b/pssr.cpp
@@ -1,4 +1,4 @@
-// pssr.cpp - written and placed in the public domain by Wei Dai
+// pssr.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "pssr.h"
diff --git a/pssr.h b/pssr.h
index 73eb66fa..a66667c9 100644
--- a/pssr.h
+++ b/pssr.h
@@ -1,4 +1,4 @@
-// pssr.h - written and placed in the public domain by Wei Dai
+// pssr.h - originally written and placed in the public domain by Wei Dai
 
 //! \file pssr.h
 //! \brief Classes for probablistic signature schemes
diff --git a/pubkey.cpp b/pubkey.cpp
index 3890083e..7ce80412 100644
--- a/pubkey.cpp
+++ b/pubkey.cpp
@@ -1,4 +1,4 @@
-// pubkey.cpp - written and placed in the public domain by Wei Dai
+// pubkey.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "config.h"
diff --git a/pubkey.h b/pubkey.h
index aadc3c26..2bbb88be 100644
--- a/pubkey.h
+++ b/pubkey.h
@@ -1,4 +1,4 @@
-// pubkey.h - written and placed in the public domain by Wei Dai
+// pubkey.h - originally written and placed in the public domain by Wei Dai
 
 //! \file pubkey.h
 //! \brief This file contains helper classes/functions for implementing public key algorithms.
diff --git a/pwdbased.h b/pwdbased.h
index 0a23cbbe..1bb323d6 100644
--- a/pwdbased.h
+++ b/pwdbased.h
@@ -1,4 +1,4 @@
-// pwdbased.h - written and placed in the public domain by Wei Dai
+// pwdbased.h - originally written and placed in the public domain by Wei Dai
 
 //! \file pwdbased.h
 //! \brief Password based key derivation functions
diff --git a/queue.cpp b/queue.cpp
index fd236381..a0353747 100644
--- a/queue.cpp
+++ b/queue.cpp
@@ -1,4 +1,4 @@
-// queue.cpp - written and placed in the public domain by Wei Dai
+// queue.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/queue.h b/queue.h
index e1ed4da6..a7e3a755 100644
--- a/queue.h
+++ b/queue.h
@@ -1,4 +1,4 @@
-// queue.h - written and placed in the public domain by Wei Dai
+// queue.h - originally written and placed in the public domain by Wei Dai
 
 //! \file
 //! \headerfile queue.h
diff --git a/rabin.cpp b/rabin.cpp
index f8688eab..410202e9 100644
--- a/rabin.cpp
+++ b/rabin.cpp
@@ -1,4 +1,4 @@
-// rabin.cpp - written and placed in the public domain by Wei Dai
+// rabin.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "rabin.h"
diff --git a/rabin.h b/rabin.h
index 54fbe12e..30c5b69a 100644
--- a/rabin.h
+++ b/rabin.h
@@ -1,4 +1,4 @@
-// rabin.h - written and placed in the public domain by Wei Dai
+// rabin.h - originally written and placed in the public domain by Wei Dai
 
 //! \file rabin.h
 //! \brief Classes for Rabin encryption and signature schemes
diff --git a/randpool.cpp b/randpool.cpp
index ad272709..51cec5d6 100644
--- a/randpool.cpp
+++ b/randpool.cpp
@@ -1,4 +1,4 @@
-// randpool.cpp - written and placed in the public domain by Wei Dai
+// randpool.cpp - originally written and placed in the public domain by Wei Dai
 // RandomPool used to follow the design of randpool in PGP 2.6.x,
 // but as of version 5.5 it has been redesigned to reduce the risk
 // of reusing random numbers after state rollback (which may occur
diff --git a/randpool.h b/randpool.h
index 86d1750b..c356dca6 100644
--- a/randpool.h
+++ b/randpool.h
@@ -1,4 +1,4 @@
-// randpool.h - written and placed in the public domain by Wei Dai
+// randpool.h - originally written and placed in the public domain by Wei Dai
 
 //! \file randpool.h
 //! \brief Class file for Randomness Pool
diff --git a/rc2.cpp b/rc2.cpp
index 523cc265..a4e0079f 100644
--- a/rc2.cpp
+++ b/rc2.cpp
@@ -1,4 +1,4 @@
-// rc2.cpp - written and placed in the public domain by Wei Dai
+// rc2.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "rc2.h"
diff --git a/rc2.h b/rc2.h
index 6f989be6..30c29e01 100644
--- a/rc2.h
+++ b/rc2.h
@@ -1,4 +1,4 @@
-// rc2.h - written and placed in the public domain by Wei Dai
+// rc2.h - originally written and placed in the public domain by Wei Dai
 
 //! \file rc2.h
 //! \brief Classes for the RC2 block cipher
diff --git a/rc5.cpp b/rc5.cpp
index 79de713d..f17667f2 100644
--- a/rc5.cpp
+++ b/rc5.cpp
@@ -1,4 +1,4 @@
-// rc5.cpp - written and placed in the public domain by Wei Dai
+// rc5.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "rc5.h"
diff --git a/rc5.h b/rc5.h
index eeedfa98..3881160c 100644
--- a/rc5.h
+++ b/rc5.h
@@ -1,4 +1,4 @@
-// rc5.h - written and placed in the public domain by Wei Dai
+// rc5.h - originally written and placed in the public domain by Wei Dai
 
 //! \file rc5.h
 //! \brief Classes for the RC5 block cipher
diff --git a/rc6.h b/rc6.h
index 8894a42f..2ab4455c 100644
--- a/rc6.h
+++ b/rc6.h
@@ -1,4 +1,4 @@
-// rc6.h - written and placed in the public domain by Wei Dai
+// rc6.h - originally written and placed in the public domain by Wei Dai
 
 //! \file rc6.h
 //! \brief Classes for the RC6 block cipher
diff --git a/regtest.cpp b/regtest.cpp
index 56851e7e..bb9859dc 100644
--- a/regtest.cpp
+++ b/regtest.cpp
@@ -1,4 +1,4 @@
-// regtest.cpp - written and placed in the public domain by Wei Dai
+// regtest.cpp - originally written and placed in the public domain by Wei Dai
 
 #define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
 
diff --git a/rijndael.h b/rijndael.h
index 9ae534bf..32d69867 100644
--- a/rijndael.h
+++ b/rijndael.h
@@ -1,4 +1,4 @@
-// rijndael.h - written and placed in the public domain by Wei Dai
+// rijndael.h - originally written and placed in the public domain by Wei Dai
 
 //! \file rijndael.h
 //! \brief Classes for Rijndael encryption algorithm
diff --git a/ripemd.h b/ripemd.h
index 23ed9de6..a73e3409 100644
--- a/ripemd.h
+++ b/ripemd.h
@@ -1,4 +1,4 @@
-// ripemd.h - written and placed in the public domain by Wei Dai
+// ripemd.h - originally written and placed in the public domain by Wei Dai
 
 //! \file
 //! \brief Classes for RIPEMD message digest
diff --git a/rng.cpp b/rng.cpp
index 22141cb7..3414b906 100644
--- a/rng.cpp
+++ b/rng.cpp
@@ -1,4 +1,4 @@
-// rng.cpp - written and placed in the public domain by Wei Dai
+// rng.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/rng.h b/rng.h
index 1fad1955..9833bf08 100644
--- a/rng.h
+++ b/rng.h
@@ -1,4 +1,4 @@
-// rng.h - written and placed in the public domain by Wei Dai
+// rng.h - originally written and placed in the public domain by Wei Dai
 
 //! \file rng.h
 //! \brief Miscellaneous classes for RNGs
diff --git a/rsa.cpp b/rsa.cpp
index 24532c7b..73d796e9 100644
--- a/rsa.cpp
+++ b/rsa.cpp
@@ -1,4 +1,4 @@
-// rsa.cpp - written and placed in the public domain by Wei Dai
+// rsa.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "rsa.h"
diff --git a/rsa.h b/rsa.h
index 70aaecf6..9a3d3a7b 100644
--- a/rsa.h
+++ b/rsa.h
@@ -1,4 +1,4 @@
-// rsa.h - written and placed in the public domain by Wei Dai
+// rsa.h - originally written and placed in the public domain by Wei Dai
 
 //! \file rsa.h
 //! \brief Classes for the RSA cryptosystem
diff --git a/rw.cpp b/rw.cpp
index 56584d59..d1b9731d 100644
--- a/rw.cpp
+++ b/rw.cpp
@@ -1,4 +1,4 @@
-// rw.cpp - written and placed in the public domain by Wei Dai
+// rw.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/rw.h b/rw.h
index acfad02c..5fcfddf4 100644
--- a/rw.h
+++ b/rw.h
@@ -1,4 +1,4 @@
-// rw.h - written and placed in the public domain by Wei Dai
+// rw.h - originally written and placed in the public domain by Wei Dai
 
 //! \file rw.h
 //! \brief Classes for Rabin-Williams signature scheme
diff --git a/safer.h b/safer.h
index d9ba4f65..0972ac1e 100644
--- a/safer.h
+++ b/safer.h
@@ -1,4 +1,4 @@
-// safer.h - written and placed in the public domain by Wei Dai
+// safer.h - originally written and placed in the public domain by Wei Dai
 
 //! \file safer.h
 //! \brief Classes for the SAFER and SAFER-K block ciphers
diff --git a/salsa.cpp b/salsa.cpp
index 528d8615..eb58164e 100644
--- a/salsa.cpp
+++ b/salsa.cpp
@@ -1,4 +1,4 @@
-// salsa.cpp - written and placed in the public domain by Wei Dai
+// salsa.cpp - originally written and placed in the public domain by Wei Dai
 
 // use "cl /EP /P /DCRYPTOPP_GENERATE_X64_MASM salsa.cpp" to generate MASM code
 
diff --git a/salsa.h b/salsa.h
index bb7a5ca7..f3bede3b 100644
--- a/salsa.h
+++ b/salsa.h
@@ -1,4 +1,4 @@
-// salsa.h - written and placed in the public domain by Wei Dai
+// salsa.h - originally written and placed in the public domain by Wei Dai
 
 //! \file salsa.h
 //! \brief Classes for Salsa and Salsa20 stream ciphers
diff --git a/seal.cpp b/seal.cpp
index 99aef772..d0ba4fce 100644
--- a/seal.cpp
+++ b/seal.cpp
@@ -1,4 +1,4 @@
-// seal.cpp - written and placed in the public domain by Wei Dai
+// seal.cpp - originally written and placed in the public domain by Wei Dai
 // updated to SEAL 3.0 by Leonard Janke
 
 #include "pch.h"
diff --git a/seal.h b/seal.h
index d6ede0fc..2e101535 100644
--- a/seal.h
+++ b/seal.h
@@ -1,4 +1,4 @@
-// seal.h - written and placed in the public domain by Wei Dai
+// seal.h - originally written and placed in the public domain by Wei Dai
 
 //! \file seal.h
 //! \brief Classes for SEAL stream cipher
diff --git a/secblock.h b/secblock.h
index 4cf97068..30d84619 100644
--- a/secblock.h
+++ b/secblock.h
@@ -1,4 +1,4 @@
-// secblock.h - written and placed in the public domain by Wei Dai
+// secblock.h - originally written and placed in the public domain by Wei Dai
 
 //! \file secblock.h
 //! \brief Classes and functions for secure memory allocations.
diff --git a/seckey.h b/seckey.h
index 92e38395..0cba30e3 100644
--- a/seckey.h
+++ b/seckey.h
@@ -1,4 +1,4 @@
-// seckey.h - written and placed in the public domain by Wei Dai
+// seckey.h - originally written and placed in the public domain by Wei Dai
 
 //! \file seckey.h
 //! \brief Classes and functions for implementing secret key algorithms.
diff --git a/seed.cpp b/seed.cpp
index f6a9690f..75410c01 100644
--- a/seed.cpp
+++ b/seed.cpp
@@ -1,4 +1,4 @@
-// seed.cpp - written and placed in the public domain by Wei Dai
+// seed.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "seed.h"
diff --git a/seed.h b/seed.h
index 00a9cc1b..554db308 100644
--- a/seed.h
+++ b/seed.h
@@ -1,4 +1,4 @@
-// seed.h - written and placed in the public domain by Wei Dai
+// seed.h - originally written and placed in the public domain by Wei Dai
 
 //! \file seed.h
 //! \brief Classes for the SEED block cipher
diff --git a/serpent.cpp b/serpent.cpp
index 3f8b2751..4b41808c 100644
--- a/serpent.cpp
+++ b/serpent.cpp
@@ -1,4 +1,4 @@
-// serpent.cpp - written and placed in the public domain by Wei Dai
+// serpent.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/serpent.h b/serpent.h
index e769d20c..d5f12499 100644
--- a/serpent.h
+++ b/serpent.h
@@ -1,4 +1,4 @@
-// serpent.h - written and placed in the public domain by Wei Dai
+// serpent.h - originally written and placed in the public domain by Wei Dai
 
 //! \file serpent.h
 //! \brief Classes for the Serpent block cipher
diff --git a/sha.h b/sha.h
index b80817aa..455d0af4 100644
--- a/sha.h
+++ b/sha.h
@@ -1,4 +1,4 @@
-// sha.h - written and placed in the public domain by Wei Dai
+// sha.h - originally written and placed in the public domain by Wei Dai
 
 //! \file sha.h
 //! \brief Classes for SHA-1 and SHA-2 family of message digests
diff --git a/sha3.h b/sha3.h
index acf74773..ac393ab4 100644
--- a/sha3.h
+++ b/sha3.h
@@ -1,4 +1,4 @@
-// sha3.h - written and placed in the public domain by Wei Dai
+// sha3.h - originally written and placed in the public domain by Wei Dai
 
 //! \file sha3.h
 //! \brief Classes for SHA3 message digests
diff --git a/shacal2.h b/shacal2.h
index 6be71e1e..2a92cb6d 100644
--- a/shacal2.h
+++ b/shacal2.h
@@ -1,4 +1,4 @@
-// shacal.h - written and placed in the public domain by Wei Dai
+// shacal.h - originally written and placed in the public domain by Wei Dai
 
 //! \file shacal2.h
 //! \brief Classes for the SHACAL-2 block cipher
diff --git a/shark.cpp b/shark.cpp
index e84debee..0eb5eaeb 100644
--- a/shark.cpp
+++ b/shark.cpp
@@ -1,4 +1,4 @@
-// shark.cpp - written and placed in the public domain by Wei Dai
+// shark.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "shark.h"
diff --git a/shark.h b/shark.h
index 8e2d2a0e..8e2f92e5 100644
--- a/shark.h
+++ b/shark.h
@@ -1,4 +1,4 @@
-// shark.h - written and placed in the public domain by Wei Dai
+// shark.h - originally written and placed in the public domain by Wei Dai
 
 //! \file shark.h
 //! \brief Classes for the SHARK block cipher
diff --git a/simple.cpp b/simple.cpp
index 22db2fdb..b897cc12 100644
--- a/simple.cpp
+++ b/simple.cpp
@@ -1,4 +1,4 @@
-// simple.cpp - written and placed in the public domain by Wei Dai
+// simple.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/simple.h b/simple.h
index 12e76157..7b0e8ca6 100644
--- a/simple.h
+++ b/simple.h
@@ -1,4 +1,4 @@
-// simple.h - written and placed in the public domain by Wei Dai
+// simple.h - originally written and placed in the public domain by Wei Dai
 
 //! \file simple.h
 //! \brief Classes providing basic library services.
diff --git a/skipjack.h b/skipjack.h
index 3378931b..acc5bc98 100644
--- a/skipjack.h
+++ b/skipjack.h
@@ -1,4 +1,4 @@
-// skipjack.h - written and placed in the public domain by Wei Dai
+// skipjack.h - originally written and placed in the public domain by Wei Dai
 
 //! \file skipjack.h
 //! \brief Classes for the SKIPJACK block cipher
diff --git a/smartptr.h b/smartptr.h
index 38e1aeef..605be2ed 100644
--- a/smartptr.h
+++ b/smartptr.h
@@ -1,4 +1,4 @@
-// smartptr.h - written and placed in the public domain by Wei Dai
+// smartptr.h - originally written and placed in the public domain by Wei Dai
 
 //! \file
 //! \headerfile smartptr.h
diff --git a/socketft.cpp b/socketft.cpp
index 7aebcede..64a1f29c 100644
--- a/socketft.cpp
+++ b/socketft.cpp
@@ -1,4 +1,4 @@
-// socketft.cpp - written and placed in the public domain by Wei Dai
+// socketft.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "config.h"
diff --git a/sosemanuk.cpp b/sosemanuk.cpp
index 366fe358..b96192b8 100644
--- a/sosemanuk.cpp
+++ b/sosemanuk.cpp
@@ -1,4 +1,4 @@
-// sosemanuk.cpp - written and placed in the public domain by Wei Dai
+// sosemanuk.cpp - originally written and placed in the public domain by Wei Dai
 
 // use "cl /EP /P /DCRYPTOPP_GENERATE_X64_MASM sosemanuk.cpp" to generate MASM code
 
diff --git a/sosemanuk.h b/sosemanuk.h
index 1a0da4cc..a1f3f2f5 100644
--- a/sosemanuk.h
+++ b/sosemanuk.h
@@ -1,4 +1,4 @@
-// sosemanuk.h - written and placed in the public domain by Wei Dai
+// sosemanuk.h - originally written and placed in the public domain by Wei Dai
 
 //! \file sosemanuk.h
 //! \brief Classes for Sosemanuk stream cipher
diff --git a/square.cpp b/square.cpp
index b0912900..0b960323 100644
--- a/square.cpp
+++ b/square.cpp
@@ -1,4 +1,4 @@
-// square.cpp - written and placed in the public domain by Wei Dai
+// square.cpp - originally written and placed in the public domain by Wei Dai
 // Based on Paulo S.L.M. Barreto's public domain implementation
 
 #include "pch.h"
diff --git a/square.h b/square.h
index 01e6ec70..0b743f67 100644
--- a/square.h
+++ b/square.h
@@ -1,4 +1,4 @@
-// square.h - written and placed in the public domain by Wei Dai
+// square.h - originally written and placed in the public domain by Wei Dai
 
 //! \file square.h
 //! \brief Classes for the Square block cipher
diff --git a/stdcpp.h b/stdcpp.h
index b4fae58a..d1594402 100644
--- a/stdcpp.h
+++ b/stdcpp.h
@@ -70,11 +70,4 @@ namespace std {
 # include <malloc.h>
 #endif
 
-#ifdef _MSC_VER
-# pragma warning(disable: 4231)	// re-disable this
-# ifdef _CRTAPI1
-#  define CRYPTOPP_MSVCRT6
-# endif
-#endif
-
 #endif
diff --git a/strciphr.cpp b/strciphr.cpp
index a0197c94..6aae6318 100644
--- a/strciphr.cpp
+++ b/strciphr.cpp
@@ -1,4 +1,4 @@
-// strciphr.cpp - written and placed in the public domain by Wei Dai
+// strciphr.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/strciphr.h b/strciphr.h
index fbc97d5d..5da9166a 100644
--- a/strciphr.h
+++ b/strciphr.h
@@ -1,4 +1,4 @@
-// strciphr.h - written and placed in the public domain by Wei Dai
+// strciphr.h - originally written and placed in the public domain by Wei Dai
 
 //! \file strciphr.h
 //! \brief Classes for implementing stream ciphers
diff --git a/tea.h b/tea.h
index 888f5882..200c8fbb 100644
--- a/tea.h
+++ b/tea.h
@@ -1,4 +1,4 @@
-// tea.h - written and placed in the public domain by Wei Dai
+// tea.h - originally written and placed in the public domain by Wei Dai
 
 //! \file tea.h
 //! \brief Classes for the TEA, BTEA and XTEA block ciphers
diff --git a/test.cpp b/test.cpp
index 65b27d4c..feaf51ce 100644
--- a/test.cpp
+++ b/test.cpp
@@ -1,4 +1,4 @@
-// test.cpp - written and placed in the public domain by Wei Dai
+// test.cpp - originally written and placed in the public domain by Wei Dai
 
 #define CRYPTOPP_DEFAULT_NO_DLL
 #define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
diff --git a/tiger.cpp b/tiger.cpp
index 5f1e2ca0..b048c9a6 100644
--- a/tiger.cpp
+++ b/tiger.cpp
@@ -1,4 +1,4 @@
-// tiger.cpp - written and placed in the public domain by Wei Dai
+// tiger.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "config.h"
diff --git a/trdlocal.cpp b/trdlocal.cpp
index 0d9d42f1..a9b42bc6 100644
--- a/trdlocal.cpp
+++ b/trdlocal.cpp
@@ -1,4 +1,4 @@
-// trdlocal.cpp - written and placed in the public domain by Wei Dai
+// trdlocal.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "config.h"
diff --git a/twofish.h b/twofish.h
index 93f592c2..d6940f04 100644
--- a/twofish.h
+++ b/twofish.h
@@ -1,4 +1,4 @@
-// twofish.h - written and placed in the public domain by Wei Dai
+// twofish.h - originally written and placed in the public domain by Wei Dai
 
 //! \file twofish.h
 //! \brief Classes for the Twofish block cipher
diff --git a/validat0.cpp b/validat0.cpp
index 054122e6..5b1e549f 100644
--- a/validat0.cpp
+++ b/validat0.cpp
@@ -1,4 +1,4 @@
-// validat0.cpp - written and placed in the public domain by Wei Dai and Jeffrey Walton
+// validat0.cpp - originally written and placed in the public domain by Wei Dai and Jeffrey Walton
 //                Routines in this source file are only tested in Debug builds
 
 #include "pch.h"
diff --git a/validat1.cpp b/validat1.cpp
index 18f7caa9..471502b7 100644
--- a/validat1.cpp
+++ b/validat1.cpp
@@ -1,4 +1,4 @@
-// validat1.cpp - written and placed in the public domain by Wei Dai
+// validat1.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/validat2.cpp b/validat2.cpp
index d7c9e1b9..68f2be8a 100644
--- a/validat2.cpp
+++ b/validat2.cpp
@@ -1,4 +1,4 @@
-// validat2.cpp - written and placed in the public domain by Wei Dai
+// validat2.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/validat3.cpp b/validat3.cpp
index 6fd6ab5e..f7f32786 100644
--- a/validat3.cpp
+++ b/validat3.cpp
@@ -1,4 +1,4 @@
-// validat3.cpp - written and placed in the public domain by Wei Dai
+// validat3.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/vmac.cpp b/vmac.cpp
index c50f9958..0256cbc8 100644
--- a/vmac.cpp
+++ b/vmac.cpp
@@ -1,4 +1,4 @@
-// vmac.cpp - written and placed in the public domain by Wei Dai
+// vmac.cpp - originally written and placed in the public domain by Wei Dai
 // based on Ted Krovetz's public domain vmac.c and draft-krovetz-vmac-01.txt
 
 #include "pch.h"
diff --git a/vmac.h b/vmac.h
index 0ce06012..de95a5e5 100644
--- a/vmac.h
+++ b/vmac.h
@@ -1,4 +1,4 @@
-// vmac.h - written and placed in the public domain by Wei Dai
+// vmac.h - originally written and placed in the public domain by Wei Dai
 
 //! \file vmac.h
 //! \brief Classes for the VMAC message authentication code
diff --git a/wait.cpp b/wait.cpp
index e904097f..a50d9f85 100644
--- a/wait.cpp
+++ b/wait.cpp
@@ -1,4 +1,4 @@
-// wait.cpp - written and placed in the public domain by Wei Dai
+// wait.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "config.h"
diff --git a/wait.h b/wait.h
index fee768d2..4e51589f 100644
--- a/wait.h
+++ b/wait.h
@@ -1,4 +1,4 @@
-// wait.h - written and placed in the public domain by Wei Dai
+// wait.h - originally written and placed in the public domain by Wei Dai
 
 #ifndef CRYPTOPP_WAIT_H
 #define CRYPTOPP_WAIT_H
diff --git a/wake.cpp b/wake.cpp
index 87a1f66b..8501bcf7 100644
--- a/wake.cpp
+++ b/wake.cpp
@@ -1,4 +1,4 @@
-// wake.cpp - written and placed in the public domain by Wei Dai
+// wake.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/wake.h b/wake.h
index 55736cb5..81060801 100644
--- a/wake.h
+++ b/wake.h
@@ -1,4 +1,4 @@
-// wake.h - written and placed in the public domain by Wei Dai
+// wake.h - originally written and placed in the public domain by Wei Dai
 
 //! \file wake.h
 //! \brief Classes for WAKE stream cipher
diff --git a/winpipes.cpp b/winpipes.cpp
index 3c25e84b..b477673d 100644
--- a/winpipes.cpp
+++ b/winpipes.cpp
@@ -1,4 +1,4 @@
-// winpipes.cpp - written and placed in the public domain by Wei Dai
+// winpipes.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 #include "config.h"
diff --git a/xtr.cpp b/xtr.cpp
index 0de51f80..34b3ecf4 100644
--- a/xtr.cpp
+++ b/xtr.cpp
@@ -1,4 +1,4 @@
-// xtr.cpp - written and placed in the public domain by Wei Dai
+// xtr.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/xtrcrypt.cpp b/xtrcrypt.cpp
index 9f60a951..7ffc5b41 100644
--- a/xtrcrypt.cpp
+++ b/xtrcrypt.cpp
@@ -1,4 +1,4 @@
-// xtrcrypt.cpp - written and placed in the public domain by Wei Dai
+// xtrcrypt.cpp - originally written and placed in the public domain by Wei Dai
 
 #include "pch.h"
 
diff --git a/zdeflate.cpp b/zdeflate.cpp
index e1554ec8..a4b8e786 100644
--- a/zdeflate.cpp
+++ b/zdeflate.cpp
@@ -1,4 +1,4 @@
-// zdeflate.cpp - written and placed in the public domain by Wei Dai
+// zdeflate.cpp - originally written and placed in the public domain by Wei Dai
 
 // Many of the algorithms and tables used here came from the deflate implementation
 // by Jean-loup Gailly, which was included in Crypto++ 4.0 and earlier. I completely
diff --git a/zdeflate.h b/zdeflate.h
index a1608901..07a10e60 100644
--- a/zdeflate.h
+++ b/zdeflate.h
@@ -1,4 +1,4 @@
-// zdeflate.h - written and placed in the public domain by Wei Dai
+// zdeflate.h - originally written and placed in the public domain by Wei Dai
 
 //! \file zdeflate.h
 //! \brief DEFLATE compression and decompression (RFC 1951)
diff --git a/zinflate.cpp b/zinflate.cpp
index da473f35..c40a5883 100644
--- a/zinflate.cpp
+++ b/zinflate.cpp
@@ -1,4 +1,4 @@
-// zinflate.cpp - written and placed in the public domain by Wei Dai
+// zinflate.cpp - originally written and placed in the public domain by Wei Dai
 
 // This is a complete reimplementation of the DEFLATE decompression algorithm.
 // It should not be affected by any security vulnerabilities in the zlib
diff --git a/zlib.cpp b/zlib.cpp
index 12b1f633..58dd8bc2 100644
--- a/zlib.cpp
+++ b/zlib.cpp
@@ -1,4 +1,4 @@
-// zlib.cpp - written and placed in the public domain by Wei Dai
+// zlib.cpp - originally written and placed in the public domain by Wei Dai
 
 // "zlib" is the name of a well known C language compression library
 // (http://www.zlib.org) and also the name of a compression format