From 90ad1c32a02057c2531617c1d8cbfb39fa198134 Mon Sep 17 00:00:00 2001
From: Hind Montassif <hind.montassif@gmail.com>
Date: Thu, 5 Sep 2024 09:22:09 +0200
Subject: [PATCH] Clean up

---
 libmamba/src/api/pip_utils.cpp |  5 +++--
 libmamba/src/api/pip_utils.hpp | 13 +++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/libmamba/src/api/pip_utils.cpp b/libmamba/src/api/pip_utils.cpp
index 18d3d23b32..f8a2a6e15b 100644
--- a/libmamba/src/api/pip_utils.cpp
+++ b/libmamba/src/api/pip_utils.cpp
@@ -11,8 +11,9 @@
 #include <reproc++/run.hpp>
 #include <reproc/reproc.h>
 
-#include "mamba/api/install.hpp"
-#include "mamba/core/activation.hpp"
+// TODO includes to be removed after moving some functions/structs around
+#include "mamba/api/install.hpp"      // other_pkg_mgr_spec
+#include "mamba/core/activation.hpp"  // get_path_dirs
 #include "mamba/core/context.hpp"
 #include "mamba/core/util.hpp"
 #include "mamba/fs/filesystem.hpp"
diff --git a/libmamba/src/api/pip_utils.hpp b/libmamba/src/api/pip_utils.hpp
index ed65b7d60c..5e5e5861f9 100644
--- a/libmamba/src/api/pip_utils.hpp
+++ b/libmamba/src/api/pip_utils.hpp
@@ -7,16 +7,21 @@
 #ifndef MAMBA_PIP_UTILS_HPP
 #define MAMBA_PIP_UTILS_HPP
 
+#include <stdexcept>
+#include <string>
 #include <vector>
 
-// TODO: move elements from `mamba/api/install.hpp` here
-#include "mamba/api/install.hpp"
-#include "mamba/core/context.hpp"
-
 #include "tl/expected.hpp"
 
 namespace mamba
 {
+    class Context;
+
+    namespace detail
+    {
+        struct other_pkg_mgr_spec;
+    }
+
     namespace pip
     {
         enum class Update : bool