6 files changed, 9 insertions, 15 deletions
diff --git a/src/diagnostic/active-diagnostic-request.cpp b/src/diagnostic/active-diagnostic-request.cpp
index 8cb047d..9e64bd5 100644
--- a/src/diagnostic/active-diagnostic-request.cpp
+++ b/src/diagnostic/active-diagnostic-request.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <fnmatch.h>
 #include <map>
+#include <fnmatch.h>
 
 #include "active-diagnostic-request.hpp"
 
diff --git a/src/diagnostic/active-diagnostic-request.hpp b/src/diagnostic/active-diagnostic-request.hpp
index 22bf850..452ff97 100644
--- a/src/diagnostic/active-diagnostic-request.hpp
+++ b/src/diagnostic/active-diagnostic-request.hpp
@@ -17,14 +17,13 @@
 
 #pragma once
 
+#include <string>
 #include <vector>
 
 #include "uds/uds.h"
 #include "uds/uds_types.h"
+#include "../utils/timer.hpp"
 #include "../can/can-bus-dev.hpp"
-#include "../can/can-message.hpp"
-
-#include "../low-can-binding.hpp"
 
 class active_diagnostic_request_t;
 class diagnostic_manager_t;
diff --git a/src/diagnostic/diagnostic-manager.cpp b/src/diagnostic/diagnostic-manager.cpp
index 7ff8644..4fc34b1 100644
--- a/src/diagnostic/diagnostic-manager.cpp
+++ b/src/diagnostic/diagnostic-manager.cpp
@@ -20,7 +20,6 @@
 
 #include "diagnostic-manager.hpp"
 
-#include "uds/uds.h"
 #include "../utils/openxc-utils.hpp"
 #include "../configuration.hpp"
 
diff --git a/src/diagnostic/diagnostic-manager.hpp b/src/diagnostic/diagnostic-manager.hpp
index 01aa5cf..c66e21a 100644
--- a/src/diagnostic/diagnostic-manager.hpp
+++ b/src/diagnostic/diagnostic-manager.hpp
@@ -23,12 +23,9 @@
 
 #include "uds/uds.h"
 #include "openxc.pb.h"
-#include "../can/can-bus-dev.hpp"
-#include "../can/can-message.hpp"
+#include "../can/can-bus.hpp"
 #include "active-diagnostic-request.hpp"
 
-#include "../low-can-binding.hpp"
-
 /*  Each CAN bus needs its own set of shim functions, so this should
  * match the maximum CAN controller count.
  */
@@ -50,10 +47,10 @@ protected:
 	static void shims_timer();
 
 private:
-	DiagnosticShims shims_; /*!< shims_ - A map of shim functions for each CAN bus that plug the diagnostics
-							 						* library (uds-c) into the VI's CAN peripheral.*/
+	DiagnosticShims shims_; /*!< shims_ - Shim functions for each CAN bus that plug the diagnostics
+							 * library (uds-c) into the VI's CAN peripheral.*/
 	std::string bus_; /*!< bus_ - A pointer to the CAN bus that should be used for all standard OBD-II requests, if the bus is not
-						  * explicitly spcified in the request. Default to the first bus CAN at initialization.*/
+						* explicitly spcified in the request. Default to the first bus CAN at initialization.*/
 	std::vector<active_diagnostic_request_t*> recurring_requests_; /*!< recurringRequests - A list of active recurring diagnostic requests.*/
 	std::vector<active_diagnostic_request_t*> non_recurring_requests_; /*!< nonrecurringRequests - A list of active one-time diagnostic requests. When a
 																	   * response is received for a non-recurring request or it times out, it is removed*/
diff --git a/src/diagnostic/diagnostic-message.cpp b/src/diagnostic/diagnostic-message.cpp
index c37bbd0..ca8bf84 100644
--- a/src/diagnostic/diagnostic-message.cpp
+++ b/src/diagnostic/diagnostic-message.cpp
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include <map>
 
 #include "diagnostic-message.hpp"
 
diff --git a/src/diagnostic/diagnostic-message.hpp b/src/diagnostic/diagnostic-message.hpp
index 686a8b4..b25fea3 100644
--- a/src/diagnostic/diagnostic-message.hpp
+++ b/src/diagnostic/diagnostic-message.hpp
@@ -18,14 +18,12 @@
 #pragma once
 
 #include <vector>
+#include <string>
 
 #include "uds/uds.h"
-#include "../can/can-bus.hpp"
 #include "../can/can-message.hpp"
 #include "active-diagnostic-request.hpp"
 
-#include "../low-can-binding.hpp"
-
 enum UNIT {
 	POURCENT,
 	DEGREES_CELSIUS,