diff --git a/bsa/bsa_archive.cpp b/bsa/bsa_archive.cpp
index 15768b5f0e..d1a8c150fe 100644
--- a/bsa/bsa_archive.cpp
+++ b/bsa/bsa_archive.cpp
@@ -27,7 +27,7 @@
 #include <OgreArchiveFactory.h>
 #include <OgreArchiveManager.h>
 #include "bsa_file.hpp"
-#include "../mangle/stream/clients/ogre_datastream.hpp"
+#include <mangle/stream/clients/ogre_datastream.hpp>
 
 using namespace Ogre;
 using namespace Mangle::Stream;
diff --git a/bsa/bsa_file.cpp b/bsa/bsa_file.cpp
index dfe35ea932..7a7600ad1d 100644
--- a/bsa/bsa_file.cpp
+++ b/bsa/bsa_file.cpp
@@ -23,9 +23,9 @@
 
 #include "bsa_file.hpp"
 
-#include "../mangle/stream/servers/file_stream.hpp"
-#include "../mangle/stream/filters/slice_stream.hpp"
-#include "../mangle/tools/str_exception.hpp"
+#include <mangle/stream/servers/file_stream.hpp>
+#include <mangle/stream/filters/slice_stream.hpp>
+#include <mangle/tools/str_exception.hpp>
 
 #include <stdlib.h>
 #include <assert.h>
diff --git a/bsa/bsa_file.hpp b/bsa/bsa_file.hpp
index f4ef7676ca..5c19409ab4 100644
--- a/bsa/bsa_file.hpp
+++ b/bsa/bsa_file.hpp
@@ -24,7 +24,7 @@
 #ifndef _BSA_FILE_H_
 #define _BSA_FILE_H_
 
-#include "../mangle/stream/stream.hpp"
+#include <mangle/stream/stream.hpp>
 
 #include <stdint.h>
 #include <strings.h>
diff --git a/esm/esm_reader.hpp b/esm/esm_reader.hpp
index 63374b11b2..52f67fea05 100644
--- a/esm/esm_reader.hpp
+++ b/esm/esm_reader.hpp
@@ -9,10 +9,10 @@
 #include <sstream>
 #include <iomanip>
 
-#include "../mangle/stream/stream.hpp"
-#include "../mangle/stream/servers/file_stream.hpp"
-#include "../mangle/tools/str_exception.hpp"
-#include "../tools/stringops.hpp"
+#include <mangle/stream/stream.hpp>
+#include <mangle/stream/servers/file_stream.hpp>
+#include <mangle/tools/str_exception.hpp>
+#include "tools/stringops.hpp"
 
 #ifdef __APPLE__
 // need our own implementation of strnlen
diff --git a/esm_store/cell_store.hpp b/esm_store/cell_store.hpp
index 1c47bb9b38..8b84439fe2 100644
--- a/esm_store/cell_store.hpp
+++ b/esm_store/cell_store.hpp
@@ -12,7 +12,7 @@
 
 #include "store.hpp"
 #include "esm/records.hpp"
-#include "mangle/tools/str_exception.hpp"
+#include <mangle/tools/str_exception.hpp>
 #include <list>
 
 namespace ESMS
diff --git a/game/mwrender/cell.cpp b/game/mwrender/cell.cpp
index 11aede27c6..07ed1af0f9 100644
--- a/game/mwrender/cell.cpp
+++ b/game/mwrender/cell.cpp
@@ -9,7 +9,7 @@ using namespace Ogre;
 using namespace ESMS;
 
 // Inserts one mesh into the scene
-void CellRender::insertMesh(const std::string mesh,   // NIF file
+void CellRender::insertMesh(const std::string &mesh, // NIF file
                            const CellRef &ref)       // Reference information
 {
   // Create and place scene node for this object
diff --git a/game/mwrender/cell.hpp b/game/mwrender/cell.hpp
index 08c4e1edba..252a9c47c3 100644
--- a/game/mwrender/cell.hpp
+++ b/game/mwrender/cell.hpp
@@ -24,7 +24,7 @@ namespace MWRender
     /// cell.
     Ogre::SceneNode *base;
 
-    void insertMesh(const std::string mesh,    // NIF file
+    void insertMesh(const std::string &mesh,   // NIF file
                     const ESMS::CellRef &ref); // Reference information
                    
     template<typename T>   
diff --git a/nif/nif_file.cpp b/nif/nif_file.cpp
index c09705b909..40e923f7e3 100644
--- a/nif/nif_file.cpp
+++ b/nif/nif_file.cpp
@@ -23,7 +23,7 @@
 
 #include "nif_file.hpp"
 #include "record.hpp"
-#include "../tools/stringops.hpp"
+#include "tools/stringops.hpp"
 
 #include "extra.hpp"
 #include "controlled.hpp"
diff --git a/nif/nif_file.hpp b/nif/nif_file.hpp
index 031bb9e331..a827758d40 100644
--- a/nif/nif_file.hpp
+++ b/nif/nif_file.hpp
@@ -24,9 +24,9 @@
 #ifndef _NIF_FILE_H_
 #define _NIF_FILE_H_
 
-#include "../mangle/stream/stream.hpp"
-#include "../mangle/stream/filters/buffer_stream.hpp"
-#include "../mangle/tools/str_exception.hpp"
+#include <mangle/stream/stream.hpp>
+#include <mangle/stream/filters/buffer_stream.hpp>
+#include <mangle/tools/str_exception.hpp>
 
 #include "../tools/slice_array.hpp"
 
diff --git a/nifogre/ogre_nif_loader.cpp b/nifogre/ogre_nif_loader.cpp
index da4d6843fe..32250305e1 100644
--- a/nifogre/ogre_nif_loader.cpp
+++ b/nifogre/ogre_nif_loader.cpp
@@ -25,11 +25,11 @@
 #include <Ogre.h>
 #include <stdio.h>
 
-#include "../mangle/vfs/servers/ogre_vfs.hpp"
-#include "../nif/nif_file.hpp"
-#include "../nif/node.hpp"
-#include "../nif/data.hpp"
-#include "../nif/property.hpp"
+#include <mangle/vfs/servers/ogre_vfs.hpp>
+#include "nif/nif_file.hpp"
+#include "nif/node.hpp"
+#include "nif/data.hpp"
+#include "nif/property.hpp"
 
 // For warning messages
 #include <iostream>