4 files changed, 4 insertions, 9 deletions
diff --git a/low-can-binding/can/message/j1939-message.cpp b/low-can-binding/can/message/j1939-message.cpp
index 147ab735..dad8e7f1 100644
--- a/low-can-binding/can/message/j1939-message.cpp
+++ b/low-can-binding/can/message/j1939-message.cpp
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 
-#include "./j1939-message.hpp"
 #include <cstring>
 #include "../../binding/low-can-hat.hpp"
-
+#include "j1939-message.hpp"
 
 ///
 /// @brief Class constructor
diff --git a/low-can-binding/can/message/j1939-message.hpp b/low-can-binding/can/message/j1939-message.hpp
index b0f0b090..482f167d 100644
--- a/low-can-binding/can/message/j1939-message.hpp
+++ b/low-can-binding/can/message/j1939-message.hpp
@@ -16,9 +16,10 @@
  */
 
 #pragma once
-#include <linux/can.h>
+
 #include <linux/can/j1939.h>
-#include "./message.hpp"
+#include "message.hpp"
+#include "../../utils/socketcan-j1939.hpp"
 
 #define J1939_MAX_MULTIPACKETS 255
 #define J1939_MAX_DLEN J1939_MAX_MULTIPACKETS * CAN_MAX_DLEN
@@ -69,5 +70,3 @@ class j1939_message_t : public message_t
         struct bcm_msg get_bcm_msg();
 		void set_bcm_msg(struct bcm_msg bcm_msg);
 };
-
-
diff --git a/low-can-binding/can/signals.cpp b/low-can-binding/can/signals.cpp
index e843bedb..b47001bd 100644
--- a/low-can-binding/can/signals.cpp
+++ b/low-can-binding/can/signals.cpp
@@ -22,7 +22,6 @@
 #include "../binding/application.hpp"
 #include "../utils/signals.hpp"
 #include "can-decoder.hpp"
-#include "message/can-message.hpp"
 #include "can-bus.hpp"
 #include "../diagnostic/diagnostic-message.hpp"
 #include "canutil/write.h"
diff --git a/low-can-binding/can/signals.hpp b/low-can-binding/can/signals.hpp
index 2507fd2a..cefd8b81 100644
--- a/low-can-binding/can/signals.hpp
+++ b/low-can-binding/can/signals.hpp
@@ -26,8 +26,6 @@
 #include "openxc.pb.h"
 #include "message-definition.hpp"
 #include "../utils/timer.hpp"
-#include "../utils/socketcan-bcm.hpp"
-#include "message/can-message.hpp"
 #include "../diagnostic/diagnostic-message.hpp"
 
 #define MESSAGE_SET_ID 0