diff --git a/acast2/src/acast.cpp b/acast2/src/acast.cpp
index 01348fa699658f161d1f9dabbea74f2ebe831465..42ecf835c2c9a4e0e55359a03d24b6a9ef697a20 100644
--- a/acast2/src/acast.cpp
+++ b/acast2/src/acast.cpp
@@ -14,7 +14,7 @@
 #include <sax/SaxParseInterface.h>
 #include <sax/ParserException.h>
 #include <object/Object.h>
-#include "CastApi.hpp"
+#include <cast/CastApi.hpp>
 
 // -----------------------------------------------------------------------------------------
 
diff --git a/acompare2/src/AutomatonCompare.h b/acompare2/src/AutomatonCompare.h
index f8d568ef03c89273bcb85042ff68f5628c92adba..487242896cdf1445e515bad276ad4cd654ff0e5f 100644
--- a/acompare2/src/AutomatonCompare.h
+++ b/acompare2/src/AutomatonCompare.h
@@ -8,7 +8,7 @@
 #ifndef AUTOMATON_COMPARE_H_
 #define AUTOMATON_COMPARE_H_
 
-#include <common/multipleDispatch.hpp>
+#include <core/multipleDispatch.hpp>
 #include <ostream>
 
 #include <automaton/Automaton.h>
diff --git a/acompare2/src/GrammarCompare.h b/acompare2/src/GrammarCompare.h
index 26d523521a1a826c90ce66cdf2a6c75be474d13d..2cfbc73481d269afd9afe4040a4a47c188e181b3 100644
--- a/acompare2/src/GrammarCompare.h
+++ b/acompare2/src/GrammarCompare.h
@@ -8,7 +8,7 @@
 #ifndef GRAMMAR_COMPARE_H_
 #define GRAMMAR_COMPARE_H_
 
-#include <common/multipleDispatch.hpp>
+#include <core/multipleDispatch.hpp>
 #include <ostream>
 
 #include <grammar/Grammar.h>
diff --git a/aconvert2/src/DotConverter.h b/aconvert2/src/DotConverter.h
index 735fcc6bbd43f218569902788db3b83962365d49..cfc152b46ff0a22083cbe3fd209c37e72a36c3e5 100644
--- a/aconvert2/src/DotConverter.h
+++ b/aconvert2/src/DotConverter.h
@@ -9,7 +9,7 @@
 #define DOT_CONVERTER_H_
 
 #include <ostream>
-#include <common/multipleDispatch.hpp>
+#include <core/multipleDispatch.hpp>
 
 #include <automaton/Automaton.h>
 #include <automaton/AutomatonFeatures.h>
diff --git a/aconvert2/src/GasTexConverter.h b/aconvert2/src/GasTexConverter.h
index 92962ccf5c43c8f7cd8d94985e924c9772c9b10e..70a98afb0f596fadb25c26fb284c3368685bcf44 100644
--- a/aconvert2/src/GasTexConverter.h
+++ b/aconvert2/src/GasTexConverter.h
@@ -9,7 +9,7 @@
 #define GAS_TEX_CONVERTER_H_
 
 #include <ostream>
-#include <common/multipleDispatch.hpp>
+#include <core/multipleDispatch.hpp>
 #include <map>
 #include <utility>
 #include <vector>
diff --git a/aconvert2/src/TikZConverter.h b/aconvert2/src/TikZConverter.h
index 8efa573326469be87e378fcbcfd4a0910a14fd0b..e9c7508372377eaf9f36639be5ca1864322bf08c 100644
--- a/aconvert2/src/TikZConverter.h
+++ b/aconvert2/src/TikZConverter.h
@@ -9,7 +9,7 @@
 #define TIKZ_CONVERTER_H_
 
 #include <ostream>
-#include <common/multipleDispatch.hpp>
+#include <core/multipleDispatch.hpp>
 
 #include <automaton/Automaton.h>
 #include <automaton/AutomatonFeatures.h>
diff --git a/astat2/src/AutomataStat.h b/astat2/src/AutomataStat.h
index 8d452b4a51eee6c396bcd19be52adb39185436bb..3f058ab5bf732450039eba01f4a7442ec74d1dbf 100644
--- a/astat2/src/AutomataStat.h
+++ b/astat2/src/AutomataStat.h
@@ -8,7 +8,7 @@
 #ifndef AUTOMATA_STAT_H_
 #define AUTOMATA_STAT_H_
 
-#include <common/multipleDispatch.hpp>
+#include <core/multipleDispatch.hpp>
 
 #include "automaton/Automaton.h"
 #include "automaton/AutomatonFeatures.h"
diff --git a/astat2/src/GrammarStat.h b/astat2/src/GrammarStat.h
index a40c2a8d25af34dd94c28b0d72d667c6f704ced7..7bcb32f9b8ec442dff9108e343c8dad2cb681534 100644
--- a/astat2/src/GrammarStat.h
+++ b/astat2/src/GrammarStat.h
@@ -8,7 +8,7 @@
 #ifndef GRAMMAR_STAT_H_
 #define GRAMMAR_STAT_H_
 
-#include <common/multipleDispatch.hpp>
+#include <core/multipleDispatch.hpp>
 
 #include "grammar/Grammar.h"
 #include "grammar/GrammarFeatures.h"
diff --git a/astat2/src/RegExpStat.h b/astat2/src/RegExpStat.h
index 4c777d2728fb033da41894a9616c90c47f80dfe3..4178770df0cf24a19bea7ef0eca185274dbb0db1 100644
--- a/astat2/src/RegExpStat.h
+++ b/astat2/src/RegExpStat.h
@@ -8,7 +8,7 @@
 #ifndef REG_EXP_STAT_H_
 #define REG_EXP_STAT_H_
 
-#include <common/multipleDispatch.hpp>
+#include <core/multipleDispatch.hpp>
 
 #include "regexp/RegExp.h"
 #include "regexp/RegExpFeatures.h"
diff --git a/astat2/src/StringStat.h b/astat2/src/StringStat.h
index dbe31a89762c05a402b38222735cd969321f0bf2..66430025b5bf85b82068830eeaf9d7d9513ce65d 100644
--- a/astat2/src/StringStat.h
+++ b/astat2/src/StringStat.h
@@ -8,7 +8,7 @@
 #ifndef STRING_STAT_H_
 #define STRING_STAT_H_
 
-#include <common/multipleDispatch.hpp>
+#include <core/multipleDispatch.hpp>
 
 #include "string/String.h"
 #include "string/StringFeatures.h"
diff --git a/astat2/src/TreeStat.h b/astat2/src/TreeStat.h
index f877729cb18684b92752582d7de26a62adcda7f2..b8d892ae8acc88f180d07ff733d5e116620779ad 100644
--- a/astat2/src/TreeStat.h
+++ b/astat2/src/TreeStat.h
@@ -8,7 +8,7 @@
 #ifndef TREE_STAT_H_
 #define TREE_STAT_H_
 
-#include <common/multipleDispatch.hpp>
+#include <core/multipleDispatch.hpp>
 
 #include "tree/Tree.h"
 #include "tree/TreeFeatures.h"