diff --git a/Makefile.am b/Makefile.am
index 51f7bdd..9373ea2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,4 +20,8 @@
 
 libblobcmds_la_CXXFLAGS = $(SYSTEMD_CFLAGS)
 
+nobase_include_HEADERS = \
+	blobs-ipmid/blobs.hpp \
+	blobs-ipmid/manager.hpp
+
 SUBDIRS = . test
diff --git a/blobs.hpp b/blobs-ipmid/blobs.hpp
similarity index 100%
rename from blobs.hpp
rename to blobs-ipmid/blobs.hpp
diff --git a/manager.hpp b/blobs-ipmid/manager.hpp
similarity index 99%
rename from manager.hpp
rename to blobs-ipmid/manager.hpp
index cfa62f5..8220e0e 100644
--- a/manager.hpp
+++ b/blobs-ipmid/manager.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "blobs.hpp"
-
+#include <blobs-ipmid/blobs.hpp>
 #include <ctime>
 #include <memory>
 #include <string>
diff --git a/example/example.hpp b/example/example.hpp
index 0ea9572..4a2df5d 100644
--- a/example/example.hpp
+++ b/example/example.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "blobs.hpp"
-
+#include <blobs-ipmid/blobs.hpp>
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/ipmi.hpp b/ipmi.hpp
index c8b6c24..3b99e6e 100644
--- a/ipmi.hpp
+++ b/ipmi.hpp
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "manager.hpp"
-
 #include <host-ipmid/ipmid-api.h>
 
+#include <blobs-ipmid/manager.hpp>
 #include <string>
 
 namespace blobs
diff --git a/manager.cpp b/manager.cpp
index b6311b4..9a87b4f 100644
--- a/manager.cpp
+++ b/manager.cpp
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#include "manager.hpp"
-
+#include <blobs-ipmid/manager.hpp>
 #include <string>
 #include <vector>
 
diff --git a/process.hpp b/process.hpp
index e8a9906..8f874dc 100644
--- a/process.hpp
+++ b/process.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
 #include "crc.hpp"
-#include "manager.hpp"
 
 #include <host-ipmid/ipmid-api.h>
 
+#include <blobs-ipmid/manager.hpp>
 #include <functional>
 
 namespace blobs
diff --git a/test/blob_mock.hpp b/test/blob_mock.hpp
index 6c21c65..3396048 100644
--- a/test/blob_mock.hpp
+++ b/test/blob_mock.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "blobs.hpp"
+#include <blobs-ipmid/blobs.hpp>
 
 #include <gmock/gmock.h>
 
diff --git a/test/manager_close_unittest.cpp b/test/manager_close_unittest.cpp
index 47c9264..85ad81b 100644
--- a/test/manager_close_unittest.cpp
+++ b/test/manager_close_unittest.cpp
@@ -1,5 +1,6 @@
 #include "blob_mock.hpp"
-#include "manager.hpp"
+
+#include <blobs-ipmid/manager.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/test/manager_commit_unittest.cpp b/test/manager_commit_unittest.cpp
index b1b3c8c..e576707 100644
--- a/test/manager_commit_unittest.cpp
+++ b/test/manager_commit_unittest.cpp
@@ -1,6 +1,6 @@
 #include "blob_mock.hpp"
-#include "manager.hpp"
 
+#include <blobs-ipmid/manager.hpp>
 #include <vector>
 
 #include <gtest/gtest.h>
diff --git a/test/manager_delete_unittest.cpp b/test/manager_delete_unittest.cpp
index 9ad3afd..62a2e4c 100644
--- a/test/manager_delete_unittest.cpp
+++ b/test/manager_delete_unittest.cpp
@@ -1,5 +1,6 @@
 #include "blob_mock.hpp"
-#include "manager.hpp"
+
+#include <blobs-ipmid/manager.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/test/manager_getsession_unittest.cpp b/test/manager_getsession_unittest.cpp
index e66729a..2022146 100644
--- a/test/manager_getsession_unittest.cpp
+++ b/test/manager_getsession_unittest.cpp
@@ -1,4 +1,4 @@
-#include "manager.hpp"
+#include <blobs-ipmid/manager.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/test/manager_mock.hpp b/test/manager_mock.hpp
index 41979ac..3a9d065 100644
--- a/test/manager_mock.hpp
+++ b/test/manager_mock.hpp
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "blobs.hpp"
-#include "manager.hpp"
-
+#include <blobs-ipmid/blobs.hpp>
+#include <blobs-ipmid/manager.hpp>
 #include <memory>
 #include <string>
 
diff --git a/test/manager_open_unittest.cpp b/test/manager_open_unittest.cpp
index 309d3f6..441c204 100644
--- a/test/manager_open_unittest.cpp
+++ b/test/manager_open_unittest.cpp
@@ -1,6 +1,6 @@
 #include "blob_mock.hpp"
-#include "manager.hpp"
 
+#include <blobs-ipmid/manager.hpp>
 #include <string>
 
 #include <gtest/gtest.h>
diff --git a/test/manager_read_unittest.cpp b/test/manager_read_unittest.cpp
index 1d40f5d..5858658 100644
--- a/test/manager_read_unittest.cpp
+++ b/test/manager_read_unittest.cpp
@@ -1,6 +1,6 @@
 #include "blob_mock.hpp"
-#include "manager.hpp"
 
+#include <blobs-ipmid/manager.hpp>
 #include <vector>
 
 #include <gtest/gtest.h>
diff --git a/test/manager_sessionstat_unittest.cpp b/test/manager_sessionstat_unittest.cpp
index 6ae27d3..8e4c233 100644
--- a/test/manager_sessionstat_unittest.cpp
+++ b/test/manager_sessionstat_unittest.cpp
@@ -1,5 +1,6 @@
 #include "blob_mock.hpp"
-#include "manager.hpp"
+
+#include <blobs-ipmid/manager.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/test/manager_stat_unittest.cpp b/test/manager_stat_unittest.cpp
index a13a66d..15b779e 100644
--- a/test/manager_stat_unittest.cpp
+++ b/test/manager_stat_unittest.cpp
@@ -1,5 +1,6 @@
 #include "blob_mock.hpp"
-#include "manager.hpp"
+
+#include <blobs-ipmid/manager.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/test/manager_unittest.cpp b/test/manager_unittest.cpp
index 7d4d49e..c0157e6 100644
--- a/test/manager_unittest.cpp
+++ b/test/manager_unittest.cpp
@@ -1,7 +1,7 @@
 #include "blob_mock.hpp"
-#include "manager.hpp"
 
 #include <algorithm>
+#include <blobs-ipmid/manager.hpp>
 #include <string>
 #include <vector>
 
diff --git a/test/manager_write_unittest.cpp b/test/manager_write_unittest.cpp
index 33c6d5a..50ea7a4 100644
--- a/test/manager_write_unittest.cpp
+++ b/test/manager_write_unittest.cpp
@@ -1,5 +1,6 @@
 #include "blob_mock.hpp"
-#include "manager.hpp"
+
+#include <blobs-ipmid/manager.hpp>
 
 #include <gtest/gtest.h>