diff --git a/alib2raw/src/factory/RawDataFactory.hpp b/alib2raw/src/factory/RawDataFactory.hpp
index 9c333b18a4337bd351e6e7ca13b7ddcb1dd25bcd..ee7dc18988a236c5c1548b336f30d693798f3684 100644
--- a/alib2raw/src/factory/RawDataFactory.hpp
+++ b/alib2raw/src/factory/RawDataFactory.hpp
@@ -8,7 +8,7 @@
 #ifndef RAW_DATA_FACTORY
 #define RAW_DATA_FACTORY
 
-#include <set>
+#include <alib/set>
 #include "exception/CommonException.h"
 #include <core/rawApi.hpp>
 #include <fstream>
diff --git a/alib2raw/src/registry/RawReaderRegistry.cpp b/alib2raw/src/registry/RawReaderRegistry.cpp
index 709c0923d6a318cbef771d846dac912019a24e33..de20e8f4427ae05576ad1d7785893146b2914801 100644
--- a/alib2raw/src/registry/RawReaderRegistry.cpp
+++ b/alib2raw/src/registry/RawReaderRegistry.cpp
@@ -6,8 +6,8 @@
  */
 
 #include <registry/RawReaderRegistry.hpp>
-#include <algorithm>
-#include <typeinfo>
+#include <alib/algorithm>
+#include <alib/typeinfo>
 
 namespace abstraction {
 
diff --git a/alib2raw/src/registry/RawReaderRegistry.hpp b/alib2raw/src/registry/RawReaderRegistry.hpp
index 18f3f498bcd23ff38c9fe09881095eb62a6edb5d..7e1c3a6228a99c30b87f1860e17913fd0aa5084a 100644
--- a/alib2raw/src/registry/RawReaderRegistry.hpp
+++ b/alib2raw/src/registry/RawReaderRegistry.hpp
@@ -8,9 +8,9 @@
 #ifndef _RAW_READER_REGISTRY_HPP_
 #define _RAW_READER_REGISTRY_HPP_
 
-#include <memory>
-#include <string>
-#include <map>
+#include <alib/memory>
+#include <alib/string>
+#include <alib/map>
 
 #include <exception/CommonException.h>
 #include <abstraction/OperationAbstraction.hpp>
diff --git a/alib2raw/src/registry/RawWriterRegistry.hpp b/alib2raw/src/registry/RawWriterRegistry.hpp
index c0904074fa39eaaa324d57aeee38f76fee776d61..b7ae25ecdca94c2af4752e7311bd23351e557621 100644
--- a/alib2raw/src/registry/RawWriterRegistry.hpp
+++ b/alib2raw/src/registry/RawWriterRegistry.hpp
@@ -8,10 +8,10 @@
 #ifndef _RAW_WRITER_REGISTRY_HPP_
 #define _RAW_WRITER_REGISTRY_HPP_
 
-#include <memory>
-#include <string>
-#include <set>
-#include <map>
+#include <alib/memory>
+#include <alib/string>
+#include <alib/set>
+#include <alib/map>
 
 #include <exception/CommonException.h>
 #include <abstraction/OperationAbstraction.hpp>