diff -urpN memdbg2/src/dynamic_big_crypt.c memdbg1/src/dynamic_big_crypt.c
--- memdbg2/src/dynamic_big_crypt.c	2013-05-17 20:54:07.890625000 -0500
+++ memdbg1/src/dynamic_big_crypt.c	2013-05-18 09:34:01.687500000 -0500
@@ -41,7 +41,6 @@
 #include "johnswap.h"
 
 #if OPENSSL_VERSION_NUMBER >= 0x10000000
-#define USING_OSSL_WHRLP
 #include "openssl/whrlpool.h"
 #else
 // on my 32 bit cygwin builds, this code is about 4x slower than the oSSL code.
diff -urpN memdbg2/src/dynamic_parser.c memdbg1/src/dynamic_parser.c
--- memdbg2/src/dynamic_parser.c	2013-05-17 20:54:07.921875000 -0500
+++ memdbg1/src/dynamic_parser.c	2013-05-18 09:03:23.390625000 -0500
@@ -72,7 +72,6 @@
 #include "options.h"
 #include "john.h"
 
-#define DEFINE_MD5_PREDICATE_POINTERS
 #include "dynamic.h"
 #include "memdbg.h"
 
diff -urpN memdbg2/src/formspring_fmt_plug.c memdbg1/src/formspring_fmt_plug.c
--- memdbg2/src/formspring_fmt_plug.c	2013-05-17 20:54:32.515625000 -0500
+++ memdbg1/src/formspring_fmt_plug.c	2013-05-18 09:12:04.421875000 -0500
@@ -36,14 +36,10 @@
 #define HEX_SIZE		    (BINARY_SIZE * 2)
 
 #define SALT_SIZE			2
-#define PROCESSED_SALT_SIZE	SALT_SIZE
 
 #define PLAINTEXT_LENGTH	32
 #define CIPHERTEXT_LENGTH	(SALT_SIZE + 1 + HEX_SIZE)
 
-#define MIN_KEYS_PER_CRYPT	1
-#define MAX_KEYS_PER_CRYPT	1
-
 static struct fmt_tests formspring_tests[] = {
 	{"2a4fa0bf8c6a01dd625d3141746451ba51e07f99dc9143f1e25a37f65cb02eb4$RA", "test1"},
 	//{"b06b5c132bb1adf421ce6ac406bfabba380546deaab92bd20c3d56baaa70b6cf$  ", "test1"},
@@ -75,7 +71,6 @@ static char *our_split(char *ciphertext,
 
 static char *our_prepare(char *split_fields[10], struct fmt_main *self)
 {
-	int i = strlen(split_fields[1]);
 	get_ptr();
 	return pDynamic_61->methods.prepare(split_fields, self);
 }
diff -urpN memdbg2/src/mediawiki_fmt_plug.c memdbg1/src/mediawiki_fmt_plug.c
--- memdbg2/src/mediawiki_fmt_plug.c	2013-05-17 20:54:32.609375000 -0500
+++ memdbg1/src/mediawiki_fmt_plug.c	2013-05-18 09:12:46.234375000 -0500
@@ -61,13 +61,9 @@ userName2:$B$107$dd494cb03ac1c5b8f8d2ddd
 #define BINARY_SIZE			MD5_BINARY_SIZE
 
 #define SALT_SIZE			9
-#define PROCESSED_SALT_SIZE	SALT_SIZE
 
 #define PLAINTEXT_LENGTH	32
 
-#define MIN_KEYS_PER_CRYPT	1
-#define MAX_KEYS_PER_CRYPT	1
-
 static struct fmt_tests mediawiki_tests[] = {
 	{"$B$113$de2874e33da25313d808d2a8cbf31485",      "qwerty"},
 	{"$B$bca6c557$8d187736f828e4cb032bd6c7a268cd95", "abc123"},
@@ -113,7 +109,6 @@ static char *our_split(char *ciphertext,
 
 static char *our_prepare(char *split_fields[10], struct fmt_main *self)
 {
-	int i = strlen(split_fields[1]);
 	get_ptr();
 	return pDynamic_9->methods.prepare(split_fields, self);
 }
diff -urpN memdbg2/src/osc_fmt_plug.c memdbg1/src/osc_fmt_plug.c
--- memdbg2/src/osc_fmt_plug.c	2013-05-17 20:54:32.640625000 -0500
+++ memdbg1/src/osc_fmt_plug.c	2013-05-18 09:14:19.031250000 -0500
@@ -41,14 +41,10 @@
 #define BINARY_SIZE			MD5_BINARY_SIZE
 
 #define SALT_SIZE			2
-#define PROCESSED_SALT_SIZE	SALT_SIZE
 
 #define PLAINTEXT_LENGTH	32
 #define CIPHERTEXT_LENGTH	(1 + 3 + 1 + SALT_SIZE * 2 + 1 + MD5_HEX_SIZE)
 
-#define MIN_KEYS_PER_CRYPT	1
-#define MAX_KEYS_PER_CRYPT	1
-
 static struct fmt_tests osc_tests[] = {
 	{"$OSC$2020$05de5c963ee6234dc7d52f7589a1922b", "welcome"},
 	{NULL}
@@ -95,7 +91,6 @@ static char *our_split(char *ciphertext,
 
 static char *our_prepare(char *split_fields[10], struct fmt_main *self)
 {
-	int i = strlen(split_fields[1]);
 	get_ptr();
 	return pDynamic_4->methods.prepare(split_fields, self);
 }
diff -urpN memdbg2/src/PHPS_fmt_plug.c memdbg1/src/PHPS_fmt_plug.c
--- memdbg2/src/PHPS_fmt_plug.c	2013-05-17 20:54:32.656250000 -0500
+++ memdbg1/src/PHPS_fmt_plug.c	2013-05-18 09:13:39.968750000 -0500
@@ -51,14 +51,10 @@
 #define BINARY_SIZE			MD5_BINARY_SIZE
 
 #define SALT_SIZE			3
-#define PROCESSED_SALT_SIZE	SALT_SIZE
 
 #define PLAINTEXT_LENGTH	32
 #define CIPHERTEXT_LENGTH	(1 + 4 + 1 + SALT_SIZE * 2 + 1 + MD5_HEX_SIZE)
 
-#define MIN_KEYS_PER_CRYPT	1
-#define MAX_KEYS_PER_CRYPT	1
-
 static struct fmt_tests phps_tests[] = {
 	{"$PHPS$433925$5d756853cd63acee76e6dcd6d3728447", "welcome"},
 	{"$PHPS$73616c$aba22b2ceb7c841473c03962b145feb3", "password"},
@@ -106,8 +102,6 @@ static char *our_split(char *ciphertext,
 
 static char *our_prepare(char *split_fields[10], struct fmt_main *self)
 {
-	int i = strlen(split_fields[1]);
-	get_ptr();
 	return pDynamic_6->methods.prepare(split_fields, self);
 }