diff --git a/algebra.h b/algebra.h
index 136bbeda..19b6ced1 100644
--- a/algebra.h
+++ b/algebra.h
@@ -2,6 +2,7 @@
 #define CRYPTOPP_ALGEBRA_H
 
 #include "config.h"
+#include "integer.h"
 #include "misc.h"
 
 NAMESPACE_BEGIN(CryptoPP)
diff --git a/algparam.h b/algparam.h
index 497f0e6a..ca5f2c4a 100644
--- a/algparam.h
+++ b/algparam.h
@@ -3,6 +3,7 @@
 
 #include "cryptlib.h"
 #include "smartptr.h"
+#include "integer.h"
 #include "secblock.h"
 
 #if GCC_DIAGNOSTIC_AWARE
diff --git a/argnames.h b/argnames.h
index e9617252..46ebd1f5 100644
--- a/argnames.h
+++ b/argnames.h
@@ -2,6 +2,7 @@
 #define CRYPTOPP_ARGNAMES_H
 
 #include "cryptlib.h"
+#include "integer.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 
diff --git a/blumshub.h b/blumshub.h
index 2c5fb20e..5955f69c 100644
--- a/blumshub.h
+++ b/blumshub.h
@@ -1,6 +1,8 @@
 #ifndef CRYPTOPP_BLUMSHUB_H
 #define CRYPTOPP_BLUMSHUB_H
 
+#include "config.h"
+#include "integer.h"
 #include "modarith.h"
 
 NAMESPACE_BEGIN(CryptoPP)
diff --git a/datatest.cpp b/datatest.cpp
index 63675007..a7047138 100644
--- a/datatest.cpp
+++ b/datatest.cpp
@@ -1,5 +1,8 @@
-#include "factory.h"
+// datatest.cpp - written and placed in public domain by Wei Dai
+
+#include "config.h"
 #include "integer.h"
+#include "factory.h"
 #include "filters.h"
 #include "hex.h"
 #include "randpool.h"
diff --git a/dsa.h b/dsa.h
index 6ae03877..3298f940 100644
--- a/dsa.h
+++ b/dsa.h
@@ -4,6 +4,8 @@
 /** \file
 */
 
+#include "config.h"
+#include "integer.h"
 #include "gfpcrypt.h"
 
 NAMESPACE_BEGIN(CryptoPP)
diff --git a/ec2n.h b/ec2n.h
index ed172b0e..ce3734f0 100644
--- a/ec2n.h
+++ b/ec2n.h
@@ -1,6 +1,8 @@
 #ifndef CRYPTOPP_EC2N_H
 #define CRYPTOPP_EC2N_H
 
+#include "config.h"
+#include "integer.h"
 #include "gf2n.h"
 #include "eprecomp.h"
 #include "smartptr.h"
diff --git a/eccrypto.h b/eccrypto.h
index be742668..2f6370ef 100644
--- a/eccrypto.h
+++ b/eccrypto.h
@@ -4,8 +4,9 @@
 /*! \file
 */
 
-#include "pubkey.h"
+#include "config.h"
 #include "integer.h"
+#include "pubkey.h"
 #include "asn.h"
 #include "hmac.h"
 #include "sha.h"
diff --git a/ecp.h b/ecp.h
index ef7f67d3..59bb609f 100644
--- a/ecp.h
+++ b/ecp.h
@@ -1,6 +1,8 @@
 #ifndef CRYPTOPP_ECP_H
 #define CRYPTOPP_ECP_H
 
+#include "config.h"
+#include "integer.h"
 #include "modarith.h"
 #include "eprecomp.h"
 #include "smartptr.h"
diff --git a/elgamal.h b/elgamal.h
index 9afc30ee..16c7c6dc 100644
--- a/elgamal.h
+++ b/elgamal.h
@@ -1,6 +1,8 @@
 #ifndef CRYPTOPP_ELGAMAL_H
 #define CRYPTOPP_ELGAMAL_H
 
+#include "config.h"
+#include "integer.h"
 #include "modexppc.h"
 #include "dsa.h"
 
diff --git a/eprecomp.h b/eprecomp.h
index 9723a7ba..bd65a9cd 100644
--- a/eprecomp.h
+++ b/eprecomp.h
@@ -1,6 +1,7 @@
 #ifndef CRYPTOPP_EPRECOMP_H
 #define CRYPTOPP_EPRECOMP_H
 
+#include "config.h"
 #include "integer.h"
 #include "algebra.h"
 #include <vector>
diff --git a/esign.h b/esign.h
index 8eecbc5a..58e74af0 100644
--- a/esign.h
+++ b/esign.h
@@ -6,8 +6,9 @@
 	ESIGN signature schemes as defined in IEEE P1363a.
 */
 
-#include "pubkey.h"
+#include "config.h"
 #include "integer.h"
+#include "pubkey.h"
 #include "asn.h"
 
 NAMESPACE_BEGIN(CryptoPP)
diff --git a/fipsalgt.cpp b/fipsalgt.cpp
index 95f8f7c6..08361ccd 100644
--- a/fipsalgt.cpp
+++ b/fipsalgt.cpp
@@ -7,6 +7,9 @@
 #ifndef CRYPTOPP_IMPORTS
 #define CRYPTOPP_DEFAULT_NO_DLL
 #endif
+
+#include "config.h"
+#include "integer.h"
 #include "dll.h"
 #include "oids.h"
 #include "trap.h"
diff --git a/gfpcrypt.h b/gfpcrypt.h
index a8f911c3..0590254e 100644
--- a/gfpcrypt.h
+++ b/gfpcrypt.h
@@ -5,6 +5,8 @@
 	Implementation of schemes based on DL over GF(p)
 */
 
+#include "config.h"
+#include "integer.h"
 #include "pubkey.h"
 #include "modexppc.h"
 #include "sha.h"
diff --git a/luc.h b/luc.h
index e669c346..0bb9a6bc 100644
--- a/luc.h
+++ b/luc.h
@@ -4,9 +4,10 @@
 /** \file
 */
 
+#include "config.h"
+#include "integer.h"
 #include "pkcspad.h"
 #include "oaep.h"
-#include "integer.h"
 #include "dh.h"
 #include "trap.h"
 
diff --git a/modarith.h b/modarith.h
index a03790df..3ba57867 100644
--- a/modarith.h
+++ b/modarith.h
@@ -4,9 +4,9 @@
 // implementations are in integer.cpp
 
 #include "cryptlib.h"
-#include "misc.h"
 #include "integer.h"
 #include "algebra.h"
+#include "misc.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 
diff --git a/modexppc.h b/modexppc.h
index 4d47281f..615aa110 100644
--- a/modexppc.h
+++ b/modexppc.h
@@ -1,6 +1,8 @@
 #ifndef CRYPTOPP_MODEXPPC_H
 #define CRYPTOPP_MODEXPPC_H
 
+#include "cryptlib.h"
+#include "integer.h"
 #include "modarith.h"
 #include "eprecomp.h"
 #include "smartptr.h"
diff --git a/mqv.h b/mqv.h
index 2683817b..8b14f12b 100644
--- a/mqv.h
+++ b/mqv.h
@@ -4,6 +4,8 @@
 /** \file
 */
 
+#include "cryptlib.h"
+#include "integer.h"
 #include "gfpcrypt.h"
 
 NAMESPACE_BEGIN(CryptoPP)
diff --git a/nbtheory.h b/nbtheory.h
index 63647926..84b05449 100644
--- a/nbtheory.h
+++ b/nbtheory.h
@@ -3,6 +3,7 @@
 #ifndef CRYPTOPP_NBTHEORY_H
 #define CRYPTOPP_NBTHEORY_H
 
+#include "cryptlib.h"
 #include "integer.h"
 #include "algparam.h"
 
diff --git a/pubkey.h b/pubkey.h
index 98435c31..0a5bed0e 100644
--- a/pubkey.h
+++ b/pubkey.h
@@ -32,6 +32,7 @@
 	The "DL_" prefix means an implementation using group operations (in groups where discrete log is hard).
 */
 
+#include "integer.h"
 #include "modarith.h"
 #include "filters.h"
 #include "eprecomp.h"
diff --git a/pwdbased.h b/pwdbased.h
index 468db8d0..eb1cfe47 100644
--- a/pwdbased.h
+++ b/pwdbased.h
@@ -4,6 +4,7 @@
 #define CRYPTOPP_PWDBASED_H
 
 #include "cryptlib.h"
+#include "integer.h"
 #include "hmac.h"
 #include "hrtimer.h"
 #include "integer.h"
diff --git a/rabin.h b/rabin.h
index 1c9bcbb4..fb63cb4f 100644
--- a/rabin.h
+++ b/rabin.h
@@ -4,9 +4,10 @@
 /** \file
 */
 
+#include "cryptlib.h"
+#include "integer.h"
 #include "oaep.h"
 #include "pssr.h"
-#include "integer.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 
diff --git a/rsa.h b/rsa.h
index 6a8b1852..aabebc5e 100644
--- a/rsa.h
+++ b/rsa.h
@@ -6,6 +6,8 @@
 	ciphers and signature schemes as defined in PKCS #1 v2.0.
 */
 
+#include "cryptlib.h"
+#include "integer.h"
 #include "pubkey.h"
 #include "asn.h"
 #include "pkcspad.h"
diff --git a/rw.h b/rw.h
index 45b39468..c91436d6 100644
--- a/rw.h
+++ b/rw.h
@@ -6,6 +6,8 @@
 	Rabin-Williams signature schemes as defined in IEEE P1363.
 */
 
+#include "cryptlib.h"
+#include "integer.h"
 #include "pubkey.h"
 
 NAMESPACE_BEGIN(CryptoPP)
diff --git a/validat2.cpp b/validat2.cpp
index 0180ee74..afabe43e 100644
--- a/validat2.cpp
+++ b/validat2.cpp
@@ -3,6 +3,8 @@
 #include "pch.h"
 
 #define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
+#include "cryptlib.h"
+#include "integer.h"
 #include "blumshub.h"
 #include "rsa.h"
 #include "md2.h"
diff --git a/validat3.cpp b/validat3.cpp
index eb82aa5c..7680722b 100644
--- a/validat3.cpp
+++ b/validat3.cpp
@@ -3,6 +3,8 @@
 #include "pch.h"
 
 #define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
+#include "cryptlib.h"
+#include "integer.h"
 #include "smartptr.h"
 #include "crc.h"
 #include "adler32.h"
@@ -12,12 +14,9 @@
 #include "sha.h"
 #include "tiger.h"
 #include "ripemd.h"
-
 #include "hmac.h"
 #include "hkdf.h"
 #include "ttmac.h"
-
-#include "integer.h"
 #include "pwdbased.h"
 #include "filters.h"
 #include "hex.h"
diff --git a/xtr.h b/xtr.h
index 40766870..69ebd346 100644
--- a/xtr.h
+++ b/xtr.h
@@ -5,6 +5,8 @@
 	"The XTR public key system" by Arjen K. Lenstra and Eric R. Verheul
 */
 
+#include "cryptlib.h"
+#include "integer.h"
 #include "modarith.h"
 #include "trap.h"
 
diff --git a/xtrcrypt.h b/xtrcrypt.h
index 6aee1276..f1468196 100644
--- a/xtrcrypt.h
+++ b/xtrcrypt.h
@@ -5,6 +5,8 @@
 	"The XTR public key system" by Arjen K. Lenstra and Eric R. Verheul
 */
 
+#include "cryptlib.h"
+#include "integer.h"
 #include "xtr.h"
 
 NAMESPACE_BEGIN(CryptoPP)