diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index fe9524d24c..54ea10f86e 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -95,8 +95,8 @@
 #include "support/types.h"
 
 #include <boost/bind.hpp>
+#include <boost/shared_ptr.hpp>
 
-#include <tr1/memory>
 #include <algorithm>
 #include <fstream>
 #include <iomanip>
@@ -106,7 +106,6 @@
 #include <vector>
 
 using namespace std;
-using namespace std::tr1;
 using namespace lyx::support;
 
 namespace lyx {
@@ -2236,8 +2235,7 @@ void Buffer::setGuiDelegate(frontend::GuiBufferDelegate * gui)
 
 namespace {
 
-class AutoSaveBuffer : public ForkedProcess
-{
+class AutoSaveBuffer : public ForkedProcess {
 public:
 	///
 	AutoSaveBuffer(Buffer const & buffer, FileName const & fname)
diff --git a/src/KeyMap.h b/src/KeyMap.h
index 0dac18a6df..9957bfe3a8 100644
--- a/src/KeyMap.h
+++ b/src/KeyMap.h
@@ -19,7 +19,8 @@
 
 #include "support/strfwd.h"
 
-#include <tr1/memory>
+#include <boost/shared_ptr.hpp>
+
 #include <vector>
 
 
@@ -150,7 +151,7 @@ private:
 		/// Modifier masks
 		ModifierPair mod;
 		/// Keymap for prefix keys
-		std::tr1::shared_ptr<KeyMap> table;
+		boost::shared_ptr<KeyMap> table;
 		/// Action for !prefix keys
 		FuncRequest func;
 	};
diff --git a/src/OutputParams.h b/src/OutputParams.h
index b4bf7f9283..f0816d6e4e 100644
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -12,12 +12,11 @@
 #ifndef OUTPUTPARAMS_H
 #define OUTPUTPARAMS_H
 
-#include "support/types.h"
-
-#include "Changes.h"
-
 #include <string>
-#include <tr1/memory>
+
+#include "support/types.h"
+#include <boost/shared_ptr.hpp>
+#include "Changes.h"
 
 
 namespace lyx {
@@ -122,7 +121,7 @@ public:
 	    This is a hack: Make it possible to add stuff to constant
 	    OutputParams instances.
 	*/
-	std::tr1::shared_ptr<ExportData> exportdata;
+	boost::shared_ptr<ExportData> exportdata;
 
 	/** Whether we are inside a comment inset. Insets that are including
 	 *  external files like InsetGraphics, InsetInclude and InsetExternal
diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp
index f3fb5cab3f..616d09863f 100644
--- a/src/ServerSocket.cpp
+++ b/src/ServerSocket.cpp
@@ -37,9 +37,10 @@
 #endif
 
 using namespace std;
-using namespace std::tr1;
 using namespace lyx::support;
 
+using boost::shared_ptr;
+
 namespace lyx {
 
 // Address is the unix address for the socket.
diff --git a/src/ServerSocket.h b/src/ServerSocket.h
index 1708263459..1899e8b9ae 100644
--- a/src/ServerSocket.h
+++ b/src/ServerSocket.h
@@ -17,7 +17,8 @@
 #include "support/FileName.h"
 #include "support/socktools.h"
 
-#include <tr1/memory>
+#include <boost/shared_ptr.hpp>
+
 #include <string>
 #include <map>
 
@@ -63,7 +64,7 @@ private:
 		MAX_CLIENTS = 10
 	};
 	/// All connections
-	std::map<int, std::tr1::shared_ptr<LyXDataSocket> > clients;
+	std::map<int, boost::shared_ptr<LyXDataSocket> > clients;
 };
 
 
diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 505f61ec71..80f79524a4 100644
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -692,7 +692,7 @@ void GuiWorkArea::focusInEvent(QFocusEvent * e)
 {
 	/*
 	LYXERR(Debug::DEBUG, "GuiWorkArea::focusInEvent(): " << this << std::endl);
-	GuiWorkArea * old_gwa = const_cast<GuiWorkArea *>(guiApp->currentView()->currentWorkArea());
+	GuiWorkArea * old_gwa = theGuiApp()->currentView()->currentWorkArea();
 	if (old_gwa)
 		old_gwa->stopBlinkingCursor();
 	lyx_view_->setCurrentWorkArea(this);
diff --git a/src/graphics/GraphicsCache.h b/src/graphics/GraphicsCache.h
index f0ea832f3d..0eb35a36fb 100644
--- a/src/graphics/GraphicsCache.h
+++ b/src/graphics/GraphicsCache.h
@@ -20,7 +20,8 @@
 #ifndef GRAPHICSCACHE_H
 #define GRAPHICSCACHE_H
 
-#include <tr1/memory>
+#include <boost/shared_ptr.hpp>
+
 #include <vector>
 #include <string>
 
@@ -33,8 +34,7 @@ namespace graphics {
 
 class CacheItem;
 
-class Cache
-{
+class Cache {
 public:
 
 	/// This is a singleton class. Get the instance.
@@ -59,13 +59,13 @@ public:
 	 *  Returns an empty container if there is no such item.
 	 *
 	 *  IMPORTANT: whatever uses an image must make a local copy of this
-	 *  ItemPtr. The tr1::shared_ptr<>::use_count() function is
+	 *  ItemPtr. The boost::shared_ptr<>::use_count() function is
 	 *  used to ascertain whether or not to remove the item from the cache
 	 *  when remove(file) is called.
 	 *
 	 *  You have been warned!
 	 */
-	typedef std::tr1::shared_ptr<CacheItem> ItemPtr;
+	typedef boost::shared_ptr<CacheItem> ItemPtr;
 	///
 	ItemPtr const item(support::FileName const & file) const;
 
diff --git a/src/graphics/Previews.cpp b/src/graphics/Previews.cpp
index 4eaef63dc5..b31292fc30 100644
--- a/src/graphics/Previews.cpp
+++ b/src/graphics/Previews.cpp
@@ -19,10 +19,7 @@
 
 #include "insets/Inset.h"
 
-#include <tr1/memory>
-
 using namespace std;
-using namespace std::tr1;
 
 namespace lyx {
 
@@ -35,7 +32,7 @@ LyXRC_PreviewStatus Previews::status()
 
 
 namespace {
-typedef shared_ptr<PreviewLoader> PreviewLoaderPtr;
+typedef boost::shared_ptr<PreviewLoader> PreviewLoaderPtr;
 ///
 typedef map<Buffer const *, PreviewLoaderPtr> LyxCacheType;
 ///