4 files changed, 15 insertions, 13 deletions
diff --git a/src/can/can-signals.cpp b/src/can/can-signals.cpp
index af7376b..a2c6ae7 100644
--- a/src/can/can-signals.cpp
+++ b/src/can/can-signals.cpp
@@ -15,14 +15,15 @@
  * limitations under the License.
  */
 
-#include "can/can-signals.hpp"
-
 #include <fnmatch.h>
 
-#include "utils/signals.hpp"
-#include "can/can-decoder.hpp"
-#include "obd2/obd2-signals.hpp"
-#include "low-can-binding.hpp"
+#include "can-signals.hpp"
+
+#include "../configuration.hpp"
+#include "../utils/signals.hpp"
+#include "can-decoder.hpp"
+#include "../obd2/obd2-signals.hpp"
+#include "../low-can-binding.hpp"
 
 can_message_definition_t& can_signal_t::get_message()
 {
diff --git a/src/diagnostic/diagnostic-message.cpp b/src/diagnostic/diagnostic-message.cpp
index 247917b..bd5d0ec 100644
--- a/src/diagnostic/diagnostic-message.cpp
+++ b/src/diagnostic/diagnostic-message.cpp
@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
-#include "obd2/obd2-signals.hpp"
+#include "obd2-signals.hpp"
 
-#include "utils/signals.hpp"
+#include "../configuration.hpp"
+#include "../utils/signals.hpp"
 
 const char *UNIT_NAMES[10] = {
 	"POURCENT",
diff --git a/src/utils/signals.cpp b/src/utils/signals.cpp
index 6f8847c..e65d35e 100644
--- a/src/utils/signals.cpp
+++ b/src/utils/signals.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "utils/signals.hpp"
+#include "signals.hpp"
 
 /** 
  * @brief Can signal event map making access to afb_event
diff --git a/src/utils/signals.hpp b/src/utils/signals.hpp
index 6665bb7..db3a401 100644
--- a/src/utils/signals.hpp
+++ b/src/utils/signals.hpp
@@ -22,11 +22,11 @@
 #include <fnmatch.h>
 
 #include "openxc.pb.h"
-#include "configuration.hpp"
-#include "can/can-signals.hpp"
-#include "obd2/obd2-signals.hpp"
+#include "../configuration.hpp"
+#include "../can/can-signals.hpp"
+#include "../obd2/obd2-signals.hpp"
 
-#include "low-can-binding.hpp"
+#include "../low-can-binding.hpp"
 
 extern std::mutex subscribed_signals_mutex;
 std::mutex& get_subscribed_signals_mutex();