diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 605286e7b6d..1212841430f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2001-03-22  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* src/misc-inst.cc (__sink_unused_warning): Move to...
+	* src/locale-inst.cc (__sink_unused_warning): Move to...
+	* src/stl-inst.cc: Here.
+	* include/bits/c++config (_STL_NO_CONCEPT_CHECKS): Add define,
+	commented it out.
+
 2001-03-21  Theodore Papadopoulo  <Theodore.Papadopoulo@sophia.inria.fr>
 
     	* intclude/bits/basic_file.h: Fix typos in comments.
diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index 63c9762b9a3..7a086aa4f8b 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -65,6 +65,7 @@
 
 // Concept-checking code is on by default unless users define
 // the _STL_NO_CONCEPT_CHECKS hook.
+//#define _STL_NO_CONCEPT_CHECKS 1
 #if !defined(_STL_NO_CONCEPT_CHECKS)
 #  define __STL_USE_CONCEPT_CHECKS
 #endif
diff --git a/libstdc++-v3/src/locale-inst.cc b/libstdc++-v3/src/locale-inst.cc
index 554fab3f258..a2027281ac4 100644
--- a/libstdc++-v3/src/locale-inst.cc
+++ b/libstdc++-v3/src/locale-inst.cc
@@ -44,7 +44,6 @@
 
 namespace std
 {
-
   typedef ostreambuf_iterator<char, char_traits<char> > obuf_iterator;
   typedef istreambuf_iterator<char, char_traits<char> > ibuf_iterator;
   typedef ostreambuf_iterator<wchar_t, char_traits<wchar_t> > wobuf_iterator;
@@ -286,9 +285,6 @@ namespace std
 #endif
 #endif // _GLIBCPP_USE_WCHAR_T
 
-  template
-    void __sink_unused_warning<locale::facet*>(locale::facet*);
-
   template 
     locale::facet** 
     fill_n<locale::facet**, size_t, locale::facet*>
diff --git a/libstdc++-v3/src/misc-inst.cc b/libstdc++-v3/src/misc-inst.cc
index 50d11abb440..3c3b9f1582e 100644
--- a/libstdc++-v3/src/misc-inst.cc
+++ b/libstdc++-v3/src/misc-inst.cc
@@ -241,26 +241,6 @@ namespace std
     (vector<string>::const_iterator, vector<string>::const_iterator, 
      string*, _Bool<false>);
 
-  template
-    void 
-    __sink_unused_warning<char>(char);
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template
-    void 
-    __sink_unused_warning<wchar_t>(wchar_t);
-#endif
-
-  template
-    void
-    __sink_unused_warning<ostreambuf_iterator<char> > 
-    (ostreambuf_iterator<char>);
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template
-    void
-    __sink_unused_warning<ostreambuf_iterator<wchar_t> > 
-    (ostreambuf_iterator<wchar_t>);
-#endif
-
   template
     void 
     __pad_char(basic_ios<char>&, char*, const char*,
diff --git a/libstdc++-v3/src/stl-inst.cc b/libstdc++-v3/src/stl-inst.cc
index 29337c02bbf..f5008c950dd 100644
--- a/libstdc++-v3/src/stl-inst.cc
+++ b/libstdc++-v3/src/stl-inst.cc
@@ -1,6 +1,6 @@
 // Explicit instantiation file.
 
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -34,6 +34,7 @@
 #include <bits/c++config.h>
 #include <bits/stl_alloc.h>
 #include <bits/std_vector.h>
+#include <bits/std_ostream.h>
 
 namespace std
 {
@@ -49,8 +50,27 @@ namespace std
     vector<unsigned int>::
     _M_insert_aux(vector<unsigned int>::iterator, unsigned int const &);
 
+#ifdef __STL_USE_CONCEPT_CHECKS
   template
-    void
-    __sink_unused_warning<unsigned int>(unsigned int);
+    void __sink_unused_warning<unsigned int>(unsigned int);
 
+  template
+    void __sink_unused_warning<locale::facet*>(locale::facet*);
+
+  template
+    void __sink_unused_warning<char>(char);
+
+  template
+    void __sink_unused_warning<ostreambuf_iterator<char> >
+    (ostreambuf_iterator<char>);
+
+# ifdef _GLIBCPP_USE_WCHAR_T
+  template
+    void __sink_unused_warning<wchar_t>(wchar_t);
+
+  template
+    void __sink_unused_warning<ostreambuf_iterator<wchar_t> > 
+    (ostreambuf_iterator<wchar_t>);
+# endif
+#endif
 } //std