diff --git a/Makefile b/Makefile
index 6146c87c..00816e86 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ export RMF SHELL CC AR STRIP WINDRES DLLTOOL
 ###############################################################################
 ### build defs
 
-DEF_CFLAGS += -ffast-math -O3 -Wall -Werror=format-security -Wdeclaration-after-statement -Wvla -Wimplicit-function-declaration -Wignored-qualifiers
+DEF_CFLAGS += -ffast-math -O3 -Wall -Werror=format-security -Wvla -Wimplicit-function-declaration -Wignored-qualifiers
 
 VGM_DEBUG_FLAGS = 0
 ifeq ($(VGM_DEBUG_FLAGS),1)
diff --git a/src/vgmstream.h b/src/vgmstream.h
index 54d93aaf..4febc140 100644
--- a/src/vgmstream.h
+++ b/src/vgmstream.h
@@ -325,9 +325,7 @@ typedef enum {
     meta_RWAV,              /* contents of RWAR */
     meta_CWAV,              /* contents of CWAR */
     meta_FWAV,              /* contents of FWAR */
-    meta_RSTM_SPM,          /* RSTM with 44->22khz hack */
     meta_THP,               /* THP movie files */
-    meta_RSTM_shrunken,     /* Atlus' mutant shortened RSTM */
     meta_SWAV,
     meta_NDS_RRDS,          /* Ridge Racer DS */
     meta_WII_BNS,           /* Wii BNS Banner Sound (similar to RSTM) */