diff --git a/samples/example.cpp b/samples/example.cpp
index e5838b08..e7534515 100644
--- a/samples/example.cpp
+++ b/samples/example.cpp
@@ -7,7 +7,7 @@
 #include <iostream>
 
 #include <chaiscript/chaiscript.hpp>
-#include <chaiscript/chaiscript_stdlib.hpp>
+#include <chaiscript/dispatchkit/bootstrap_stl.hpp>
 #include <chaiscript/dispatchkit/function_call.hpp>
 
 void log(const std::string &msg)
@@ -67,7 +67,7 @@ void take_shared_ptr(const std::shared_ptr<const std::string> &p)
 int main(int /*argc*/, char * /*argv*/[]) {
   using namespace chaiscript;
 
-  ChaiScript chai(Std_Lib::library());
+  ChaiScript chai;
 
   //Create a new system object and share it with the chaiscript engine
   System system;
diff --git a/unittests/cpp_lambda_test.cpp b/unittests/cpp_lambda_test.cpp
index ec5a0ff0..d38983de 100644
--- a/unittests/cpp_lambda_test.cpp
+++ b/unittests/cpp_lambda_test.cpp
@@ -1,6 +1,5 @@
 #include <chaiscript/utility/utility.hpp>
 
-#include <chaiscript/chaiscript_stdlib.hpp>
 
 int main()
 {
@@ -9,7 +8,7 @@ int main()
   // in an std::function or provide the signature
   
 
-  chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());
+  chaiscript::ChaiScript chai;
 
   // provide the signature
   chai.add(chaiscript::fun<std::string ()>([] { return "hello"; } ), "f1");
diff --git a/unittests/dynamic_object_test.cpp b/unittests/dynamic_object_test.cpp
index 60c1e5e9..3e09ef64 100644
--- a/unittests/dynamic_object_test.cpp
+++ b/unittests/dynamic_object_test.cpp
@@ -1,5 +1,4 @@
 
-#include <chaiscript/chaiscript_stdlib.hpp>
 #include <chaiscript/utility/utility.hpp>
 
 template<typename LHS, typename RHS>
@@ -16,7 +15,7 @@ void assert_equal(const LHS &lhs, const RHS &rhs)
 
 int main()
 {
-  chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());
+  chaiscript::ChaiScript chai;
 
   chai("attr bob::z; def bob::bob() { this.z = 10 }; auto x = bob()");
 
diff --git a/unittests/eval_catch_exception_test.cpp b/unittests/eval_catch_exception_test.cpp
index 0a7aced1..21510d79 100644
--- a/unittests/eval_catch_exception_test.cpp
+++ b/unittests/eval_catch_exception_test.cpp
@@ -1,11 +1,10 @@
 // Tests to make sure that the order in which function dispatches occur is correct
 
 #include <chaiscript/chaiscript.hpp>
-#include <chaiscript/chaiscript_stdlib.hpp>
 
 int test_generic()
 {
-  chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());
+  chaiscript::ChaiScript chai;
   
   try {
     chai.eval("throw(runtime_error(\"error\"));");
@@ -23,7 +22,7 @@ int test_generic()
 
 int test_1()
 {
-  chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());
+  chaiscript::ChaiScript chai;
   
   try {
     chai.eval("throw(1)", chaiscript::exception_specification<int>());
@@ -40,7 +39,7 @@ int test_1()
 
 int test_2()
 {
-  chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());
+  chaiscript::ChaiScript chai;
   
   try {
     chai.eval("throw(1.0)", chaiscript::exception_specification<int, double>());
@@ -57,7 +56,7 @@ int test_2()
 
 int test_5()
 {
-  chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());
+  chaiscript::ChaiScript chai;
 
   try {
     chai.eval("throw(runtime_error(\"error\"))", chaiscript::exception_specification<int, double, float, const std::string &, const std::exception &>());
@@ -83,7 +82,7 @@ int test_5()
 
 int test_unhandled()
 {
-  chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());
+  chaiscript::ChaiScript chai;
 
   try {
     chai.eval("throw(\"error\")", chaiscript::exception_specification<int, double, float, const std::exception &>());
diff --git a/unittests/function_ordering_test.cpp b/unittests/function_ordering_test.cpp
index 125c2a1f..00552207 100644
--- a/unittests/function_ordering_test.cpp
+++ b/unittests/function_ordering_test.cpp
@@ -1,7 +1,6 @@
 // Tests to make sure that the order in which function dispatches occur is correct
 
 #include <chaiscript/utility/utility.hpp>
-#include <chaiscript/chaiscript_stdlib.hpp>
 
 int test_one(const int &)
 {
@@ -15,7 +14,7 @@ int test_two(int &)
 
 int main()
 {
-  chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());
+  chaiscript::ChaiScript chai;
   chai.eval("def test_fun(x) { return 3; }");
   chai.eval("def test_fun(x) : x == \"hi\" { return 4; }");
 //  chai.eval("def test_fun(x) { return 5; }");
diff --git a/unittests/functor_cast_test.cpp b/unittests/functor_cast_test.cpp
index 33250c90..7c76ca20 100644
--- a/unittests/functor_cast_test.cpp
+++ b/unittests/functor_cast_test.cpp
@@ -1,5 +1,4 @@
 #include <chaiscript/utility/utility.hpp>
-#include <chaiscript/chaiscript_stdlib.hpp>
 
 double test_call(const std::function<double (int)> &f, int val)
 {
@@ -9,7 +8,7 @@ double test_call(const std::function<double (int)> &f, int val)
 int main()
 {
 
-  chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());
+  chaiscript::ChaiScript chai;
   
   chai.add(chaiscript::fun(&test_call), "test_call");
 
diff --git a/unittests/functor_creation_test.cpp b/unittests/functor_creation_test.cpp
index d5289cbc..bea12447 100644
--- a/unittests/functor_creation_test.cpp
+++ b/unittests/functor_creation_test.cpp
@@ -1,11 +1,10 @@
 #include <chaiscript/utility/utility.hpp>
 
-#include <chaiscript/chaiscript_stdlib.hpp>
 
 int main()
 {
 
-  chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());
+  chaiscript::ChaiScript chai;
 
   chai.eval("def func() { print(\"Hello World\"); } ");
 
diff --git a/unittests/object_lifetime_test.cpp b/unittests/object_lifetime_test.cpp
index 6d24f9c8..ab66ad76 100644
--- a/unittests/object_lifetime_test.cpp
+++ b/unittests/object_lifetime_test.cpp
@@ -1,5 +1,4 @@
 #include <chaiscript/utility/utility.hpp>
-#include <chaiscript/chaiscript_stdlib.hpp>
 
 class Test
 {
@@ -37,7 +36,7 @@ int main()
       { {chaiscript::fun(&Test::count), "count"} }
       );
 
-  chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());
+  chaiscript::ChaiScript chai;
   chai.add(m);
 //  chai.add(chaiscript::fun(&Test::count), "count");
 
diff --git a/unittests/short_comparison_test.cpp b/unittests/short_comparison_test.cpp
index 8295f326..5aacfdc2 100644
--- a/unittests/short_comparison_test.cpp
+++ b/unittests/short_comparison_test.cpp
@@ -1,5 +1,4 @@
 #include <chaiscript/utility/utility.hpp>
-#include <chaiscript/chaiscript_stdlib.hpp>
 
 class Test {
  public:
@@ -13,7 +12,7 @@ class Test {
 int main()
 {
 
-  chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());
+  chaiscript::ChaiScript chai;
   chai.add(chaiscript::user_type<Test>(), "Test");
   chai.add(chaiscript::constructor<Test()>(), "Test");