diff --git a/FlippR-Driver/src/DriverFactory.cpp b/FlippR-Driver/src/DriverFactory.cpp
index 05bfc89..e8704b4 100644
--- a/FlippR-Driver/src/DriverFactory.cpp
+++ b/FlippR-Driver/src/DriverFactory.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "DriverFactory.h"
+
 #include "input/InputDriverFactory.h"
 
 namespace flippR_driver
diff --git a/FlippR-Driver/src/input/Detector.cpp b/FlippR-Driver/src/input/Detector.cpp
index c9e7f2d..f8ce867 100644
--- a/FlippR-Driver/src/input/Detector.cpp
+++ b/FlippR-Driver/src/input/Detector.cpp
@@ -8,7 +8,6 @@
 #include "Detector.h"
 
 #include <iostream>
-#include <math.h>
 
 #include "utility/config.h"
 
diff --git a/FlippR-Driver/src/input/InputDriver.cpp b/FlippR-Driver/src/input/InputDriver.cpp
index 6ce8e8a..8c5e7b9 100644
--- a/FlippR-Driver/src/input/InputDriver.cpp
+++ b/FlippR-Driver/src/input/InputDriver.cpp
@@ -7,8 +7,7 @@
 #include "InputDriver.h"
 
 #include "utility/config.h"
-
-#include <input/ErrorEvent.hpp>
+#include "ErrorEvent.hpp"
 
 namespace flippR_driver
 {
diff --git a/FlippR-Driver/src/input/InputDriverFactory.cpp b/FlippR-Driver/src/input/InputDriverFactory.cpp
index 491a754..59498af 100644
--- a/FlippR-Driver/src/input/InputDriverFactory.cpp
+++ b/FlippR-Driver/src/input/InputDriverFactory.cpp
@@ -14,9 +14,7 @@
 
 #include "InputDriver.h"
 #include "EventNotifier.h"
-
-using namespace nlohmann;
-using namespace flippR_driver::utility;
+#include "Detector.h"
 
 namespace flippR_driver
 {
@@ -25,8 +23,10 @@ namespace input
 namespace InputDriverFactory
 {
 
-std::shared_ptr<IInputDriver>
-get_InputDriver(std::istream &input_config_stream, std::istream &matrix_config_stream)
+using namespace nlohmann;
+using namespace flippR_driver::utility;
+
+std::shared_ptr<IInputDriver> get_InputDriver(std::istream& input_config_stream, std::istream& matrix_config_stream)
 {
   LoggerFactory::CreateInputLogger();
 
@@ -38,16 +38,17 @@ get_InputDriver(std::istream &input_config_stream, std::istream &matrix_config_s
 
   json matrix_config;
   matrix_config_stream >> matrix_config;
-  create_input_events(matrix_config, events, name_event_map, event_notifier);
+  create_events(matrix_config, events, name_event_map, event_notifier);
 
   std::unique_ptr<IInputGPIOInterface> input_gpio_interface(new InputGPIOInterface(input_config_stream));
   std::unique_ptr<IDetector> detector(new Detector(std::move(input_gpio_interface), events));
 
   return std::shared_ptr<InputDriver>(new InputDriver(event_notifier, std::move(detector), name_event_map));
 }
+
 namespace
 {
-  void create_input_events(json matrix_config, std::vector<std::shared_ptr<DistributingEvent>> &events,
+  void create_events(json matrix_config, std::vector<std::shared_ptr<DistributingEvent>> &events,
                       std::map<std::string, std::shared_ptr<Event>> &name_event_map,
                       std::shared_ptr<IEventNotifier> event_notifier)
   {
@@ -62,7 +63,7 @@ namespace
     }
   }
 
-  static std::shared_ptr<DistributingEvent> create_event(json &json_event, std::shared_ptr<IEventNotifier> event_notifier, int bounce_time)
+  std::shared_ptr<DistributingEvent> create_event(json &json_event, std::shared_ptr<IEventNotifier> event_notifier, int bounce_time)
   {
     try
     {
@@ -81,7 +82,7 @@ namespace
     }
   }
 
-  static void set_individual_bounce_time(json &json_event, int &bounce_time)
+  void set_individual_bounce_time(json &json_event, int &bounce_time)
   {
     auto it_bounce_time = json_event.find("bounce_time");
 
@@ -95,4 +96,3 @@ namespace
 }
 }
 }
-}
diff --git a/FlippR-Driver/src/input/InputDriverFactory.h b/FlippR-Driver/src/input/InputDriverFactory.h
index c1a7356..394188e 100644
--- a/FlippR-Driver/src/input/InputDriverFactory.h
+++ b/FlippR-Driver/src/input/InputDriverFactory.h
@@ -9,15 +9,11 @@
 #define INPUTFACTORY_H_
 
 #include <istream>
-#include <atomic>
-
-#include <boost/optional.hpp>
-
-#include "Detector.h"
-#include "input/IInputDriver.h"
-
-#include "InputGPIOInterface.h"
 #include "json/json.hpp"
+
+#include "input/IInputDriver.h"
+#include "DistributingEvent.h"
+#include "InputGPIOInterface.h"
 #include "IEventNotifier.h"
 
 namespace flippR_driver
@@ -26,11 +22,11 @@ namespace input
 {
 namespace InputDriverFactory
 {
-  static std::shared_ptr<IInputDriver> get_InputDriver(std::istream& input_config_stream, std::istream& matrix_config_stream);
+  std::shared_ptr<IInputDriver> get_InputDriver(std::istream& input_config_stream, std::istream& matrix_config_stream);
 
   namespace
   {
-  static void create_input_events(nlohmann::json matrix_config,
+  static void create_events(nlohmann::json matrix_config,
                                   std::vector<std::shared_ptr<DistributingEvent>> &events,
                                   std::map<std::string, std::shared_ptr<Event>> &name_event_map,
                                   std::shared_ptr<IEventNotifier> event_notifier);
diff --git a/FlippR-Driver/src/output/DisplayController.cpp b/FlippR-Driver/src/output/DisplayController.cpp
index a41c0da..afaf63c 100644
--- a/FlippR-Driver/src/output/DisplayController.cpp
+++ b/FlippR-Driver/src/output/DisplayController.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "DisplayController.h"
-#include "IOutputGPIOInterface.h"
 
 #include "utility/config.h"
 
diff --git a/FlippR-Driver/src/output/items/Solenoid.cpp b/FlippR-Driver/src/output/items/Solenoid.cpp
index 6e793f4..881f154 100644
--- a/FlippR-Driver/src/output/items/Solenoid.cpp
+++ b/FlippR-Driver/src/output/items/Solenoid.cpp
@@ -7,8 +7,6 @@
 
 #include "Solenoid.h"
 
-#include <thread>
-
 namespace flippR_driver
 {
 namespace output
diff --git a/FlippR-Driver/src/output/items/Sound.cpp b/FlippR-Driver/src/output/items/Sound.cpp
index 0c7b933..78ef255 100644
--- a/FlippR-Driver/src/output/items/Sound.cpp
+++ b/FlippR-Driver/src/output/items/Sound.cpp
@@ -7,8 +7,6 @@
 
 #include "Sound.h"
 
-#include <thread>
-
 namespace flippR_driver
 {
 namespace output
diff --git a/FlippR-Driver/src/utility/InputSocketHandler.cpp b/FlippR-Driver/src/utility/InputSocketHandler.cpp
index 6387e0d..623418f 100644
--- a/FlippR-Driver/src/utility/InputSocketHandler.cpp
+++ b/FlippR-Driver/src/utility/InputSocketHandler.cpp
@@ -5,7 +5,6 @@
 #include "InputSocketHandler.h"
 
 #include "boost/date_time/posix_time/posix_time.hpp"
-#include <chrono>
 
 namespace flippR_driver
 {
diff --git a/FlippR-Driver/src/utility/LoggerFactory.cpp b/FlippR-Driver/src/utility/LoggerFactory.cpp
index f5d4cca..b66737f 100644
--- a/FlippR-Driver/src/utility/LoggerFactory.cpp
+++ b/FlippR-Driver/src/utility/LoggerFactory.cpp
@@ -4,8 +4,6 @@
 
 #include "LoggerFactory.h"
 
-#include "config.h"
-
 #ifndef EASYLOGGING_IS_INITIALIZED
 #define EASYLOGGING_IS_INITIALIZED
 INITIALIZE_EASYLOGGINGPP