diff --git a/Builds/VisualStudio2012/beast.vcxproj b/Builds/VisualStudio2012/beast.vcxproj
index 27e6fbd844..8914c8f9a2 100644
--- a/Builds/VisualStudio2012/beast.vcxproj
+++ b/Builds/VisualStudio2012/beast.vcxproj
@@ -162,7 +162,6 @@
     <ClInclude Include="..\..\beast\smart_ptr\SharedObject.h" />
     <ClInclude Include="..\..\beast\smart_ptr\SharedPtr.h" />
     <ClInclude Include="..\..\beast\StaticAssert.h" />
-    <ClInclude Include="..\..\beast\STL.h" />
     <ClInclude Include="..\..\beast\Strings.h" />
     <ClInclude Include="..\..\beast\strings\CharacterFunctions.h" />
     <ClInclude Include="..\..\beast\strings\CharPointer_ASCII.h" />
diff --git a/Builds/VisualStudio2012/beast.vcxproj.filters b/Builds/VisualStudio2012/beast.vcxproj.filters
index 9caf855abd..0f09ebf75a 100644
--- a/Builds/VisualStudio2012/beast.vcxproj.filters
+++ b/Builds/VisualStudio2012/beast.vcxproj.filters
@@ -1158,9 +1158,6 @@
     <ClInclude Include="..\..\beast\smart_ptr\AbstractObject.h">
       <Filter>beast\smart_ptr</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\beast\STL.h">
-      <Filter>beast</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\beast\Insight.h">
       <Filter>beast</Filter>
     </ClInclude>
diff --git a/beast/STL.h b/beast/STL.h
deleted file mode 100644
index 730eb22ebf..0000000000
--- a/beast/STL.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_STL_H_INCLUDED
-#define BEAST_STL_H_INCLUDED
-
-#include "stl/shared_ptr.h"
-
-#endif
diff --git a/beast/insight/CounterImpl.h b/beast/insight/CounterImpl.h
index 963151490c..f6c0b6e0db 100644
--- a/beast/insight/CounterImpl.h
+++ b/beast/insight/CounterImpl.h
@@ -20,7 +20,6 @@
 #ifndef BEAST_INSIGHT_COUNTERIMPL_H_INCLUDED
 #define BEAST_INSIGHT_COUNTERIMPL_H_INCLUDED
 
-#include <functional>
 #include <memory>
 
 namespace beast {
diff --git a/beast/insight/GaugeImpl.h b/beast/insight/GaugeImpl.h
index 50ff9b5866..e816e6ce7e 100644
--- a/beast/insight/GaugeImpl.h
+++ b/beast/insight/GaugeImpl.h
@@ -20,6 +20,9 @@
 #ifndef BEAST_INSIGHT_GAUGEIMPL_H_INCLUDED
 #define BEAST_INSIGHT_GAUGEIMPL_H_INCLUDED
 
+#include <functional>
+#include <memory>
+
 namespace beast {
 namespace insight {
 
diff --git a/beast/insight/Hook.h b/beast/insight/Hook.h
index 3b45992e3a..a529c0e1be 100644
--- a/beast/insight/Hook.h
+++ b/beast/insight/Hook.h
@@ -22,7 +22,7 @@
 
 #include "HookImpl.h"
 
-#include "../stl/shared_ptr.h"
+#include <memory>
 
 namespace beast {
 namespace insight {
diff --git a/beast/insight/Meter.h b/beast/insight/Meter.h
index bc7c72f9b7..3471fb31f5 100644
--- a/beast/insight/Meter.h
+++ b/beast/insight/Meter.h
@@ -22,7 +22,7 @@
 
 #include "MeterImpl.h"
 
-#include "../stl/shared_ptr.h"
+#include <memory>
 
 namespace beast {
 namespace insight {
diff --git a/beast/make_unique.h b/beast/make_unique.h
index c48e7e0d3e..e26402ae2a 100644
--- a/beast/make_unique.h
+++ b/beast/make_unique.h
@@ -24,6 +24,12 @@
 
 namespace std {
 
+#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
+# ifdef _MSC_VER
+#  define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+# endif
+#endif
+
 #ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
 
 template <class T>
diff --git a/beast/stl/STL.cpp b/beast/stl/STL.cpp
deleted file mode 100644
index 24ed420bf1..0000000000
--- a/beast/stl/STL.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#include "BeastConfig.h"
-
-#include "shared_ptr.h"
diff --git a/beast/stl/shared_ptr.h b/beast/stl/shared_ptr.h
deleted file mode 100644
index 3d2875b4db..0000000000
--- a/beast/stl/shared_ptr.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_STL_SHARED_PTR_H_INCLUDED
-#define BEAST_STL_SHARED_PTR_H_INCLUDED
-
-#include <boost/smart_ptr.hpp>
-
-namespace beast {
-
-using boost::shared_ptr;
-using boost::make_shared;
-using boost::enable_shared_from_this;
-
-}
-
-#endif
diff --git a/modules/beast_core/beast_core.h b/modules/beast_core/beast_core.h
index c3526cf918..faec9deb11 100644
--- a/modules/beast_core/beast_core.h
+++ b/modules/beast_core/beast_core.h
@@ -61,7 +61,6 @@
 #include "../../beast/Threads.h"
 #include "../../beast/Utility.h"
 #include "../../beast/Chrono.h"
-#include "../../beast/STL.h"
 
 #include "system/StandardIncludes.h"
 
diff --git a/modules/beast_sqdb/source/session.cpp b/modules/beast_sqdb/source/session.cpp
index 6e18c66eba..ff8a71cc8f 100644
--- a/modules/beast_sqdb/source/session.cpp
+++ b/modules/beast_sqdb/source/session.cpp
@@ -139,7 +139,8 @@ Error session::open(String fileName, std::string options)
 
     std::stringstream ssconn(options);
 
-    while (!err && !ssconn.eof() && ssconn.str().find('=') >= 0)
+    while (!err && !ssconn.eof() &&
+           ssconn.str().find('=') != std::string::npos)
     {
         std::string key, val;
         std::getline(ssconn, key, '=');