Header cleanup filesystem follow-up (#2894)

* Header cleanup * Header guard rename
mamba-org · Oct 6, 2023 · b9837f2 · b9837f2
1 parent 5a302fc
commit b9837f2
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 5 deletions.
diff --git a/libmamba/include/mamba/core/fetch.hpp b/libmamba/include/mamba/core/fetch.hpp
@@ -7,6 +7,8 @@
 #ifndef MAMBA_CORE_FETCH_HPP
 #define MAMBA_CORE_FETCH_HPP
 
+#include <fstream>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -21,7 +23,6 @@ extern "C"
 ////////////////////////////////////
 
 #include "progress_bar.hpp"
-#include "validate.hpp"
 
 namespace mamba
 {

diff --git a/libmamba/include/mamba/core/subdirdata.hpp b/libmamba/include/mamba/core/subdirdata.hpp
@@ -16,7 +16,6 @@
 #include "mamba/core/context.hpp"
 #include "mamba/core/download.hpp"
 #include "mamba/core/error_handling.hpp"
-#include "mamba/core/fetch.hpp"
 #include "mamba/core/package_cache.hpp"
 #include "mamba/core/pool.hpp"
 #include "mamba/core/repo.hpp"

diff --git a/libmamba/include/mamba/fs/filesystem.hpp b/libmamba/include/mamba/fs/filesystem.hpp
@@ -4,8 +4,8 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#ifndef MAMBA_CORE_FS_FILESYSTEM_HPP
-#define MAMBA_CORE_FS_FILESYSTEM_HPP
+#ifndef MAMBA_FS_FILESYSTEM_HPP
+#define MAMBA_FS_FILESYSTEM_HPP
 
 #include <filesystem>
 #include <string>

diff --git a/libmamba/src/api/configuration.cpp b/libmamba/src/api/configuration.cpp
@@ -19,6 +19,7 @@
 #include "mamba/core/fsutil.hpp"
 #include "mamba/core/output.hpp"
 #include "mamba/core/package_download.hpp"
+#include "mamba/core/util.hpp"
 #include "mamba/util/build.hpp"
 #include "mamba/util/string.hpp"
 

diff --git a/libmamba/src/core/fetch.cpp b/libmamba/src/core/fetch.cpp
@@ -12,6 +12,7 @@
 #include "mamba/core/fetch.hpp"
 #include "mamba/core/output.hpp"
 #include "mamba/core/thread_utils.hpp"
+#include "mamba/core/util.hpp"
 #include "mamba/util/build.hpp"
 #include "mamba/util/string.hpp"
 #include "mamba/util/url.hpp"

diff --git a/libmamba/src/core/package_download.cpp b/libmamba/src/core/package_download.cpp
@@ -5,7 +5,6 @@
 // The full license is in the file LICENSE, distributed with this software.
 
 #include <iostream>
-#include <stack>
 
 #include <fmt/color.h>
 #include <fmt/format.h>
@@ -21,6 +20,8 @@
 #include "mamba/core/package_handling.hpp"
 #include "mamba/core/progress_bar.hpp"
 #include "mamba/core/thread_utils.hpp"
+#include "mamba/core/util.hpp"
+#include "mamba/core/validate.hpp"
 #include "mamba/fs/filesystem.hpp"
 #include "mamba/util/string.hpp"
 

diff --git a/libmamba/src/core/transaction.cpp b/libmamba/src/core/transaction.cpp
@@ -15,6 +15,8 @@
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <solv/selection.h>
+
+#include "mamba/core/validate.hpp"
 extern "C"  // Incomplete header
 {
 #include <solv/conda.h>