6 files changed, 7 insertions, 10 deletions
diff --git a/CAN-binder/low-can-binding/can/can-bus-dev.cpp b/CAN-binder/low-can-binding/can/can-bus-dev.cpp
index 6cd2264..6b8d914 100644
--- a/CAN-binder/low-can-binding/can/can-bus-dev.cpp
+++ b/CAN-binder/low-can-binding/can/can-bus-dev.cpp
@@ -21,8 +21,6 @@
 #include <unistd.h>
 #include <linux/can/raw.h>
 #include <linux/can/bcm.h>
-
-#include "can-bus-dev.hpp"
 #include <cmath>
 
 #include "can-bus.hpp"
@@ -31,6 +29,7 @@
 #include "canutil/write.h"
 
 #define U64_DATA(p) (*(unsigned long long*)(p)->data)
+
 /// @brief Class constructor
 ///
 /// @param[in] dev_name - String representing the device name into the linux /dev tree
diff --git a/CAN-binder/low-can-binding/can/can-bus-dev.hpp b/CAN-binder/low-can-binding/can/can-bus-dev.hpp
index 04914ce..d32f9a8 100644
--- a/CAN-binder/low-can-binding/can/can-bus-dev.hpp
+++ b/CAN-binder/low-can-binding/can/can-bus-dev.hpp
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <stdint.h>
-#include <linux/can.h>
 #include <string>
 #include <thread>
 
diff --git a/CAN-binder/low-can-binding/can/can-bus.hpp b/CAN-binder/low-can-binding/can/can-bus.hpp
index 2194fa2..11b3b7a 100644
--- a/CAN-binder/low-can-binding/can/can-bus.hpp
+++ b/CAN-binder/low-can-binding/can/can-bus.hpp
@@ -29,8 +29,7 @@
 #include "can-bus-dev.hpp"
 #include "can-signals.hpp"
 #include "../utils/config-parser.hpp"
-#include "../diagnostic/active-diagnostic-request.hpp"
-
+#include "../diagnostic/diagnostic-manager.hpp"
 #include "../low-can-binding.hpp"
 
 // TODO actual max is 32 but dropped to 24 for memory considerations
@@ -52,6 +51,9 @@ class can_bus_t
 private:
 	utils::config_parser_t conf_file_; ///< configuration file handle used to initialize can_bus_dev_t objects.
 
+	int process_can_signals(can_message_t& can_message);
+	int process_diagnostic_signals(diagnostic_manager_t& manager, const can_message_t& can_message);
+
 	void can_decode_message();
 	std::thread th_decoding_; ///< thread that'll handle decoding a can frame
 	bool is_decoding_ = false; ///< boolean member controling thread while loop
@@ -80,9 +82,6 @@ public:
 	void start_threads();
 	void stop_threads();
 
-	int process_can_signals(can_message_t& can_message);
-	int process_diagnostic_signals(diagnostic_manager_t& manager, const can_message_t& can_message);
-
 	can_message_t next_can_message();
 	void push_new_can_message(const can_message_t& can_msg);
 	std::mutex& get_can_message_mutex();
diff --git a/CAN-binder/low-can-binding/can/can-decoder.cpp b/CAN-binder/low-can-binding/can/can-decoder.cpp
index a6c064d..902484e 100644
--- a/CAN-binder/low-can-binding/can/can-decoder.cpp
+++ b/CAN-binder/low-can-binding/can/can-decoder.cpp
@@ -20,6 +20,8 @@
 #include "canutil/read.h"
 #include "../utils/openxc-utils.hpp"
 
+#include "../low-can-binding.hpp"
+
 /// @brief Parse the signal's bitfield from the given data and return the raw
 /// value.
 ///
diff --git a/CAN-binder/low-can-binding/can/can-message-definition.hpp b/CAN-binder/low-can-binding/can/can-message-definition.hpp
index 7bc982d..f0594b3 100644
--- a/CAN-binder/low-can-binding/can/can-message-definition.hpp
+++ b/CAN-binder/low-can-binding/can/can-message-definition.hpp
@@ -28,7 +28,6 @@
 #include <vector>
 #include <memory>
 
-#include "can-bus-dev.hpp"
 #include "can-message.hpp"
 #include "../utils/timer.hpp"
 
diff --git a/CAN-binder/low-can-binding/can/can-signals.hpp b/CAN-binder/low-can-binding/can/can-signals.hpp
index 34ebeeb..50eb4ec 100644
--- a/CAN-binder/low-can-binding/can/can-signals.hpp
+++ b/CAN-binder/low-can-binding/can/can-signals.hpp
@@ -25,7 +25,6 @@
 
 #include "openxc.pb.h"
 #include "../utils/timer.hpp"
-#include "can-bus.hpp"
 #include "can-message.hpp"
 #include "can-message-definition.hpp"
 #include "../diagnostic/diagnostic-message.hpp"