Cleanup head notes and includes

bench1.cpp

@@ -6,17 +6,13 @@
 #include "validate.h"
 
 #include "cpu.h"
-#include "files.h"
+#include "drbg.h"
-#include "filters.h"
-#include "hex.h"
 #include "factory.h"
+#include "algparam.h"
+#include "argnames.h"
 #include "smartptr.h"
 #include "stdcpp.h"
 
-#include "drbg.h"
-#include "rdrand.h"
-#include "padlkrng.h"
-
 #if CRYPTOPP_MSC_VERSION
 # pragma warning(disable: 4355)
 #endif

bench2.cpp

@@ -1,4 +1,4 @@
-// bench1.cpp - originally written and placed in the public domain by Wei Dai
+// bench2.cpp - originally written and placed in the public domain by Wei Dai
 //              CryptoPP::Test namespace added by JW in February 2017
 
 #include "cryptlib.h"
@@ -6,18 +6,12 @@
 #include "validate.h"
 
 #include "cpu.h"
-#include "files.h"
-#include "filters.h"
-#include "hex.h"
 #include "factory.h"
+#include "algparam.h"
+#include "argnames.h"
 #include "smartptr.h"
 #include "stdcpp.h"
 
-#include "modes.h"
-#include "aes.h"
-#include "kalyna.h"
-#include "threefish.h"
-
 #if CRYPTOPP_MSC_VERSION
 # pragma warning(disable: 4355)
 #endif

bench3.cpp

@@ -1,10 +1,17 @@
-// bench2.cpp - originally written and placed in the public domain by Wei Dai
+// bench3.cpp - originally written and placed in the public domain by Wei Dai
 //              CryptoPP::Test namespace added by JW in February 2017
 
 #include "cryptlib.h"
 #include "bench.h"
 #include "validate.h"
 
+#include "cpu.h"
+#include "factory.h"
+#include "algparam.h"
+#include "argnames.h"
+#include "smartptr.h"
+#include "stdcpp.h"
+
 #include "pubkey.h"
 #include "gfpcrypt.h"
 #include "eccrypto.h"