diff --git a/examples/AutoFilterExample.cpp b/examples/AutoFilterExample.cpp
index 43621a0e7..a2b21a7f9 100644
--- a/examples/AutoFilterExample.cpp
+++ b/examples/AutoFilterExample.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
-#include <autowiring/Autowired.h>
+#include <autowiring/autowiring.h>
 #include <iostream>
 #include <string>
 
diff --git a/examples/AutoFilterTutorial.0.0.cpp b/examples/AutoFilterTutorial.0.0.cpp
index 20aa66214..b2249c607 100644
--- a/examples/AutoFilterTutorial.0.0.cpp
+++ b/examples/AutoFilterTutorial.0.0.cpp
@@ -18,7 +18,7 @@
 /// deal only with ordinary input and output.
 ///
 /// This tutorial will define and instantiate a simple filter network.
-#include <autowiring/Autowired.h> // Needed for Autowiring classes.
+#include <autowiring/autowiring.h> // Needed for Autowiring classes.
 #include <cmath>                  // Needed for std::round.
 #include <cstdlib>                // Needed for std::atof.
 #include <iostream>               // Needed for std::cout.
diff --git a/examples/AutoFilterTutorial.1.0.cpp b/examples/AutoFilterTutorial.1.0.cpp
index f26793c71..ee92d4f69 100644
--- a/examples/AutoFilterTutorial.1.0.cpp
+++ b/examples/AutoFilterTutorial.1.0.cpp
@@ -16,7 +16,7 @@
 /// - `const std::shared_ptr<const T>`
 /// - `const std::shared_ptr<const T> &`
 ///
-#include <autowiring/Autowired.h> // Needed for Autowiring classes.
+#include <autowiring/autowiring.h> // Needed for Autowiring classes.
 #include <iostream>               // Needed for std::cout.
 #include <string>                 // Needed for std::string.
 #include <unordered_set>          // Needed for std::unordered_set.
diff --git a/examples/AutoNetExample.cpp b/examples/AutoNetExample.cpp
index 66db1d067..c305ea8b0 100644
--- a/examples/AutoNetExample.cpp
+++ b/examples/AutoNetExample.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
-#include <autowiring/Autowired.h>
+#include <autowiring/autowiring.h>
 #include <autonet/AutoNetServer.h>
 #include <iostream>
 #include THREAD_HEADER
diff --git a/examples/ContextExample.cpp b/examples/ContextExample.cpp
index 7189a6fe7..7ccf3459b 100644
--- a/examples/ContextExample.cpp
+++ b/examples/ContextExample.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
-#include <autowiring/Autowired.h>
+#include <autowiring/autowiring.h>
 #include <iostream>
 #include <memory>
 
diff --git a/examples/ThreadExample.cpp b/examples/ThreadExample.cpp
index 54030c6bc..e5884f213 100644
--- a/examples/ThreadExample.cpp
+++ b/examples/ThreadExample.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
-#include <autowiring/Autowired.h>
+#include <autowiring/autowiring.h>
 #include <autowiring/CoreThread.h>
 #include <iostream>
 #include <memory>
@@ -30,35 +30,35 @@ class MyCoreThread:
 };
 
 int main(){
-  
+
   // The 2 main thread classes in Autowiring are the BasicThread and CoreThread.
   // Classes that inherit from these types will have thread capabilities
   // Both start when their enclosing context is 'initiated'. Threads injected
   // after the context is initiated will start immediatly
-  
+
   AutoRequired<MyBasicThread> myBasic;
-  
+
   AutoCurrentContext ctxt;
   ctxt->Initiate(); // myBasic->Run() starts now in its own thread
-  
+
   std::this_thread::sleep_for(std::chrono::milliseconds(250));
-  
+
   std::cout << "injecting a CoreThread" << std::endl;
-  
+
   // Types inheriting from CoreThread implement a dispatch queue in their 'run()'
   // function. Lambdas can be appended with operator+=
-  
+
   AutoRequired<MyCoreThread> myCore;
   myCore->AddToQueue(42);
   myCore->AddToQueue(1337);
-  
+
   *myCore += []{
     std::cout << "This gets run after '1337'" << std::endl;
   };
-  
+
   // This should be run before 'myCore' is finished
   std::cout << "This thread is faster\n";
-  
+
   // This will wait for all outstanding threads to finish before terminating the context
   ctxt->SignalShutdown(true);
 }
diff --git a/src/autonet/test/stdafx.h b/src/autonet/test/stdafx.h
index 357558062..93d3fa3ac 100644
--- a/src/autonet/test/stdafx.h
+++ b/src/autonet/test/stdafx.h
@@ -5,7 +5,7 @@
 #include <gtest/gtest.h>
 
 #ifdef _MSC_VER
-  #include <autowiring/Autowired.h>
+  #include <autowiring/autowiring.h>
   #include <thread>
   #include <mutex>
 #endif
diff --git a/src/autowiring/test/AutowiringTest.cpp b/src/autowiring/test/AutowiringTest.cpp
index 637b16a14..561055888 100644
--- a/src/autowiring/test/AutowiringTest.cpp
+++ b/src/autowiring/test/AutowiringTest.cpp
@@ -3,7 +3,7 @@
 #include "TestFixtures/SimpleObject.hpp"
 #include "TestFixtures/SimpleReceiver.hpp"
 #include <autotesting/gtest-all-guard.hpp>
-#include <autowiring/Autowired.h>
+#include <autowiring/autowiring.h>
 #include <autowiring/AutowiringDebug.h>
 #include <autowiring/CoreThread.h>
 
diff --git a/src/autowiring/test/AutowiringUtilitiesTest.cpp b/src/autowiring/test/AutowiringUtilitiesTest.cpp
index 22f4ed1bd..9effcfb19 100644
--- a/src/autowiring/test/AutowiringUtilitiesTest.cpp
+++ b/src/autowiring/test/AutowiringUtilitiesTest.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include "stdafx.h"
-#include <autowiring/Autowired.h>
+#include <autowiring/autowiring.h>
 #include <autowiring/BasicThread.h>
 #include <autowiring/CoreThread.h>
 #include <autowiring/thread_specific_ptr.h>
diff --git a/src/autowiring/test/BoltTest.cpp b/src/autowiring/test/BoltTest.cpp
index d2238954e..b313432c8 100644
--- a/src/autowiring/test/BoltTest.cpp
+++ b/src/autowiring/test/BoltTest.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include "stdafx.h"
-#include <autowiring/Autowired.h>
+#include <autowiring/autowiring.h>
 #include <autowiring/Bolt.h>
 #include "TestFixtures/SimpleObject.hpp"
 #include <string>
diff --git a/src/autowiring/test/ContextCleanupTest.cpp b/src/autowiring/test/ContextCleanupTest.cpp
index a290c963b..cc22d0781 100644
--- a/src/autowiring/test/ContextCleanupTest.cpp
+++ b/src/autowiring/test/ContextCleanupTest.cpp
@@ -2,7 +2,7 @@
 #include "stdafx.h"
 #include "TestFixtures/SimpleObject.hpp"
 #include "TestFixtures/SimpleThreaded.hpp"
-#include <autowiring/Autowired.h>
+#include <autowiring/autowiring.h>
 #include <autowiring/CoreContext.h>
 #include THREAD_HEADER
 
diff --git a/src/autowiring/test/ContextMapTest.cpp b/src/autowiring/test/ContextMapTest.cpp
index 0522e5bcb..a26cadfb3 100644
--- a/src/autowiring/test/ContextMapTest.cpp
+++ b/src/autowiring/test/ContextMapTest.cpp
@@ -2,7 +2,7 @@
 #include "stdafx.h"
 #include "TestFixtures/ExitRaceThreaded.hpp"
 #include "TestFixtures/SimpleThreaded.hpp"
-#include <autowiring/Autowired.h>
+#include <autowiring/autowiring.h>
 #include <autowiring/ContextMap.h>
 #include <string>
 #include THREAD_HEADER
diff --git a/src/autowiring/test/CoreThreadTest.cpp b/src/autowiring/test/CoreThreadTest.cpp
index e6da3a910..e7666ec38 100644
--- a/src/autowiring/test/CoreThreadTest.cpp
+++ b/src/autowiring/test/CoreThreadTest.cpp
@@ -2,7 +2,7 @@
 #include "stdafx.h"
 #include "TestFixtures/SimpleThreaded.hpp"
 #include <autowiring/at_exit.h>
-#include <autowiring/Autowired.h>
+#include <autowiring/autowiring.h>
 #include <algorithm>
 #include THREAD_HEADER
 
diff --git a/src/autowiring/test/CurrentContextPusherTest.cpp b/src/autowiring/test/CurrentContextPusherTest.cpp
index e87725db6..4fca8ccf3 100644
--- a/src/autowiring/test/CurrentContextPusherTest.cpp
+++ b/src/autowiring/test/CurrentContextPusherTest.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include "stdafx.h"
-#include <autowiring/Autowired.h>
+#include <autowiring/autowiring.h>
 #include <autowiring/CoreContext.h>
 #include <autowiring/CurrentContextPusher.h>
 #include <thread>
diff --git a/src/autowiring/test/GlobalInitTest.cpp b/src/autowiring/test/GlobalInitTest.cpp
index 7e63804a0..90d4024c6 100644
--- a/src/autowiring/test/GlobalInitTest.cpp
+++ b/src/autowiring/test/GlobalInitTest.cpp
@@ -2,7 +2,7 @@
 #include "stdafx.h"
 #include "GlobalInitTest.hpp"
 #include "TestFixtures/SimpleObject.hpp"
-#include <autowiring/Autowired.h>
+#include <autowiring/autowiring.h>
 #include <autowiring/GlobalCoreContext.h>
 
 void GlobalInitTest::SetUp(void) {
diff --git a/src/autowiring/test/MultiInheritTest.cpp b/src/autowiring/test/MultiInheritTest.cpp
index da8169dda..aea67c203 100644
--- a/src/autowiring/test/MultiInheritTest.cpp
+++ b/src/autowiring/test/MultiInheritTest.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include "stdafx.h"
 #include "TestFixtures/MultiInherit.hpp"
-#include <autowiring/Autowired.h>
+#include <autowiring/autowiring.h>
 #include <autowiring/CoreContext.h>
 
 class MultiInheritTest:
diff --git a/src/autowiring/test/OnceTest.cpp b/src/autowiring/test/OnceTest.cpp
index 2a967c5a3..2e5526183 100644
--- a/src/autowiring/test/OnceTest.cpp
+++ b/src/autowiring/test/OnceTest.cpp
@@ -2,7 +2,7 @@
 #include "stdafx.h"
 #include "TestFixtures/SimpleObject.hpp"
 #include "TestFixtures/SimpleThreaded.hpp"
-#include <autowiring/Autowired.h>
+#include <autowiring/autowiring.h>
 #include <autowiring/CoreContext.h>
 #include <autowiring/once.h>
 #include THREAD_HEADER
diff --git a/src/autowiring/test/PostConstructTest.cpp b/src/autowiring/test/PostConstructTest.cpp
index 1b4e8494d..f157dee53 100644
--- a/src/autowiring/test/PostConstructTest.cpp
+++ b/src/autowiring/test/PostConstructTest.cpp
@@ -2,7 +2,7 @@
 #include "stdafx.h"
 #include "TestFixtures/SimpleObject.hpp"
 #include "HasForwardOnlyType.hpp"
-#include <autowiring/Autowired.h>
+#include <autowiring/autowiring.h>
 #include <autowiring/ContextMember.h>
 #include THREAD_HEADER
 
diff --git a/src/autowiring/test/ScopeTest.cpp b/src/autowiring/test/ScopeTest.cpp
index 85c1a5ceb..749733a1e 100644
--- a/src/autowiring/test/ScopeTest.cpp
+++ b/src/autowiring/test/ScopeTest.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include "stdafx.h"
 #include "TestFixtures/SimpleObject.hpp"
-#include <autowiring/Autowired.h>
+#include <autowiring/autowiring.h>
 #include <autowiring/GlobalCoreContext.h>
 
 class ScopeTest:
diff --git a/src/autowiring/test/TestFixtures/ExitRaceThreaded.hpp b/src/autowiring/test/TestFixtures/ExitRaceThreaded.hpp
index 1d09d3c7e..531874edf 100644
--- a/src/autowiring/test/TestFixtures/ExitRaceThreaded.hpp
+++ b/src/autowiring/test/TestFixtures/ExitRaceThreaded.hpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #pragma once
-#include <autowiring/Autowired.h>
+#include <autowiring/autowiring.h>
 #include <autowiring/CoreThread.h>
 
 /// <summary>
diff --git a/src/autowiring/test/TypeRegistryTest.cpp b/src/autowiring/test/TypeRegistryTest.cpp
index fb3d9a693..224755b7e 100644
--- a/src/autowiring/test/TypeRegistryTest.cpp
+++ b/src/autowiring/test/TypeRegistryTest.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include "stdafx.h"
-#include <autowiring/Autowired.h>
+#include <autowiring/autowiring.h>
 #include <autowiring/GlobalCoreContext.h>
 #include <autowiring/TypeRegistry.h>