diff --git a/config/Rules.am b/config/Rules.am
index 175e4b6087..3c22bb8443 100644
--- a/config/Rules.am
+++ b/config/Rules.am
@@ -1,12 +1,7 @@
 DEFAULT_INCLUDES = -I${top_srcdir}
 
-# FIXME: Quiet warnings not covered by the gcc-* patches.  We should
-# FIXME: consider removing this as soon as we reasonably can.
-#
 # FIXME: Add -Wshadow once everything is working
-#
-AM_CFLAGS  = -Wall -Wstrict-prototypes -Werror
-AM_CFLAGS += -Wno-switch -Wno-unused -Wno-missing-braces
+AM_CFLAGS  = -Wall -Wstrict-prototypes -Werror -Wno-switch
 AM_CFLAGS += -Wno-uninitialized -fno-strict-aliasing
 
 # Expected defines not covered by zfs_config.h or spl_config.h
diff --git a/config/kernel.m4 b/config/kernel.m4
index 245bdc00de..e1cd0b90cf 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -6,15 +6,12 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
 	dnl # KERNELMAKE_PARAMS="V=1"	# Enable verbose module build
 	KERNELMAKE_PARAMS=
 
-	# FIXME: Quiet warnings not covered by the gcc-* patches.  We should
-	# FIXME: consider removing this as soon as we reasonably can
 	KERNELCPPFLAGS="$KERNELCPPFLAGS -Wall -Wstrict-prototypes -Werror"
-	KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-switch -Wno-unused"
-	KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-missing-braces"
+	KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-switch"
 	KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-uninitialized -fno-strict-aliasing"
 
-	KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL "
-	KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\" "
+	KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
+	KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\""
 
 	KERNELCPPFLAGS="$KERNELCPPFLAGS -I$splsrc -I$splsrc/include -I$TOPDIR"