diff --git a/src/Makefile.d/features.mk b/src/Makefile.d/features.mk
index b0ff2a71f..7ea07f71c 100644
--- a/src/Makefile.d/features.mk
+++ b/src/Makefile.d/features.mk
@@ -61,6 +61,7 @@ endif
 # (Valgrind is a memory debugger.)
 ifdef VALGRIND
 VALGRIND_PKGCONFIG?=valgrind
+VALGRIND_LDFLAGS=
 $(eval $(call Use_pkg_config,VALGRIND))
 ZDEBUG=1
 opts+=-DHAVE_VALGRIND
diff --git a/src/Makefile.d/versions.mk b/src/Makefile.d/versions.mk
index 2523d7f3c..b639ad9a1 100644
--- a/src/Makefile.d/versions.mk
+++ b/src/Makefile.d/versions.mk
@@ -84,6 +84,9 @@ endif
  WFLAGS+=-Wnested-externs
 #WFLAGS+=-Wunreachable-code
  WFLAGS+=-Winline
+ifdef DEBUGMODE
+ WFLAGS+=-Wno-error=inline
+endif
 ifdef GCC43
  WFLAGS+=-funit-at-a-time
  WFLAGS+=-Wlogical-op
diff --git a/src/doomdef.h b/src/doomdef.h
index 45d6645fa..b0610cb82 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -110,11 +110,19 @@ FILE *fopenfile(const char*, const char*);
 
 // If you don't disable ALL debug first, you get ALL debug enabled
 #if !defined (NDEBUG)
+#ifndef PACKETDROP
 #define PACKETDROP
+#endif
+#ifndef PARANOIA
 #define PARANOIA
+#endif
+#ifndef RANGECHECK
 #define RANGECHECK
+#endif
+#ifndef ZDEBUG
 #define ZDEBUG
 #endif
+#endif
 
 // Uncheck this to compile debugging code
 //#define RANGECHECK
diff --git a/src/mserv.c b/src/mserv.c
index f83b16d07..d60cc09c5 100644
--- a/src/mserv.c
+++ b/src/mserv.c
@@ -506,7 +506,7 @@ static void
 Update_parameters (void)
 {
 #ifdef MASTERSERVER
-	int registered;
+	int registered = 0;
 	int delayed;
 
 	if (Online())