From c63cf980c0ae31974f49672e1386a320b9043037 Mon Sep 17 00:00:00 2001
From: Patti Vacek <pattivacek@gmail.com>
Date: Fri, 1 Oct 2021 15:08:14 +0200
Subject: [PATCH] Minor header cleanup.

Signed-off-by: Patti Vacek <pattivacek@gmail.com>
---
 src/aktualizr_secondary/aktualizr_secondary.h       | 2 +-
 src/aktualizr_secondary/aktualizr_secondary_file.cc | 2 ++
 src/libaktualizr/uptane/directorrepository.cc       | 2 ++
 src/libaktualizr/uptane/fetcher.h                   | 2 +-
 src/libaktualizr/uptane/imagerepository.cc          | 2 ++
 src/libaktualizr/uptane/iterator.cc                 | 2 ++
 6 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/aktualizr_secondary/aktualizr_secondary.h b/src/aktualizr_secondary/aktualizr_secondary.h
index e14bc76488..c60f714344 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 6d347e847c..0d5e98e56e 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 982779a2bc..7aeaccd394 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 ab35b46ea4..4fb59912d9 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 32ea6212e8..6ce390e9d1 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 2429757c1c..fb972a2231 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,