diff --git a/alib2/src/regexp/RegExpEpsilon.cpp b/alib2/src/regexp/RegExpEpsilon.cpp
index 46e6e15f41d0ce8c4a7ae17302b42557aeab18ac..caeddb78618ce78b6a39cd09645a9ea10a8292aa 100644
--- a/alib2/src/regexp/RegExpEpsilon.cpp
+++ b/alib2/src/regexp/RegExpEpsilon.cpp
@@ -67,4 +67,3 @@ bool RegExpEpsilon::isEmpty() const {
 }
 
 } /* namespace regexp */
-
diff --git a/alib2/src/regexp/RegExpFromStringLexer.h b/alib2/src/regexp/RegExpFromStringLexer.h
index 87eb0e47eb24199e18952612093e0b5aaeb99613..8831aa69a60b5505bfc000d1c6a8ddea0dafd98a 100644
--- a/alib2/src/regexp/RegExpFromStringLexer.h
+++ b/alib2/src/regexp/RegExpFromStringLexer.h
@@ -1,5 +1,5 @@
-#ifndef __REG_EXP_FROM_STRING_LEXER_H_
-#define __REG_EXP_FROM_STRING_LEXER_H_
+#ifndef REG_EXP_FROM_STRING_LEXER_H_
+#define REG_EXP_FROM_STRING_LEXER_H_
 
 #include <string>
 #include <sstream>
@@ -36,4 +36,4 @@ public:
 
 } /* namespace regexp */
 
-#endif /* __REG_EXP_FROM_STRING_LEXER_H */
\ No newline at end of file
+#endif /* REG_EXP_FROM_STRING_LEXER_H */
\ No newline at end of file
diff --git a/alib2/src/regexp/RegExpFromStringParser.h b/alib2/src/regexp/RegExpFromStringParser.h
index b91969632ef4b3a960cd13d6aed9c547d071ed5c..277c61768ae6b92fe719cb5d416f38d2b9145431 100644
--- a/alib2/src/regexp/RegExpFromStringParser.h
+++ b/alib2/src/regexp/RegExpFromStringParser.h
@@ -36,4 +36,5 @@ public:
 };
 
 } /* namespace regexp */
+
 #endif /* REG_EXP_FROM_STRING_PARSER_H_ */
diff --git a/alib2/src/regexp/RegExpFromXMLParser.h b/alib2/src/regexp/RegExpFromXMLParser.h
index 7fa76433981735c508936a468dee5b2ced3d361d..d77840db45ba3ef1996a413c09749afed7e96d38 100644
--- a/alib2/src/regexp/RegExpFromXMLParser.h
+++ b/alib2/src/regexp/RegExpFromXMLParser.h
@@ -40,4 +40,5 @@ public:
 };
 
 } /* namespace regexp */
-#endif /* REG_EXP_FROM_PARSER_H_ */
+
+#endif /* REG_EXP_FROM_XML_PARSER_H_ */