diff --git a/bootstrap.conf b/bootstrap.conf
index f0207de8..453c4efb 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -30,6 +30,7 @@ gnulib_modules='
   javaexec-script
   ldexpl
   libtextstyle-optional
+  linked-list
   malloc-gnu
   mbfile mbswidth
   non-recursive-gnulib-prefix-hack
@@ -37,6 +38,7 @@ gnulib_modules='
   obstack-printf
   perror progname
   quote quotearg
+  rbtreehash-list
   readline
   readme-release
   realloc-posix
diff --git a/lib/.gitignore b/lib/.gitignore
index a34e66ae..0112ac05 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -118,10 +118,31 @@
 /gettext.h
 /gettime.c
 /gettimeofday.c
+/gl_anyhash1.h
+/gl_anyhash2.h
+/gl_anyhash_primes.h
+/gl_anylinked_list1.h
+/gl_anylinked_list2.h
+/gl_anyrbtree_list1.h
+/gl_anyrbtree_list2.h
+/gl_anytree_list1.h
+/gl_anytree_list2.h
+/gl_anytree_oset.h
+/gl_anytreehash_list1.h
+/gl_anytreehash_list2.h
 /gl_array_list.c
 /gl_array_list.h
+/gl_linked_list.c
+/gl_linked_list.h
 /gl_list.c
 /gl_list.h
+/gl_oset.c
+/gl_oset.h
+/gl_rbtree_ordered.h
+/gl_rbtree_oset.c
+/gl_rbtree_oset.h
+/gl_rbtreehash_list.c
+/gl_rbtreehash_list.h
 /gl_xlist.c
 /gl_xlist.h
 /gnulib.mk
diff --git a/m4/.gitignore b/m4/.gitignore
index fb01b2b1..eb775392 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,4 +1,3 @@
-/extern-inline.m4~
 /*~
 /00gnulib.m4
 /__inline.m4
@@ -6,6 +5,7 @@
 /alloca.m4
 /asm-underscore.m4
 /assert.m4
+/builtin-expect.m4
 /calloc.m4
 /canonicalize.m4
 /clock_time.m4
@@ -25,6 +25,7 @@
 /exponentl.m4
 /extensions.m4
 /extern-inline.m4
+/extern-inline.m4~
 /fatal-signal.m4
 /fcntl-o.m4
 /fcntl.m4
diff --git a/src/complain.h b/src/complain.h
index 84b2381f..a6f0253a 100644
--- a/src/complain.h
+++ b/src/complain.h
@@ -19,6 +19,8 @@
 #ifndef COMPLAIN_H_
 # define COMPLAIN_H_ 1
 
+# include <attribute.h>
+
 # include "location.h"
 
 /*---------------.