diff --git a/config/Rules.am b/config/Rules.am
index 37ec127e4c..ecf6c97871 100644
--- a/config/Rules.am
+++ b/config/Rules.am
@@ -1,9 +1,6 @@
-# Default build options
-AM_CFLAGS  = -ggdb -O2 -std=c99
-AM_CFLAGS += -Wall -Wstrict-prototypes -Wshadow -Werror
-
 # FIXME: Quiet warnings not covered by the gcc-* patches.  We should
 # FIXME: consider removing this as soon as we reasonably can.
+AM_CFLAGS  = -Wall -Wstrict-prototypes -Wshadow -Werror
 AM_CFLAGS += -Wno-switch -Wno-unused -Wno-missing-braces
 AM_CFLAGS += -Wno-unknown-pragmas -Wno-parentheses
 AM_CFLAGS += -Wno-uninitialized -fno-strict-aliasing
diff --git a/lib/libspl/list.c b/lib/libspl/list.c
index e8db13a5cf..bb84b4b087 100644
--- a/lib/libspl/list.c
+++ b/lib/libspl/list.c
@@ -226,16 +226,16 @@ list_link_replace(list_node_t *lold, list_node_t *lnew)
 }
 
 void
-list_link_init(list_node_t *link)
+list_link_init(list_node_t *ln)
 {
-	link->list_next = NULL;
-	link->list_prev = NULL;
+	ln->list_next = NULL;
+	ln->list_prev = NULL;
 }
 
 int
-list_link_active(list_node_t *link)
+list_link_active(list_node_t *ln)
 {
-	return (link->list_next != NULL);
+	return (ln->list_next != NULL);
 }
 
 int