diff --git a/simgear/scene/model/model.hxx b/simgear/scene/model/model.hxx
index 9f930f3e..bef5a322 100644
--- a/simgear/scene/model/model.hxx
+++ b/simgear/scene/model/model.hxx
@@ -15,9 +15,6 @@
 #include <vector>
 #include <set>
 
-using std::vector;
-using std::set;
-
 #include <osg/Node>
 #include <osg/Texture2D>
 #include <osgDB/ReaderWriter>
diff --git a/simgear/structure/SGSharedPtr.hxx b/simgear/structure/SGSharedPtr.hxx
index b99a6a8f..cbaee0f6 100644
--- a/simgear/structure/SGSharedPtr.hxx
+++ b/simgear/structure/SGSharedPtr.hxx
@@ -111,4 +111,12 @@ private:
   friend class SGWeakPtr;
 };
 
+/**
+ * Support for boost::mem_fn
+ */
+template<typename T>
+T* get_pointer(SGSharedPtr<T> const & p)
+{
+  return p.ptr();
+}
 #endif