diff --git a/FlippR-Driver/src/output/OutputDriverFactory.cpp b/FlippR-Driver/src/output/OutputDriverFactory.cpp
index b347a80..a759969 100644
--- a/FlippR-Driver/src/output/OutputDriverFactory.cpp
+++ b/FlippR-Driver/src/output/OutputDriverFactory.cpp
@@ -4,8 +4,7 @@
 
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/range/adaptor/map.hpp>
-#include <output/items/Flipper.h>
-#include <output/items/detail/Flipper.h>
+
 #include "OutputDriverFactory.h"
 
 #include "utility/LoggerFactory.h"
@@ -19,6 +18,8 @@
 
 #include "output/items/detail/EightDigitDisplay.h"
 #include "output/items/detail/SevenDigitDisplay.h"
+#include "output/items/Flipper.h"
+#include "output/items/detail/Flipper.h"
 
 namespace flippR_driver
 {
diff --git a/FlippR-Driver/src/output/OutputDriverFactory.h b/FlippR-Driver/src/output/OutputDriverFactory.h
index 33a2789..4e8272f 100644
--- a/FlippR-Driver/src/output/OutputDriverFactory.h
+++ b/FlippR-Driver/src/output/OutputDriverFactory.h
@@ -9,6 +9,8 @@
 #include "output/items/detail/Solenoid.h"
 #include "output/items/detail/Lamp.h"
 #include "output/items/detail/Sound.h"
+#include "output/items/Flipper.h"
+#include "output/items/detail/Flipper.h"
 #include "output/DisplayBoardPinController.h"
 
 #include "json/json.hpp"