diff --git a/alib2str/src/grammar/string/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp b/alib2str/src/grammar/string/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
deleted file mode 100644
index 2cf6d4f67376740dcf8edb9b1df4d8456d5962ba..0000000000000000000000000000000000000000
--- a/alib2str/src/grammar/string/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * ContextPreservingUnrestrictedGrammar.cpp
- *
- * Created on: Sep 27, 2017
- * Author: Jan Travnicek
- */
-
-#include "ContextPreservingUnrestrictedGrammar.h"
-#include <grammar/Grammar.h>
-
-#include <registration/StringRegistration.hpp>
-
-namespace {
-
-auto stringWrite = registration::StringWriterRegister < grammar::ContextPreservingUnrestrictedGrammar < > > ( );
-auto stringReader = registration::StringReaderRegister < grammar::Grammar, grammar::ContextPreservingUnrestrictedGrammar < > > ( );
-
-} /* namespace */
diff --git a/alib2str/src/grammar/string/Unrestricted/ContextPreservingUnrestrictedGrammar.cxx b/alib2str/src/grammar/string/Unrestricted/ContextPreservingUnrestrictedGrammar.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..b47c078999ffc9d5e811efb64682d35672c1f746
--- /dev/null
+++ b/alib2str/src/grammar/string/Unrestricted/ContextPreservingUnrestrictedGrammar.cxx
@@ -0,0 +1,18 @@
+/*
+ * ContextPreservingUnrestrictedGrammar.cpp
+ *
+ * Created on: Sep 27, 2017
+ * Author: Jan Travnicek
+ */
+
+#include "ContextPreservingUnrestrictedGrammar.h"
+#include <grammar/Grammar.h>
+
+#include <registration/StringRegistration.hpp>
+
+namespace {
+
+auto stringWriteContextPreservingUnrestrictedGrammar = registration::StringWriterRegister < grammar::ContextPreservingUnrestrictedGrammar < > > ( );
+auto stringReaderContextPreservingUnrestrictedGrammar = registration::StringReaderRegister < grammar::Grammar, grammar::ContextPreservingUnrestrictedGrammar < > > ( );
+
+} /* namespace */
diff --git a/alib2str/src/grammar/string/Unrestricted/Unrestricted.cpp b/alib2str/src/grammar/string/Unrestricted/Unrestricted.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..db5342f04eb10f7457b69fe8203ad6ffe1a9b37c
--- /dev/null
+++ b/alib2str/src/grammar/string/Unrestricted/Unrestricted.cpp
@@ -0,0 +1,2 @@
+#include "ContextPreservingUnrestrictedGrammar.cxx"
+#include "UnrestrictedGrammar.cxx"
diff --git a/alib2str/src/grammar/string/Unrestricted/UnrestrictedGrammar.cpp b/alib2str/src/grammar/string/Unrestricted/UnrestrictedGrammar.cpp
deleted file mode 100644
index 568e8d1882464399c287f9b313232901a85ccbf4..0000000000000000000000000000000000000000
--- a/alib2str/src/grammar/string/Unrestricted/UnrestrictedGrammar.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * UnrestrictedGrammar.cpp
- *
- * Created on: Sep 27, 2017
- * Author: Jan Travnicek
- */
-
-#include "UnrestrictedGrammar.h"
-#include <grammar/Grammar.h>
-
-#include <registration/StringRegistration.hpp>
-
-namespace {
-
-auto stringWrite = registration::StringWriterRegister < grammar::UnrestrictedGrammar < > > ( );
-auto stringReader = registration::StringReaderRegister < grammar::Grammar, grammar::UnrestrictedGrammar < > > ( );
-
-} /* namespace */
diff --git a/alib2str/src/grammar/string/Unrestricted/UnrestrictedGrammar.cxx b/alib2str/src/grammar/string/Unrestricted/UnrestrictedGrammar.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..6c10d52aa37666ac44422b158786180db9298a76
--- /dev/null
+++ b/alib2str/src/grammar/string/Unrestricted/UnrestrictedGrammar.cxx
@@ -0,0 +1,18 @@
+/*
+ * UnrestrictedGrammar.cpp
+ *
+ * Created on: Sep 27, 2017
+ * Author: Jan Travnicek
+ */
+
+#include "UnrestrictedGrammar.h"
+#include <grammar/Grammar.h>
+
+#include <registration/StringRegistration.hpp>
+
+namespace {
+
+auto stringWriteUnrestrictedGrammar = registration::StringWriterRegister < grammar::UnrestrictedGrammar < > > ( );
+auto stringReaderUnrestrictedGrammar = registration::StringReaderRegister < grammar::Grammar, grammar::UnrestrictedGrammar < > > ( );
+
+} /* namespace */