diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b7e68d812a914b726996b05784ee2fb73fbc0672..c1387acafcda81a81264ac1e486ffe75a59ba2f1 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-11  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* include/bits/shared_ptr.h: Add include guards.
+	* include/tr1/shared_ptr.h: Likewise.
+
 2009-03-11  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
 	* include/std/iostream: Fix doxygen link.
diff --git a/libstdc++-v3/include/bits/shared_ptr.h b/libstdc++-v3/include/bits/shared_ptr.h
index 8e70984971da07f8822d8bb2b4bf2018b74274c9..5ede8ad1f007dfa0bd1584ae07af160106c80883 100644
--- a/libstdc++-v3/include/bits/shared_ptr.h
+++ b/libstdc++-v3/include/bits/shared_ptr.h
@@ -51,6 +51,9 @@
  *  You should not attempt to use it directly.
  */
 
+#ifndef _SHARED_PTR_H
+#define _SHARED_PTR_H 1
+
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
 #endif
@@ -1589,3 +1592,5 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   // @} group pointer_abstractions
 
 _GLIBCXX_END_NAMESPACE
+
+#endif // _SHARED_PTR_H
diff --git a/libstdc++-v3/include/tr1/shared_ptr.h b/libstdc++-v3/include/tr1/shared_ptr.h
index a21561433d906b16852c838c9064be58a8e09192..7725145a8232641ecb2438e97fc974de40016813 100644
--- a/libstdc++-v3/include/tr1/shared_ptr.h
+++ b/libstdc++-v3/include/tr1/shared_ptr.h
@@ -51,6 +51,9 @@
  *  You should not attempt to use it directly.
  */
 
+#ifndef _TR1_SHARED_PTR_H
+#define _TR1_SHARED_PTR_H 1
+
 #if defined(_GLIBCXX_INCLUDE_AS_CXX0X)
 #  error TR1 header cannot be included from C++0x header
 #endif
@@ -1018,3 +1021,5 @@ namespace tr1
 
 }
 }
+
+#endif // _TR1_SHARED_PTR_H