diff -urpN memdbg2/src/dynamic.h memdbg1/src/dynamic.h
--- memdbg2/src/dynamic.h	2013-05-11 11:08:21.796875000 -0500
+++ memdbg1/src/dynamic.h	2013-05-11 11:51:16.656250000 -0500
@@ -136,7 +136,6 @@ typedef struct DYNAMIC_Setup_t
 int dynamic_SETUP(DYNAMIC_Setup *, struct fmt_main *pFmt);
 int dynamic_IS_VALID(int i);
 int dynamic_real_salt_length(struct fmt_main *pFmt);
-void dynamic_RESET(struct fmt_main *);
 void dynamic_DISPLAY_ALL_FORMATS();
 char *RemoveHEX(char *output, char *input);
 int IsOMP_Valid(int);
diff -urpN memdbg2/src/dynamic_fmt.c memdbg1/src/dynamic_fmt.c
--- memdbg2/src/dynamic_fmt.c	2013-05-11 11:08:21.812500000 -0500
+++ memdbg1/src/dynamic_fmt.c	2013-05-11 11:52:15.968750000 -0500
@@ -97,10 +97,11 @@ static int m_ompt;
 #define STRINGIZE2(s) #s
 #define STRINGIZE(s) STRINGIZE2(s)
 
-extern struct fmt_main fmt_Dynamic;
+static struct fmt_main fmt_Dynamic;
 static struct fmt_main *pFmts;
 static int nFmts;
 static int force_md5_ctx;
+static void dynamic_RESET(struct fmt_main *fmt);
 
 typedef enum { eUNK=0, eBase16=1, eBase16u=2, eBase64=3, eBase64_nte=4, eBaseRaw=5} eLargeOut_t;
 static eLargeOut_t *eLargeOut;
@@ -1681,32 +1682,32 @@ static int binary_hash_2_64x4(void * bin
 static int binary_hash_3_64x4(void * binary) { return (((ARCH_WORD_32 *)binary)[0]>>8) & 0xffff; }
 static int binary_hash_4_64x4(void * binary) { return (((ARCH_WORD_32 *)binary)[0]>>8) & 0xfffff; }
 static int binary_hash_5_64x4(void * binary) { return (((ARCH_WORD_32 *)binary)[0]>>8) & 0xffffff; }
-int get_hash_0_64x4(int index) {
+static int get_hash_0_64x4(int index) {
 #if MD5_X2
 	if (index & 1) return (crypt_key_X86[index>>MD5_X2].x2.w2[0]>>8) & 0xf;
 #endif
 	return (crypt_key_X86[index>>MD5_X2].x1.w[0]>>8) & 0xf;}
-int get_hash_1_64x4(int index) {
+static int get_hash_1_64x4(int index) {
 #if MD5_X2
 	if (index & 1) return (crypt_key_X86[index>>MD5_X2].x2.w2[0]>>8) & 0xff;
 #endif
 	return (crypt_key_X86[index>>MD5_X2].x1.w[0]>>8) & 0xff;}
-int get_hash_2_64x4(int index) {
+static int get_hash_2_64x4(int index) {
 #if MD5_X2
 	if (index & 1) return (crypt_key_X86[index>>MD5_X2].x2.w2[0]>>8) & 0xfff;
 #endif
 	return (crypt_key_X86[index>>MD5_X2].x1.w[0]>>8) & 0xfff;}
-int get_hash_3_64x4(int index) {
+static int get_hash_3_64x4(int index) {
 #if MD5_X2
 	if (index & 1) return (crypt_key_X86[index>>MD5_X2].x2.w2[0]>>8) & 0xffff;
 #endif
 	return (crypt_key_X86[index>>MD5_X2].x1.w[0]>>8) & 0xffff;}
-int get_hash_4_64x4(int index) {
+static int get_hash_4_64x4(int index) {
 #if MD5_X2
 	if (index & 1) return (crypt_key_X86[index>>MD5_X2].x2.w2[0]>>8) & 0xfffff;
 #endif
 	return (crypt_key_X86[index>>MD5_X2].x1.w[0]>>8) & 0xfffff;}
-int get_hash_5_64x4(int index) {
+static int get_hash_5_64x4(int index) {
 #if MD5_X2
 	if (index & 1) return (crypt_key_X86[index>>MD5_X2].x2.w2[0]>>8) & 0xffffff;
 #endif
@@ -1715,7 +1716,7 @@ int get_hash_5_64x4(int index) {
 
 #endif
 
-int get_hash_0(int index)
+static int get_hash_0(int index)
 {
 #ifdef MMX_COEF
 	if (dynamic_use_sse&1) {
@@ -1730,7 +1731,7 @@ int get_hash_0(int index)
 	return crypt_key_X86[index>>MD5_X2].x1.w[0] & 0xf;
 }
 
-int get_hash_1(int index)
+static int get_hash_1(int index)
 {
 #ifdef MMX_COEF
 	if (dynamic_use_sse&1) {
@@ -1745,7 +1746,7 @@ int get_hash_1(int index)
 	return crypt_key_X86[index>>MD5_X2].x1.w[0] & 0xff;
 }
 
-int get_hash_2(int index)
+static int get_hash_2(int index)
 {
 #ifdef MMX_COEF
 	if (dynamic_use_sse&1) {
@@ -1760,7 +1761,7 @@ int get_hash_2(int index)
 	return crypt_key_X86[index>>MD5_X2].x1.w[0] & 0xfff;
 }
 
-int get_hash_3(int index)
+static int get_hash_3(int index)
 {
 #ifdef MMX_COEF
 	if (dynamic_use_sse&1) {
@@ -1774,7 +1775,7 @@ int get_hash_3(int index)
 #endif
 	return crypt_key_X86[index>>MD5_X2].x1.w[0] & 0xffff;
 }
-int get_hash_4(int index)
+static int get_hash_4(int index)
 {
 #ifdef MMX_COEF
 	if (dynamic_use_sse&1) {
@@ -1788,7 +1789,7 @@ int get_hash_4(int index)
 #endif
 	return crypt_key_X86[index>>MD5_X2].x1.w[0] & 0xfffff;
 }
-int get_hash_5(int index)
+static int get_hash_5(int index)
 {
 #ifdef MMX_COEF
 	if (dynamic_use_sse&1) {
@@ -1802,7 +1803,7 @@ int get_hash_5(int index)
 #endif
 	return crypt_key_X86[index>>MD5_X2].x1.w[0] & 0xffffff;
 }
-int get_hash_6(int index)
+static int get_hash_6(int index)
 {
 #ifdef MMX_COEF
 	if (dynamic_use_sse&1) {
@@ -2547,7 +2548,7 @@ static void * binary_b64_4x6(char *ciphe
  * ready to handle base-16 hashes.  The phpass stuff will be linked in later, IF
  * needed.
  *********************************************************************************/
-struct fmt_main fmt_Dynamic =
+static struct fmt_main fmt_Dynamic =
 {
 	{
 		FORMAT_LABEL,
@@ -3964,7 +3965,7 @@ unsigned i, til;
 }
 
 #ifdef MD5_SSE_PARA
-void SSE_Intrinsics_LoadLens(int side, int i)
+static void SSE_Intrinsics_LoadLens(int side, int i)
 {
 	ARCH_WORD_32 *p;
 	ARCH_WORD_32 TL;
@@ -4653,7 +4654,7 @@ static void CopyCryptToOut1Location(unsi
 	}
 }
 
-void CopyCryptToFlat(unsigned char *cp, int plen, int idx, int idx_mod) {
+static void CopyCryptToFlat(unsigned char *cp, int plen, int idx, int idx_mod) {
 	// this function is ONLY called during key setup (once), so trying to optimize
 	// to do full DWORD copying (vs byte/byte copying), will not gain us anything.
 	unsigned char *in = md5_tmp_out[idx];
@@ -7088,7 +7089,7 @@ static inline int large_hash_output_no_n
 
 #ifdef MMX_COEF
 // NOTE SSE SHA1 as implemented is NOT valid in _OPENMP build mode.  It is not valid, because it switches into and out of SSE/x86 modes.
-void SHA1_SSE_Crypt(DYNA_OMP_PARAMSm MD5_IN input[MAX_KEYS_PER_CRYPT_X86], unsigned int ilen[MAX_KEYS_PER_CRYPT_X86],
+static void SHA1_SSE_Crypt(DYNA_OMP_PARAMSm MD5_IN input[MAX_KEYS_PER_CRYPT_X86], unsigned int ilen[MAX_KEYS_PER_CRYPT_X86],
 					MD5_IN out[MAX_KEYS_PER_CRYPT_X86]  , unsigned int olen[MAX_KEYS_PER_CRYPT_X86], int append)
 {
 	unsigned i, j, tot=0, tot2=0, z, k;
@@ -7157,7 +7158,7 @@ void SHA1_SSE_Crypt(DYNA_OMP_PARAMSm MD5
 	}
 }
 // NOTE SSE SHA1 as implemented is NOT valid in _OPENMP build mode.  It is not valid, because it switches into and out of SSE/x86 modes.
-void SHA1_SSE_Crypt_final(DYNA_OMP_PARAMSm MD5_IN input[MAX_KEYS_PER_CRYPT_X86], unsigned int ilen[MAX_KEYS_PER_CRYPT_X86])
+static void SHA1_SSE_Crypt_final(DYNA_OMP_PARAMSm MD5_IN input[MAX_KEYS_PER_CRYPT_X86], unsigned int ilen[MAX_KEYS_PER_CRYPT_X86])
 {
 #if !SHA1_SSE_PARA
 	if (dynamic_use_sse==3)
@@ -10058,7 +10059,7 @@ static struct fmt_main *dynamic_Get_fmt_
  * This function will 'forget' which md5-gen subtype we are working with. It will allow
  * a different type to be used.  Very useful for things like -test (benchmarking).
  */
-void dynamic_RESET(struct fmt_main *fmt)
+static void dynamic_RESET(struct fmt_main *fmt)
 {
 	memset(&curdat, 0, sizeof(curdat));
 	m_count = 0;
diff -urpN memdbg2/src/dynamic_parser.c memdbg1/src/dynamic_parser.c
--- memdbg2/src/dynamic_parser.c	2013-05-11 11:08:21.859375000 -0500
+++ memdbg1/src/dynamic_parser.c	2013-05-11 11:51:16.625000000 -0500
@@ -506,7 +506,7 @@ static int load_config(int which) {
 	return !!gen_source;
 }
 
-char *GetFld(char **out, char *in)
+static char *GetFld(char **out, char *in)
 {
 	char *cp;
 	if (!in || !*in) return "";
diff -urpN memdbg2/src/dynamic_utils.c memdbg1/src/dynamic_utils.c
--- memdbg2/src/dynamic_utils.c	2013-05-11 11:08:21.890625000 -0500
+++ memdbg1/src/dynamic_utils.c	2013-05-11 11:51:16.593750000 -0500
@@ -73,7 +73,7 @@ void dynamic_DISPLAY_ALL_FORMATS()
 }
 
 // Only called at load time, so does not have to be overly optimal
-int ishexdigit(char c) {
+static int ishexdigit(char c) {
 	if (c >= '0' && c <= '9')
 		return 1;
 	if (c >= 'a' && c <= 'f')