diff --git a/alib2common/src/container/Container.h b/alib2common/src/container/Container.h
index eec01b67cef80a4afdf82df12dea998a5f7badcf..bd68518c17273f856ad623c83ec7a752ac1db78f 100644
--- a/alib2common/src/container/Container.h
+++ b/alib2common/src/container/Container.h
@@ -8,18 +8,12 @@
 #ifndef CONTAINER_H_
 #define CONTAINER_H_
 
-#include <base/WrapperBase.hpp>
-#include "ContainerBase.h"
-
 namespace container {
 
 /**
  * Wrapper around containers.
  */
-class Container : public base::WrapperBase < ContainerBase > {
-	using base::WrapperBase < ContainerBase >::WrapperBase;
-
-};
+class Container;
 
 } /* namespace container */
 
diff --git a/alib2xml/src/container/xml/ObjectsDeque.cpp b/alib2xml/src/container/xml/ObjectsDeque.cpp
index 023ed863e940cb648f51c73583bbda02ab36e82b..7adace7cec27f44e336b12d1bd70685668cbd19c 100644
--- a/alib2xml/src/container/xml/ObjectsDeque.cpp
+++ b/alib2xml/src/container/xml/ObjectsDeque.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "ObjectsDeque.h"
-#include <container/Container.h>
 
 #include <registration/XmlRegistration.hpp>
 
@@ -15,7 +14,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < container::ObjectsDeque < > > ( );
 static auto xmlReader = registration::XmlReaderRegister < container::ObjectsDeque < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < container::Container, container::ObjectsDeque < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, container::ObjectsDeque < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, container::ObjectsDeque < > > ( );
 
 } /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsList.cpp b/alib2xml/src/container/xml/ObjectsList.cpp
index 89e45a9dbff3358452ece7abffc39fa5f7ae7816..11485ea5bad983bdfaf44685bdb20e97d5ed615f 100644
--- a/alib2xml/src/container/xml/ObjectsList.cpp
+++ b/alib2xml/src/container/xml/ObjectsList.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "ObjectsList.h"
-#include <container/Container.h>
 
 #include <registration/XmlRegistration.hpp>
 
@@ -15,7 +14,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < container::ObjectsList < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < container::ObjectsList < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < container::Container, container::ObjectsList < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, container::ObjectsList < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, container::ObjectsList < > > ( );
 
 } /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsMap.cpp b/alib2xml/src/container/xml/ObjectsMap.cpp
index 428974e253ed3dac12d361e6aeda3a939919e81e..653fac7a0f14d2939a80a1dd8a4b08e17a431c10 100644
--- a/alib2xml/src/container/xml/ObjectsMap.cpp
+++ b/alib2xml/src/container/xml/ObjectsMap.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "ObjectsMap.h"
-#include <container/Container.h>
 
 #include <registration/XmlRegistration.hpp>
 
@@ -15,7 +14,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < container::ObjectsMap < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < container::ObjectsMap < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < container::Container, container::ObjectsMap < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, container::ObjectsMap < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, container::ObjectsMap < > > ( );
 
 } /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsPair.cpp b/alib2xml/src/container/xml/ObjectsPair.cpp
index 2ec591d4f6287c48c7e199208b65fb4464f81736..d179f2f8cb3feed256dbdf8a40b501fc174cdc31 100644
--- a/alib2xml/src/container/xml/ObjectsPair.cpp
+++ b/alib2xml/src/container/xml/ObjectsPair.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "ObjectsPair.h"
-#include <container/Container.h>
 
 #include <registration/XmlRegistration.hpp>
 
@@ -15,7 +14,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < container::ObjectsPair < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < container::ObjectsPair < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < container::Container, container::ObjectsPair < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, container::ObjectsPair < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, container::ObjectsPair < > > ( );
 
 } /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsSet.cpp b/alib2xml/src/container/xml/ObjectsSet.cpp
index fe40713309a8b09f6f52371b5fd13f8bd26589fc..9ecd0e4dab2b1cb1455fd91af98b09529a0375be 100644
--- a/alib2xml/src/container/xml/ObjectsSet.cpp
+++ b/alib2xml/src/container/xml/ObjectsSet.cpp
@@ -6,9 +6,7 @@
  */
 
 #include "ObjectsSet.h"
-#include <container/Container.h>
 
-#include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 
 namespace {
@@ -16,7 +14,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < container::ObjectsSet < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < container::ObjectsSet < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < container::Container, container::ObjectsSet < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, container::ObjectsSet < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, container::ObjectsSet < > > ( );
 
 } /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsTree.cpp b/alib2xml/src/container/xml/ObjectsTree.cpp
index 4159f6bd9427ced1ba92282d33247aa75559e12d..b6e82c50a5c80351c6de5ebdc8b85c78a142430e 100644
--- a/alib2xml/src/container/xml/ObjectsTree.cpp
+++ b/alib2xml/src/container/xml/ObjectsTree.cpp
@@ -6,9 +6,7 @@
  */
 
 #include "ObjectsTree.h"
-#include <container/Container.h>
 
-#include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 
 namespace {
@@ -16,7 +14,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < container::ObjectsTree < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < container::ObjectsTree < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < container::Container, container::ObjectsTree < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, container::ObjectsTree < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, container::ObjectsTree < > > ( );
 
 } /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsTrie.cpp b/alib2xml/src/container/xml/ObjectsTrie.cpp
index 23ee0d4e1ff6854f98fc7f011082b2c11cab5d4a..c535b403628230ec78289ceab27e93baaeb6878e 100644
--- a/alib2xml/src/container/xml/ObjectsTrie.cpp
+++ b/alib2xml/src/container/xml/ObjectsTrie.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "ObjectsTrie.h"
-#include <container/Container.h>
 
 #include <registration/XmlRegistration.hpp>
 
@@ -15,7 +14,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < container::ObjectsTrie < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < container::ObjectsTrie < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < container::Container, container::ObjectsTrie < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, container::ObjectsTrie < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, container::ObjectsTrie < > > ( );
 
 } /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsVector.cpp b/alib2xml/src/container/xml/ObjectsVector.cpp
index d66779fb12d0ff07b2ee91566b3bc2d627f6d565..7c05fbfc3b434a9ac7a44b8e9316630ec7592837 100644
--- a/alib2xml/src/container/xml/ObjectsVector.cpp
+++ b/alib2xml/src/container/xml/ObjectsVector.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "ObjectsVector.h"
-#include <container/Container.h>
 
 #include <registration/XmlRegistration.hpp>
 
@@ -15,7 +14,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < container::ObjectsVector < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < container::ObjectsVector < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < container::Container, container::ObjectsVector < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, container::ObjectsVector < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, container::ObjectsVector < > > ( );
 
 } /* namespace */