diff --git a/ChangeLog b/ChangeLog
index 3741e02d88..1e3fcc94a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-02-13  Ulrich Drepper  <drepper@redhat.com>
+
+	* elf/tst-tls1.c: Move #include "tls-macros.h" instead #ifdef USE_TLS.
+	* elf/tst-tls2.c: Likewise.
+	* elf/tst-tls3.c: Likewise.
+
+2002-02-13  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf/dl-close.c (free_slotinfo): Only define if TLS supported.
+
 2002-02-13  Ulrich Drepper  <drepper@redhat.com>
 
 	* elf/dl-open.c (dl_open_worker): Only bump the generation counter
diff --git a/elf/dl-close.c b/elf/dl-close.c
index 5c7e5dad38..8eefb351b2 100644
--- a/elf/dl-close.c
+++ b/elf/dl-close.c
@@ -333,6 +333,7 @@ _dl_close (void *_map)
 }
 
 
+#ifdef USE_TLS
 static bool
 free_slotinfo (struct dtv_slotinfo_list *elemp)
 {
@@ -355,6 +356,7 @@ free_slotinfo (struct dtv_slotinfo_list *elemp)
 
   return true;
 }
+#endif
 
 
 static void
diff --git a/elf/tst-tls1.c b/elf/tst-tls1.c
index 74e9a915b3..478f5bbdcd 100644
--- a/elf/tst-tls1.c
+++ b/elf/tst-tls1.c
@@ -2,10 +2,11 @@
 #include <stdio.h>
 
 #include <tls.h>
-#include "tls-macros.h"
-
 
 #ifdef USE_TLS
+# include "tls-macros.h"
+
+
 /* Two common 'int' variables in TLS.  */
 COMMON_INT_DEF(foo);
 COMMON_INT_DEF(bar);
diff --git a/elf/tst-tls2.c b/elf/tst-tls2.c
index a15c5f5fe8..417489968e 100644
--- a/elf/tst-tls2.c
+++ b/elf/tst-tls2.c
@@ -2,10 +2,11 @@
 #include <stdio.h>
 
 #include <tls.h>
-#include "tls-macros.h"
-
 
 #ifdef USE_TLS
+# include "tls-macros.h"
+
+
 /* Two 'int' variables in TLS.  */
 VAR_INT_DEF(foo);
 VAR_INT_DEF(bar);
diff --git a/elf/tst-tls3.c b/elf/tst-tls3.c
index 58bb183c8d..84be43575b 100644
--- a/elf/tst-tls3.c
+++ b/elf/tst-tls3.c
@@ -2,10 +2,11 @@
 #include <stdio.h>
 
 #include <tls.h>
-#include "tls-macros.h"
-
 
 #ifdef USE_TLS
+# include "tls-macros.h"
+
+
 /* One define int variable, two externs.  */
 COMMON_INT_DECL(foo);
 VAR_INT_DECL(bar);