refactor includes

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>