diff --git a/cli/Makefile b/cli/Makefile
index 245a7521..23a93c1f 100644
--- a/cli/Makefile
+++ b/cli/Makefile
@@ -18,7 +18,7 @@ ifeq ($(TARGET_OS),Windows_NT)
   CFLAGS += -DWIN32
 endif
 
-CFLAGS += -Wall -O3 -DVAR_ARRAYS -I../ext_includes $(EXTRA_CFLAGS)
+CFLAGS += -Wall -Werror=format-security -Wdeclaration-after-statement -Wvla -O3 -DVAR_ARRAYS -I../ext_includes $(EXTRA_CFLAGS)
 LDFLAGS += -L../src -L../ext_libs -lvgmstream $(EXTRA_LDFLAGS) -lm
 TARGET_EXT_LIBS = 
 
@@ -26,7 +26,7 @@ LIBAO_INC_PATH = ../../libao/include
 LIBAO_LIB_PATH = ../../libao/bin
 
 #ifdef VGM_DEBUG
-#  CFLAGS += -DVGM_DEBUG_OUTPUT -O0 -Werror=format-security -Wdeclaration-after-statement -Wvla
+#  CFLAGS += -DVGM_DEBUG_OUTPUT -O0
 #  CFLAGS += -Wold-style-definition -Woverflow -Wpointer-arith -Wstrict-prototypes -pedantic -std=gnu90 -fstack-protector -Wformat
 #endif
 
diff --git a/winamp/Makefile b/winamp/Makefile
index 5c5886c0..ba727e96 100644
--- a/winamp/Makefile
+++ b/winamp/Makefile
@@ -11,7 +11,7 @@ endif
 ### main defs
 OUTPUT_WINAMP = in_vgmstream.dll
 
-CFLAGS += -Wall -O3 -DUSE_ALLOCA -DWIN32 -I../ext_includes $(EXTRA_CFLAGS)
+CFLAGS += -Wall -Werror=format-security -Wdeclaration-after-statement -Wvla -O3 -DUSE_ALLOCA -DWIN32 -I../ext_includes $(EXTRA_CFLAGS)
 LDFLAGS += -L../src -L../ext_libs -lm -lvgmstream $(EXTRA_LDFLAGS)
 TARGET_EXT_LIBS = 
 
diff --git a/xmplay/Makefile b/xmplay/Makefile
index 78ee5254..c7115de5 100644
--- a/xmplay/Makefile
+++ b/xmplay/Makefile
@@ -11,7 +11,7 @@ endif
 ### main defs
 OUTPUT_XMPLAY = xmp-vgmstream.dll
 
-CFLAGS += -Wall -O3 -DUSE_ALLOCA -DWIN32 -I../ext_includes $(EXTRA_CFLAGS)
+CFLAGS += -Wall -Werror=format-security -Wdeclaration-after-statement -Wvla -O3 -DUSE_ALLOCA -DWIN32 -I../ext_includes $(EXTRA_CFLAGS)
 LDFLAGS += -L../src -L../ext_libs -lm -lvgmstream $(EXTRA_LDFLAGS)
 TARGET_EXT_LIBS =