diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpAlternation.h b/alib2data/src/regexp/unbounded/UnboundedRegExpAlternation.h
index 93e7e17bf6df0d067ee53c67bce2702247d302d8..7575e133a7d888bff71db8e37d121504cc3084f8 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpAlternation.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpAlternation.h
@@ -13,12 +13,6 @@
 
 namespace regexp {
 
-namespace simplify {
-
-class RegExpOptimize;
-
-} /* namespace simplify */
-
 /**
  * Represents alternation operator in the regular expression. Contains list of UnboundedRegExpElement
  * as operands of the operator.
@@ -90,8 +84,6 @@ public:
 	 */
 	virtual void operator >>( std::ostream & out ) const;
 
-	friend class simplify::RegExpOptimize;
-
 	virtual explicit operator std::string ( ) const;
 };
 
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpConcatenation.h b/alib2data/src/regexp/unbounded/UnboundedRegExpConcatenation.h
index deef3a8c9bd99f03a33a4d7ed590f5a123be2f10..4703c0b02749c7d9e11ba8e0a9302482b5a26637 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpConcatenation.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpConcatenation.h
@@ -13,12 +13,6 @@
 
 namespace regexp {
 
-namespace simplify {
-
-class RegExpOptimize;
-
-} /* namespace simplify */
-
 /**
  * Represents concatenation operator in the regular expression. Contains list of UnboundedRegExpElement
  * as operands of the operator.
@@ -90,8 +84,6 @@ public:
 	 */
 	virtual void operator >>( std::ostream & out ) const;
 
-	friend class simplify::RegExpOptimize;
-
 	virtual explicit operator std::string ( ) const;
 };
 
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpIteration.h b/alib2data/src/regexp/unbounded/UnboundedRegExpIteration.h
index 56ffbdf75a19a26f5dda3de515a83da45af6ccd2..e6b3d0621092abe15689657aebde364aa45fcda0 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpIteration.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpIteration.h
@@ -13,12 +13,6 @@
 
 namespace regexp {
 
-namespace simplify {
-
-class RegExpOptimize;
-
-} /* namespace simplify */
-
 /**
  * Represents iteration operator in the regular expression. Contains one UnboundedRegExpElement
  * as operand.
@@ -91,8 +85,6 @@ public:
 	 */
 	virtual void operator >>( std::ostream & out ) const;
 
-	friend class simplify::RegExpOptimize;
-
 	virtual explicit operator std::string ( ) const;
 };