diff --git a/src/aktualizr_secondary/aktualizr_secondary.h b/src/aktualizr_secondary/aktualizr_secondary.h
index e14bc7648..c60f71434 100644
--- a/src/aktualizr_secondary/aktualizr_secondary.h
+++ b/src/aktualizr_secondary/aktualizr_secondary.h
@@ -4,7 +4,7 @@
 #include "aktualizr_secondary_config.h"
 #include "aktualizr_secondary_metadata.h"
 #include "msg_handler.h"
-
+#include "storage/invstorage.h"
 #include "uptane/directorrepository.h"
 #include "uptane/imagerepository.h"
 #include "uptane/manifest.h"
diff --git a/src/aktualizr_secondary/aktualizr_secondary_file.cc b/src/aktualizr_secondary/aktualizr_secondary_file.cc
index 6d347e847..0d5e98e56 100644
--- a/src/aktualizr_secondary/aktualizr_secondary_file.cc
+++ b/src/aktualizr_secondary/aktualizr_secondary_file.cc
@@ -1,4 +1,6 @@
 #include "aktualizr_secondary_file.h"
+
+#include "storage/invstorage.h"
 #include "update_agent_file.h"
 
 const std::string AktualizrSecondaryFile::FileUpdateDefaultFile{"firmware.txt"};
diff --git a/src/libaktualizr/uptane/directorrepository.cc b/src/libaktualizr/uptane/directorrepository.cc
index 982779a2b..7aeaccd39 100644
--- a/src/libaktualizr/uptane/directorrepository.cc
+++ b/src/libaktualizr/uptane/directorrepository.cc
@@ -1,5 +1,7 @@
 #include "directorrepository.h"
 
+#include "storage/invstorage.h"
+
 namespace Uptane {
 
 void DirectorRepository::resetMeta() {
diff --git a/src/libaktualizr/uptane/fetcher.h b/src/libaktualizr/uptane/fetcher.h
index ab35b46ea..4fb59912d 100644
--- a/src/libaktualizr/uptane/fetcher.h
+++ b/src/libaktualizr/uptane/fetcher.h
@@ -3,7 +3,7 @@
 
 #include "http/httpinterface.h"
 #include "libaktualizr/config.h"
-#include "storage/invstorage.h"
+#include "tuf.h"
 
 namespace Uptane {
 
diff --git a/src/libaktualizr/uptane/imagerepository.cc b/src/libaktualizr/uptane/imagerepository.cc
index 32ea6212e..6ce390e9d 100644
--- a/src/libaktualizr/uptane/imagerepository.cc
+++ b/src/libaktualizr/uptane/imagerepository.cc
@@ -1,5 +1,7 @@
 #include "imagerepository.h"
 
+#include "storage/invstorage.h"
+
 namespace Uptane {
 
 void ImageRepository::resetMeta() {
diff --git a/src/libaktualizr/uptane/iterator.cc b/src/libaktualizr/uptane/iterator.cc
index 2429757c1..fb972a223 100644
--- a/src/libaktualizr/uptane/iterator.cc
+++ b/src/libaktualizr/uptane/iterator.cc
@@ -1,5 +1,7 @@
 #include "iterator.h"
 
+#include "storage/invstorage.h"
+
 namespace Uptane {
 
 Targets getTrustedDelegation(const Role &delegate_role, const Targets &parent_targets,