diff --git a/donna_64.cpp b/donna_64.cpp
index 8c14ff05..c78deceb 100644
--- a/donna_64.cpp
+++ b/donna_64.cpp
@@ -13,17 +13,17 @@
 #include "misc.h"
 #include "cpu.h"
 
+// Squash MS LNK4221 and libtool warnings
+extern const char DONNA64_FNAME[] = __FILE__;
+
+#if defined(CRYPTOPP_CURVE25519_64BIT)
+
 #if defined(_MSC_VER)
 # include <intrin.h>
 # pragma intrinsic(_umul128)
 # pragma intrinsic(__shiftright128)
 #endif
 
-// Squash MS LNK4221 and libtool warnings
-extern const char DONNA64_FNAME[] = __FILE__;
-
-#if defined(CRYPTOPP_CURVE25519_64BIT)
-
 ANONYMOUS_NAMESPACE_BEGIN
 
 using std::memcpy;
diff --git a/validat3.cpp b/validat3.cpp
index a01dd937..f15601f8 100644
--- a/validat3.cpp
+++ b/validat3.cpp
@@ -41,6 +41,8 @@ NAMESPACE_BEGIN(Test)
 bool ValidateAll(bool thorough)
 {
 	bool pass=TestSettings();
+	pass=TestCurve25519() && pass;
+	pass=ValidateX25519() && pass;
 	pass=TestOS_RNG() && pass;
 	pass=TestRandomPool() && pass;
 #if !defined(NO_OS_DEPENDENCE) && defined(OS_RNG_AVAILABLE)