diff --git a/alib2data/src/automaton/FSM/CompactNFA.cpp b/alib2data/src/automaton/FSM/CompactNFA.cpp
index ba8f28c10403d550cc9fb0ac6b34a31f392509d2..e9ca521672abe492957d7f28a339a5b7012a17a8 100644
--- a/alib2data/src/automaton/FSM/CompactNFA.cpp
+++ b/alib2data/src/automaton/FSM/CompactNFA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "CompactNFA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/automaton/FSM/DFA.cpp b/alib2data/src/automaton/FSM/DFA.cpp
index 35831b67cba15787f8b2a05ca6ad53c759956a5a..44ec98ba4fd58b79bdac93f0ed28592b0eb0adcd 100644
--- a/alib2data/src/automaton/FSM/DFA.cpp
+++ b/alib2data/src/automaton/FSM/DFA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "DFA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/automaton/FSM/EpsilonNFA.cpp b/alib2data/src/automaton/FSM/EpsilonNFA.cpp
index 5fa2b72e95aada78cadce84a9a8ec6f4d90685d7..37c2823922264c29988d478b996ebc09ba478f49 100644
--- a/alib2data/src/automaton/FSM/EpsilonNFA.cpp
+++ b/alib2data/src/automaton/FSM/EpsilonNFA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "EpsilonNFA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/automaton/FSM/ExtendedNFA.cpp b/alib2data/src/automaton/FSM/ExtendedNFA.cpp
index 989eee085ee128c9813f541de09c4bdf8e2f5984..804ad8905d2e278271c192af9f71872e7f439556 100644
--- a/alib2data/src/automaton/FSM/ExtendedNFA.cpp
+++ b/alib2data/src/automaton/FSM/ExtendedNFA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "ExtendedNFA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp b/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp
index 6923ee42d675f726d6f147ef22b733a385e7ce9c..7399583d9b187b89a35025390a7e64ac21d2656a 100644
--- a/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp
+++ b/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "MultiInitialStateNFA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/automaton/FSM/NFA.cpp b/alib2data/src/automaton/FSM/NFA.cpp
index 7ad981d711bde4aa877451a76293cab04e286e22..a23a5ea80e4cf286a01db9dd39f7f876e9ac4cc3 100644
--- a/alib2data/src/automaton/FSM/NFA.cpp
+++ b/alib2data/src/automaton/FSM/NFA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "NFA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/automaton/PDA/DPDA.cpp b/alib2data/src/automaton/PDA/DPDA.cpp
index 68adf359487335d66338f034e22cca0de0887351..8c1579591b6731e49d4b92a3c043e44e50dcc281 100644
--- a/alib2data/src/automaton/PDA/DPDA.cpp
+++ b/alib2data/src/automaton/PDA/DPDA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "DPDA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/automaton/PDA/InputDrivenDPDA.cpp b/alib2data/src/automaton/PDA/InputDrivenDPDA.cpp
index 83b39556f51c19a42b703cf91dfee58c177dca3a..ffabec3d8e0df09f021eb616b0c920c2607ee9b3 100644
--- a/alib2data/src/automaton/PDA/InputDrivenDPDA.cpp
+++ b/alib2data/src/automaton/PDA/InputDrivenDPDA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "InputDrivenDPDA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp b/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp
index 9a1861c2a95e7e23ff4d97c41643134c10e119bb..9fe18cb1e414eb83c8d9a46e8aa7e182a82978e6 100644
--- a/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp
+++ b/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "InputDrivenNPDA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/automaton/PDA/NPDA.cpp b/alib2data/src/automaton/PDA/NPDA.cpp
index aab9fabe7b0132a76686f34acf7594d476412f03..2a21c815b01c0c1f251723796f457bd20625f528 100644
--- a/alib2data/src/automaton/PDA/NPDA.cpp
+++ b/alib2data/src/automaton/PDA/NPDA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "NPDA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/automaton/PDA/NPDTA.cpp b/alib2data/src/automaton/PDA/NPDTA.cpp
index dd070691d07f2d47f984e205dc3ff96bb3a7f104..a69b9027014f838c63fc4f38b07eaeb6b31538da 100644
--- a/alib2data/src/automaton/PDA/NPDTA.cpp
+++ b/alib2data/src/automaton/PDA/NPDTA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "NPDTA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp
index e937cc3e90e935d70497c2053c9e5553c6a297a1..2810a2adac9d89ba2802af32ecd94126dd06ff19 100644
--- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp
+++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "RealTimeHeightDeterministicDPDA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp
index 9f9cfb47946686f8b5e9af7b8ac5a5aa64a577f2..b4885eec50d42c91c0ff6586ed88ebf61b72c814 100644
--- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp
+++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "RealTimeHeightDeterministicNPDA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/automaton/PDA/SinglePopDPDA.cpp b/alib2data/src/automaton/PDA/SinglePopDPDA.cpp
index 171439bd3e5bf07e3182899a51016f7a6c5f1e63..0b28e30d68ac0d4b10418d6c1fb187b1d6c4b0f2 100644
--- a/alib2data/src/automaton/PDA/SinglePopDPDA.cpp
+++ b/alib2data/src/automaton/PDA/SinglePopDPDA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "SinglePopDPDA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/automaton/PDA/SinglePopNPDA.cpp b/alib2data/src/automaton/PDA/SinglePopNPDA.cpp
index 5a60f0ce9eda6fd1eeb55cacdee60381ba6e9d20..2b5332c234cefa81e36b0ec3b48c5cec805c8561 100644
--- a/alib2data/src/automaton/PDA/SinglePopNPDA.cpp
+++ b/alib2data/src/automaton/PDA/SinglePopNPDA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "SinglePopNPDA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp
index 967810e813cfcf35c6612310f9be2748b7f02d33..970b430b1cb5b3fd518d9aad8d9acf89e7e78ad7 100644
--- a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp
+++ b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "VisiblyPushdownDPDA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp
index 3e515de0ec02c1fcf8d8dffe8de06c064b8f8107..246861a0a0c7054a14da58c7a15d9b5b7ab4889f 100644
--- a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp
+++ b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "VisiblyPushdownNPDA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/automaton/TA/DFTA.cpp b/alib2data/src/automaton/TA/DFTA.cpp
index e3f3ba99e11fb9a673b13de36095f7ac644764bd..46acb95227175d9af412e8e82a655a444aa34def 100644
--- a/alib2data/src/automaton/TA/DFTA.cpp
+++ b/alib2data/src/automaton/TA/DFTA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "DFTA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/automaton/TA/NFTA.cpp b/alib2data/src/automaton/TA/NFTA.cpp
index 9dec532c3f2db3afbe57d315094337a747175203..9772259d1963cfdf7df81ef8320cea9c9ae4e393 100644
--- a/alib2data/src/automaton/TA/NFTA.cpp
+++ b/alib2data/src/automaton/TA/NFTA.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "NFTA.h"
-#include "../Automaton.h"
+#include <automaton/Automaton.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/grammar/ContextFree/CFG.cpp b/alib2data/src/grammar/ContextFree/CFG.cpp
index 706d44d21d802de101a8466801b17b02045a6940..257fb04dfc7e58f509afe517af77777c8eb2303f 100644
--- a/alib2data/src/grammar/ContextFree/CFG.cpp
+++ b/alib2data/src/grammar/ContextFree/CFG.cpp
@@ -6,10 +6,9 @@
  */
 
 #include "CFG.h"
-#include "../Grammar.h"
+#include <grammar/Grammar.h>
 #include <object/Object.h>
 
-#include <registration/CastRegistration.hpp>
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
diff --git a/alib2data/src/grammar/ContextFree/CNF.cpp b/alib2data/src/grammar/ContextFree/CNF.cpp
index 2f1730f97e36b969937e6bf9eb61ce3b2bde447e..37a8db100c6242762f5188f1605d4222b6503019 100644
--- a/alib2data/src/grammar/ContextFree/CNF.cpp
+++ b/alib2data/src/grammar/ContextFree/CNF.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "CNF.h"
-#include "../Grammar.h"
+#include <grammar/Grammar.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp
index 8dc447a084caf55cd62869fd5c83f733d9ea76a3..4c3ed02a8a9ad858ebe9f9178e029bfb4b258555 100644
--- a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp
+++ b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "EpsilonFreeCFG.h"
-#include "../Grammar.h"
+#include <grammar/Grammar.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/grammar/ContextFree/GNF.cpp b/alib2data/src/grammar/ContextFree/GNF.cpp
index 69e2f1daf3b816f8028a1391fb66722cd95154a7..f6e789a6dbac2976a5c005022f8c4da3645aa458 100644
--- a/alib2data/src/grammar/ContextFree/GNF.cpp
+++ b/alib2data/src/grammar/ContextFree/GNF.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "GNF.h"
-#include "../Grammar.h"
+#include <grammar/Grammar.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/grammar/ContextFree/LG.cpp b/alib2data/src/grammar/ContextFree/LG.cpp
index 457e3fdd38fb7b83148dbdf5e231c8c406b4e0c9..e6bb144761541b1d8494234f1abd6e634a7a75a4 100644
--- a/alib2data/src/grammar/ContextFree/LG.cpp
+++ b/alib2data/src/grammar/ContextFree/LG.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "LG.h"
-#include "../Grammar.h"
+#include <grammar/Grammar.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/grammar/ContextSensitive/CSG.cpp b/alib2data/src/grammar/ContextSensitive/CSG.cpp
index 96bc66d198aa6a290b5fcdbd34f071ec79fa40d5..164ca5cf35675d675abc38915ae055f5e9d4e9cb 100644
--- a/alib2data/src/grammar/ContextSensitive/CSG.cpp
+++ b/alib2data/src/grammar/ContextSensitive/CSG.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "CSG.h"
-#include "../Grammar.h"
+#include <grammar/Grammar.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp
index d7100d5cc6165ad5cc09b2464eb3e6286e19fc14..2020860f3293f1b5a65bca039725e321e60bbdaa 100644
--- a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp
+++ b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "NonContractingGrammar.h"
-#include "../Grammar.h"
+#include <grammar/Grammar.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/grammar/Regular/LeftLG.cpp b/alib2data/src/grammar/Regular/LeftLG.cpp
index 5f3f919040665d73107de1eb819e9f3ebb99245b..bb2f2ff7813009f6a9e84e0cc7dfb41dd3af6e30 100644
--- a/alib2data/src/grammar/Regular/LeftLG.cpp
+++ b/alib2data/src/grammar/Regular/LeftLG.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "LeftLG.h"
-#include "../Grammar.h"
+#include <grammar/Grammar.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/grammar/Regular/LeftRG.cpp b/alib2data/src/grammar/Regular/LeftRG.cpp
index 6737cf67d1b73f08459a336dafa7e441e0e4bbc8..b20181e804187b0aaab278d6f35e65effb784555 100644
--- a/alib2data/src/grammar/Regular/LeftRG.cpp
+++ b/alib2data/src/grammar/Regular/LeftRG.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "LeftRG.h"
-#include "../Grammar.h"
+#include <grammar/Grammar.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/grammar/Regular/RightLG.cpp b/alib2data/src/grammar/Regular/RightLG.cpp
index ebcf2e8dba39437f64c70e32e3ce7458ba3ec6aa..984a00351f7486edfd7fbc31ef6ec3b92eec7264 100644
--- a/alib2data/src/grammar/Regular/RightLG.cpp
+++ b/alib2data/src/grammar/Regular/RightLG.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "RightLG.h"
-#include "../Grammar.h"
+#include <grammar/Grammar.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/grammar/Regular/RightRG.cpp b/alib2data/src/grammar/Regular/RightRG.cpp
index 4aa8b1e836d9a1e6643d1a40efd381a74ef58de7..afca72418b134096a48cb96dd3ae1e19e6bc3596 100644
--- a/alib2data/src/grammar/Regular/RightRG.cpp
+++ b/alib2data/src/grammar/Regular/RightRG.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "RightRG.h"
-#include "../Grammar.h"
+#include <grammar/Grammar.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
index 101de5ae82ec5f6d62eb1f70a4738c9acbc759ef..208ced142d9ec8106f72f3d0e58180c615132984 100644
--- a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
+++ b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "ContextPreservingUnrestrictedGrammar.h"
-#include "../Grammar.h"
+#include <grammar/Grammar.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp
index 025e9b5ad82b2ca9d645b19263ce77c228c7ba2c..368fa468bdf62d8a642ef824d3cf4ec2a10292cb 100644
--- a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp
+++ b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "UnrestrictedGrammar.h"
-#include "../Grammar.h"
+#include <grammar/Grammar.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/regexp/formal/FormalRegExp.cpp b/alib2data/src/regexp/formal/FormalRegExp.cpp
index 7b5cde8cb5a6af00c6f46cbf542042d17998ca61..0327db3f7a89c1ab7505aedc0e932f8e112db043 100644
--- a/alib2data/src/regexp/formal/FormalRegExp.cpp
+++ b/alib2data/src/regexp/formal/FormalRegExp.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "FormalRegExp.h"
-#include "../RegExp.h"
+#include <regexp/RegExp.h>
 #include <object/Object.h>
 
 #include <registration/CastRegistration.hpp>
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp b/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp
index e1392a2e880190b2cbec917a03c6a02c41da48f5..41e6ef0fbd311f877db14c8acc557f9701542a93 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "UnboundedRegExp.h"
-#include "../RegExp.h"
+#include <regexp/RegExp.h>
 #include <object/Object.h>
 
 #include <registration/CastRegistration.hpp>
diff --git a/alib2data/src/string/CyclicString.cpp b/alib2data/src/string/CyclicString.cpp
index 13841c198822a6dd75a2c0eea51dae930aff9711..3da718ba64c9c8b982417c710654c45633b16df7 100644
--- a/alib2data/src/string/CyclicString.cpp
+++ b/alib2data/src/string/CyclicString.cpp
@@ -6,10 +6,9 @@
  */
 
 #include "CyclicString.h"
-#include "String.h"
+#include <string/String.h>
 #include <object/Object.h>
 
-#include <registration/CastRegistration.hpp>
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
diff --git a/alib2data/src/string/Epsilon.cpp b/alib2data/src/string/Epsilon.cpp
index 22d24248bcf074215042e48f90ff85d173892ee0..b11b673c64cf18e09730e26c817c1f450df6ae4b 100644
--- a/alib2data/src/string/Epsilon.cpp
+++ b/alib2data/src/string/Epsilon.cpp
@@ -7,7 +7,7 @@
 
 #include "Epsilon.h"
 
-#include "String.h"
+#include <string/String.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/string/LinearString.cpp b/alib2data/src/string/LinearString.cpp
index 90c065e9eef2bcf551eed42a3f68c5e4be168806..cfb0e83bf1a0919c3d1ca7647e111661eee062f2 100644
--- a/alib2data/src/string/LinearString.cpp
+++ b/alib2data/src/string/LinearString.cpp
@@ -7,10 +7,9 @@
 
 #include "LinearString.h"
 
-#include "String.h"
+#include <string/String.h>
 #include <object/Object.h>
 
-#include <registration/CastRegistration.hpp>
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
diff --git a/alib2data/src/tree/ranked/PostfixRankedTree.cpp b/alib2data/src/tree/ranked/PostfixRankedTree.cpp
index 0597e02708887b96e9c790d4b19589d808a6aac2..9728d6217710507ca496e1543b2b575e06b53cb1 100644
--- a/alib2data/src/tree/ranked/PostfixRankedTree.cpp
+++ b/alib2data/src/tree/ranked/PostfixRankedTree.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "PostfixRankedTree.h"
-#include "../Tree.h"
-#include "../RankedTreeWrapper.h"
+#include <tree/Tree.h>
+#include <tree/RankedTreeWrapper.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/tree/ranked/PrefixRankedBarNonlinearPattern.cpp b/alib2data/src/tree/ranked/PrefixRankedBarNonlinearPattern.cpp
index dab4b564e1efd9aa5767b9ac7516e79f19f49b17..d9a2c30d2380ca55c6c1f181c27d764bd26e0954 100644
--- a/alib2data/src/tree/ranked/PrefixRankedBarNonlinearPattern.cpp
+++ b/alib2data/src/tree/ranked/PrefixRankedBarNonlinearPattern.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "PrefixRankedBarNonlinearPattern.h"
-#include "../Tree.h"
-#include "../RankedTreeWrapper.h"
+#include <tree/Tree.h>
+#include <tree/RankedTreeWrapper.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/tree/ranked/PrefixRankedBarPattern.cpp b/alib2data/src/tree/ranked/PrefixRankedBarPattern.cpp
index e23080047d69fb0416b16913d705748f3fcc7c00..3862afa7762d5e8d2dd3586b5ac1f68deff3c519 100644
--- a/alib2data/src/tree/ranked/PrefixRankedBarPattern.cpp
+++ b/alib2data/src/tree/ranked/PrefixRankedBarPattern.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "PrefixRankedBarPattern.h"
-#include "../Tree.h"
-#include "../RankedTreeWrapper.h"
+#include <tree/Tree.h>
+#include <tree/RankedTreeWrapper.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/tree/ranked/PrefixRankedBarTree.cpp b/alib2data/src/tree/ranked/PrefixRankedBarTree.cpp
index 275354d0d7436738ac613cff80908acff6869340..9285b41f537687746c258135d3cbdb57d389c694 100644
--- a/alib2data/src/tree/ranked/PrefixRankedBarTree.cpp
+++ b/alib2data/src/tree/ranked/PrefixRankedBarTree.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "PrefixRankedBarTree.h"
-#include "../Tree.h"
-#include "../RankedTreeWrapper.h"
+#include <tree/Tree.h>
+#include <tree/RankedTreeWrapper.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.cpp b/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.cpp
index 7e4b20dfa6d69866c73ebdb853066ac5a8e2dff8..863c83e3b0c8b178493961384b023525adb904c7 100644
--- a/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.cpp
+++ b/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "PrefixRankedNonlinearPattern.h"
-#include "../Tree.h"
-#include "../RankedTreeWrapper.h"
+#include <tree/Tree.h>
+#include <tree/RankedTreeWrapper.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/tree/ranked/PrefixRankedPattern.cpp b/alib2data/src/tree/ranked/PrefixRankedPattern.cpp
index 137a58edd3348ada7da0a447d8e059b28563ec32..9a78d43ce7e31fd6495ae2fa8a2894323e4aac8b 100644
--- a/alib2data/src/tree/ranked/PrefixRankedPattern.cpp
+++ b/alib2data/src/tree/ranked/PrefixRankedPattern.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "PrefixRankedPattern.h"
-#include "../Tree.h"
-#include "../RankedTreeWrapper.h"
+#include <tree/Tree.h>
+#include <tree/RankedTreeWrapper.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/tree/ranked/PrefixRankedTree.cpp b/alib2data/src/tree/ranked/PrefixRankedTree.cpp
index 5913b481745ae5a9aece87d22083bd233cdd72e9..f47260bab431a7ddda5460672d1a7927dadb0b32 100644
--- a/alib2data/src/tree/ranked/PrefixRankedTree.cpp
+++ b/alib2data/src/tree/ranked/PrefixRankedTree.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "PrefixRankedTree.h"
-#include "../Tree.h"
-#include "../RankedTreeWrapper.h"
+#include <tree/Tree.h>
+#include <tree/RankedTreeWrapper.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/tree/ranked/RankedNonlinearPattern.cpp b/alib2data/src/tree/ranked/RankedNonlinearPattern.cpp
index 5a77c7c8f62d5f0d12ffcd6958396d53168e0825..b5de7d4fdacd9b4cbdeee6f6d3cf894b61022d9c 100644
--- a/alib2data/src/tree/ranked/RankedNonlinearPattern.cpp
+++ b/alib2data/src/tree/ranked/RankedNonlinearPattern.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "RankedNonlinearPattern.h"
-#include "../Tree.h"
-#include "../RankedTreeWrapper.h"
+#include <tree/Tree.h>
+#include <tree/RankedTreeWrapper.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/tree/ranked/RankedPattern.cpp b/alib2data/src/tree/ranked/RankedPattern.cpp
index d267d91e2c07966ecaba470cd71c95f525d4976b..ce2f28c5b74c34054dd72cb49eca27c49a75524e 100644
--- a/alib2data/src/tree/ranked/RankedPattern.cpp
+++ b/alib2data/src/tree/ranked/RankedPattern.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "RankedPattern.h"
-#include "../Tree.h"
-#include "../RankedTreeWrapper.h"
+#include <tree/Tree.h>
+#include <tree/RankedTreeWrapper.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/tree/ranked/RankedTree.cpp b/alib2data/src/tree/ranked/RankedTree.cpp
index edea6f06be12bf645278fa97abac293d0e480adb..7928779e03fbde5f007e8f2e4e955d90d2952737 100644
--- a/alib2data/src/tree/ranked/RankedTree.cpp
+++ b/alib2data/src/tree/ranked/RankedTree.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "RankedTree.h"
-#include "../Tree.h"
-#include "../RankedTreeWrapper.h"
+#include <tree/Tree.h>
+#include <tree/RankedTreeWrapper.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/tree/unranked/PrefixBarTree.cpp b/alib2data/src/tree/unranked/PrefixBarTree.cpp
index 6b01ede84a9640bc59bdf835f2e6e7673ee67242..43208bc99b258535e7767a77e8c282a7a30c17f5 100644
--- a/alib2data/src/tree/unranked/PrefixBarTree.cpp
+++ b/alib2data/src/tree/unranked/PrefixBarTree.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "PrefixBarTree.h"
-#include "../Tree.h"
-#include "../UnrankedTreeWrapper.h"
+#include <tree/Tree.h>
+#include <tree/UnrankedTreeWrapper.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/tree/unranked/UnrankedNonlinearPattern.cpp b/alib2data/src/tree/unranked/UnrankedNonlinearPattern.cpp
index e2695db6b21b774e9e43ce251010ec75359a385d..34d57f5361d20b80c17f5ca0e104d85810d61dac 100644
--- a/alib2data/src/tree/unranked/UnrankedNonlinearPattern.cpp
+++ b/alib2data/src/tree/unranked/UnrankedNonlinearPattern.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "UnrankedNonlinearPattern.h"
-#include "../Tree.h"
-#include "../UnrankedTreeWrapper.h"
+#include <tree/Tree.h>
+#include <tree/UnrankedTreeWrapper.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/tree/unranked/UnrankedPattern.cpp b/alib2data/src/tree/unranked/UnrankedPattern.cpp
index 4e39ff3d4ad2f5f86aeda0ae54030ce44c00b672..b31b26112fc9247b80e83e5a126690bf1ff78de7 100644
--- a/alib2data/src/tree/unranked/UnrankedPattern.cpp
+++ b/alib2data/src/tree/unranked/UnrankedPattern.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "UnrankedPattern.h"
-#include "../Tree.h"
-#include "../UnrankedTreeWrapper.h"
+#include <tree/Tree.h>
+#include <tree/UnrankedTreeWrapper.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>
diff --git a/alib2data/src/tree/unranked/UnrankedTree.cpp b/alib2data/src/tree/unranked/UnrankedTree.cpp
index 967d4bf32709ee0f229d487e427ae3dd1f64c4dc..f60a54e7bb8dab2f925a18e7803830830f607248 100644
--- a/alib2data/src/tree/unranked/UnrankedTree.cpp
+++ b/alib2data/src/tree/unranked/UnrankedTree.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "UnrankedTree.h"
-#include "../Tree.h"
-#include "../UnrankedTreeWrapper.h"
+#include <tree/Tree.h>
+#include <tree/UnrankedTreeWrapper.h>
 #include <object/Object.h>
 
 #include <registration/ValuePrinterRegistration.hpp>