From fa513df38084b41eb0d46d9f2d409bcf8f5b698f Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Fri, 27 Jul 2018 21:18:51 -0400
Subject: [PATCH] Cleanup head notes and includes

---
 regtest1.cpp | 3 ++-
 regtest2.cpp | 7 ++++---
 regtest3.cpp | 8 ++++----
 regtest4.cpp | 5 +++--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/regtest1.cpp b/regtest1.cpp
index 15f490cd..a57ca63b 100644
--- a/regtest1.cpp
+++ b/regtest1.cpp
@@ -1,5 +1,6 @@
 // regtest1.cpp - originally written and placed in the public domain by Wei Dai
-//                regtest.cpp split into 3 files due to OOM kills by JW in April 2017
+//                regtest.cpp split into 3 files due to OOM kills by JW
+//                in April 2017. A second split occured in July 2018.
 
 #define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
 
diff --git a/regtest2.cpp b/regtest2.cpp
index 29d0a2c9..3d1a917c 100644
--- a/regtest2.cpp
+++ b/regtest2.cpp
@@ -1,5 +1,6 @@
 // regtest2.cpp - originally written and placed in the public domain by Wei Dai
-//                regtest.cpp split into 3 files due to OOM kills by JW in April 2017
+//                regtest.cpp split into 3 files due to OOM kills by JW
+//                in April 2017. A second split occured in July 2018.
 
 #define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
 
@@ -81,6 +82,8 @@ void RegisterFactories2()
 // Stream ciphers
 void RegisterFactories3()
 {
+	RegisterSymmetricCipherDefaultFactories<Weak::MARC4>();
+	RegisterSymmetricCipherDefaultFactories<SEAL<> >();
 	RegisterSymmetricCipherDefaultFactories<SEAL<LittleEndian> >();
 	RegisterSymmetricCipherDefaultFactories<WAKE_OFB<LittleEndian> >();
 	RegisterSymmetricCipherDefaultFactories<WAKE_OFB<BigEndian> >();
@@ -97,6 +100,4 @@ void RegisterFactories3()
 	RegisterSymmetricCipherDefaultFactories<RabbitWithIV>();
 	RegisterSymmetricCipherDefaultFactories<HC128>();
 	RegisterSymmetricCipherDefaultFactories<HC256>();
-	RegisterSymmetricCipherDefaultFactories<Weak::MARC4>();
-	RegisterSymmetricCipherDefaultFactories<SEAL<> >();
 }
diff --git a/regtest3.cpp b/regtest3.cpp
index 28b936f6..b1267b65 100644
--- a/regtest3.cpp
+++ b/regtest3.cpp
@@ -1,5 +1,6 @@
-// regtest2.cpp - originally written and placed in the public domain by Wei Dai
-//                regtest.cpp split into 3 files due to OOM kills by JW in April 2017
+// regtest3.cpp - originally written and placed in the public domain by Wei Dai
+//                regtest.cpp split into 3 files due to OOM kills by JW
+//                in April 2017. A second split occured in July 2018.
 
 #define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
 
@@ -10,6 +11,7 @@
 
 #include "modes.h"
 #include "aria.h"
+#include "seed.h"
 #include "hight.h"
 #include "camellia.h"
 #include "shacal2.h"
@@ -37,8 +39,6 @@
 #include "rc5.h"
 #include "skipjack.h"
 #include "blowfish.h"
-#include "seed.h"
-#include "wake.h"
 
 // Aggressive stack checking with VS2005 SP1 and above.
 #if (_MSC_FULL_VER >= 140050727)
diff --git a/regtest4.cpp b/regtest4.cpp
index a8b6f095..87c89477 100644
--- a/regtest4.cpp
+++ b/regtest4.cpp
@@ -1,5 +1,6 @@
-// regtest.cpp - originally written and placed in the public domain by Wei Dai
-//                regtest.cpp split into 3 files due to OOM kills by JW in April 2017
+// regtest4.cpp - originally written and placed in the public domain by Wei Dai
+//                regtest.cpp split into 3 files due to OOM kills by JW
+//                in April 2017. A second split occured in July 2018.
 
 #define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1