diff --git a/hrtimer.cpp b/hrtimer.cpp
index cf5ecf25..caf2fa6c 100644
--- a/hrtimer.cpp
+++ b/hrtimer.cpp
@@ -7,6 +7,7 @@
 #include <time.h>
 
 #if defined(CRYPTOPP_WIN32_AVAILABLE)
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #elif defined(CRYPTOPP_UNIX_AVAILABLE)
 #include <sys/time.h>
diff --git a/test.cpp b/test.cpp
index fafef842..a6f08d8d 100644
--- a/test.cpp
+++ b/test.cpp
@@ -21,6 +21,7 @@
 #include "whrlpool.h"
 #include "tiger.h"
 #include "smartptr.h"
+#include "ocb.h"
 
 #include "validate.h"
 #include "bench.h"
@@ -33,6 +34,7 @@
 #include <time.h>
 
 #ifdef CRYPTOPP_WIN32_AVAILABLE
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
 
@@ -141,7 +143,13 @@ int CRYPTOPP_API main(int argc, char *argv[])
 #endif
 
 	try
-	{		
+	{
+		OCB<AES>::Encryption enc1;
+		OCB<AES>::Decryption dec1;
+
+		OCB3<AES>::Encryption enc2;
+		OCB3<AES>::Decryption dec2;
+
 		RegisterFactories();
 
 		// Some editors have problems with the '\0' character when redirecting output.
diff --git a/trdlocal.cpp b/trdlocal.cpp
index 3c450d6a..ecc7d7b0 100644
--- a/trdlocal.cpp
+++ b/trdlocal.cpp
@@ -14,6 +14,7 @@
 #include "trdlocal.h"
 
 #ifdef HAS_WINTHREADS
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif