diff --git a/alib2data/src/regexp/RegExp.cpp b/alib2data/src/regexp/RegExp.cpp
index de2e03083618f2e5ba57f1cfde8104f18963a901..7f585a1c1e1a989304b2f310c91e1fba1377f039 100644
--- a/alib2data/src/regexp/RegExp.cpp
+++ b/alib2data/src/regexp/RegExp.cpp
@@ -18,10 +18,6 @@
 
 namespace regexp {
 
-const std::set < alphabet::Symbol > & RegExp::getAlphabet ( ) const {
-	return this->getData ( ).getAlphabet ( );
-}
-
 regexp::RegExp regexpFrom ( const std::string & string ) {
 	return regexpFrom ( string::LinearString < > ( string ) );
 }
diff --git a/alib2data/src/regexp/RegExp.h b/alib2data/src/regexp/RegExp.h
index d46a011fcb877164c5b40327807ea4fc4fdf1e4d..b7d69b8a69864bba302b8594e7146e322645040c 100644
--- a/alib2data/src/regexp/RegExp.h
+++ b/alib2data/src/regexp/RegExp.h
@@ -26,8 +26,6 @@ class RegExp : public alib::WrapperBase < RegExpBase > {
 	using alib::WrapperBase < RegExpBase >::WrapperBase;
 
 public:
-	const std::set < alphabet::Symbol > & getAlphabet ( ) const;
-
 	static const std::string & getXmlTagRefName() {
 		static std::string xmlTagName = "RegExpRef";
 
diff --git a/alib2data/src/regexp/RegExpBase.h b/alib2data/src/regexp/RegExpBase.h
index 422aebb9db646fe8363a6bd97a33fe5013db5852..3c23d3ce95824eb18e21d2a4af6e7f1accd5504c 100644
--- a/alib2data/src/regexp/RegExpBase.h
+++ b/alib2data/src/regexp/RegExpBase.h
@@ -9,8 +9,6 @@
 #define REG_EXP_BASE_H_
 
 #include <object/ObjectBase.h>
-#include <set>
-#include "../alphabet/Symbol.h"
 
 namespace regexp {
 
@@ -21,8 +19,6 @@ class RegExpBase : public alib::ObjectBase {
 public:
 	virtual RegExpBase* clone() const = 0;
 	virtual RegExpBase* plunder() && = 0;
-
-	virtual const std::set<alphabet::Symbol>& getAlphabet() const = 0;
 };
 
 } /* namespace regexp */
diff --git a/alib2data/src/regexp/common/RegExpFromXMLParser.h b/alib2data/src/regexp/common/RegExpFromXMLParser.h
index 9365a76695b6d0c1f74e539d9a093cac447915bd..46bc6116e4440c09eaf218f3785611c5805859e9 100644
--- a/alib2data/src/regexp/common/RegExpFromXMLParser.h
+++ b/alib2data/src/regexp/common/RegExpFromXMLParser.h
@@ -10,9 +10,7 @@
 
 #include <set>
 #include <deque>
-#include <memory>
 #include "../RegExpFeatures.h"
-#include "../../alphabet/SymbolFeatures.h"
 #include <sax/Token.h>
 
 #include <sax/FromXMLParserHelper.h>
diff --git a/alib2data/src/regexp/formal/FormalRegExp.h b/alib2data/src/regexp/formal/FormalRegExp.h
index 2f9615ecaad118542b241f1665e18d2686ee8e98..7fe51d15710b83384efcba3ea4966dc4493f7d75 100644
--- a/alib2data/src/regexp/formal/FormalRegExp.h
+++ b/alib2data/src/regexp/formal/FormalRegExp.h
@@ -24,7 +24,6 @@
 #include "../common/RegExpToXMLComposer.h"
 
 #include "FormalRegExpStructure.h"
-#include "FormalRegExpEmpty.h"
 
 namespace regexp {
 
diff --git a/alib2data/src/regexp/formal/FormalRegExpElement.h b/alib2data/src/regexp/formal/FormalRegExpElement.h
index 25ed2d58cd4991f13c16da2f3bab559555932921..ee81fc0a8e05fe6c7eb050b04c06857dae11a780 100644
--- a/alib2data/src/regexp/formal/FormalRegExpElement.h
+++ b/alib2data/src/regexp/formal/FormalRegExpElement.h
@@ -8,7 +8,6 @@
 #ifndef FORMAL_REG_EXP_ELEMENT_H_
 #define FORMAL_REG_EXP_ELEMENT_H_
 
-#include <core/xmlApi.hpp>
 #include <set>
 #include <tree>
 #include <core/visitor.hpp>
diff --git a/alib2data/src/regexp/formal/FormalRegExpEmpty.h b/alib2data/src/regexp/formal/FormalRegExpEmpty.h
index 80876adac298171f332a23826afd1db0c50fef59..8f340badda933d17fba8d6a23aae1a307c4145e2 100644
--- a/alib2data/src/regexp/formal/FormalRegExpEmpty.h
+++ b/alib2data/src/regexp/formal/FormalRegExpEmpty.h
@@ -8,9 +8,10 @@
 #ifndef FORMAL_REG_EXP_EMPTY_H_
 #define FORMAL_REG_EXP_EMPTY_H_
 
-#include "FormalRegExpElement.h"
 #include <sstream>
 
+#include "FormalRegExpElement.h"
+
 namespace regexp {
 
 /**
diff --git a/alib2data/src/regexp/formal/FormalRegExpStructure.h b/alib2data/src/regexp/formal/FormalRegExpStructure.h
index a78998324a6d7a565cb72a54ffa67591f3e9b1ff..c59ad9a7423f61a68d8ebc7ff31b093ae10862dd 100644
--- a/alib2data/src/regexp/formal/FormalRegExpStructure.h
+++ b/alib2data/src/regexp/formal/FormalRegExpStructure.h
@@ -8,8 +8,6 @@
 #ifndef FORMAL_REG_EXP_STRUCTURE_H_
 #define FORMAL_REG_EXP_STRUCTURE_H_
 
-#include <memory>
-
 #include <exception/CommonException.h>
 
 #include "../RegExpFeatures.h"
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExp.h b/alib2data/src/regexp/unbounded/UnboundedRegExp.h
index 9560e85a3b80d6836f9619398479cbc5285d30b6..c7682ef1d83bb0a7deaea996e8a1d6cd4427530a 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExp.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExp.h
@@ -24,7 +24,6 @@
 #include "../common/RegExpToXMLComposer.h"
 
 #include "UnboundedRegExpStructure.h"
-#include "UnboundedRegExpEmpty.h"
 
 namespace regexp {
 
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpElement.h b/alib2data/src/regexp/unbounded/UnboundedRegExpElement.h
index 7ead105f469722b7c4bdd6780988f526755e3046..6baeb21776cdf42d90ce78208715fa6414c0cb29 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpElement.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpElement.h
@@ -8,8 +8,6 @@
 #ifndef UNBOUNDED_REG_EXP_ELEMENT_H_
 #define UNBOUNDED_REG_EXP_ELEMENT_H_
 
-#include <core/xmlApi.hpp>
-#include "../../alphabet/Symbol.h"
 #include <set>
 #include <tree>
 #include <core/visitor.hpp>
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpStructure.h b/alib2data/src/regexp/unbounded/UnboundedRegExpStructure.h
index 6ad94aba639844ffb23b78284f4ba68fe3efefdd..14e699b939829f34dc781e2d5e0d676cf506c42f 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpStructure.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpStructure.h
@@ -8,9 +8,6 @@
 #ifndef UNBOUNDED_REG_EXP_STRUCTURE_H_
 #define UNBOUNDED_REG_EXP_STRUCTURE_H_
 
-
-#include <memory>
-
 #include <exception/CommonException.h>
 
 #include "../RegExpFeatures.h"