diff --git a/makefile b/makefile
index 9ae8e6268a7..ea4fe13ee4e 100644
--- a/makefile
+++ b/makefile
@@ -412,7 +412,7 @@ endif
 
 # define MAME_DEBUG if we are a debugging build
 ifdef DEBUG
-DEFS += -DMAME_DEBUG -DEBUG -D_DEBUG
+DEFS += -DMAME_DEBUG -DDEBUG -D_DEBUG
 else
 DEFS += -DNDEBUG 
 endif
diff --git a/src/lib/portmidi/pmwinmm.c b/src/lib/portmidi/pmwinmm.c
index af3dad8f8eb..fdfb3b39415 100644
--- a/src/lib/portmidi/pmwinmm.c
+++ b/src/lib/portmidi/pmwinmm.c
@@ -1436,9 +1436,7 @@ void pm_winmm_term( void )
 	int i;
 #ifdef DEBUG
 	char msg[PM_HOST_ERROR_MSG_LEN];
-#endif
-	//int doneAny = 0;
-#ifdef DEBUG
+	int doneAny = 0;
 	printf("pm_winmm_term called\n");
 #endif
 	for (i = 0; i < pm_descriptor_index; i++) {
diff --git a/src/lib/zlib/zutil.c b/src/lib/zlib/zutil.c
index a412eeaa03c..0ff49fc9a2e 100644
--- a/src/lib/zlib/zutil.c
+++ b/src/lib/zlib/zutil.c
@@ -123,7 +123,7 @@ uLong ZEXPORT zlibCompileFlags()
 int ZLIB_INTERNAL z_verbose = verbose;
 
 void ZLIB_INTERNAL z_error (m)
-	char *m;
+	const char *m;
 {
 	fprintf(stderr, "%s\n", m);
 	exit(1);
diff --git a/src/lib/zlib/zutil.h b/src/lib/zlib/zutil.h
index 72df5358db9..e209ff1d2ad 100644
--- a/src/lib/zlib/zutil.h
+++ b/src/lib/zlib/zutil.h
@@ -218,7 +218,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #ifdef DEBUG
 #  include <stdio.h>
 	extern int ZLIB_INTERNAL z_verbose;
-	extern void ZLIB_INTERNAL z_error OF((char *m));
+	extern void ZLIB_INTERNAL z_error OF((const char *m));
 #  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
 #  define Trace(x) {if (z_verbose>=0) fprintf x ;}
 #  define Tracev(x) {if (z_verbose>0) fprintf x ;}