diff --git a/src/env/env_convert.c b/src/env/env_convert.c
index c67bf8a..991816a 100644
--- a/src/env/env_convert.c
+++ b/src/env/env_convert.c
@@ -6,11 +6,13 @@
 /*   By: khais <marvin@42.fr>                       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/19 14:39:57 by khais             #+#    #+#             */
-/*   Updated: 2025/02/19 14:45:54 by khais            ###   ########.fr       */
+/*   Updated: 2025/02/19 16:41:08 by khais            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "env_convert.h"
+#include "env.h"
+#include "env_manip.h"
+#include "envp.h"
 #include "libft.h"
 
 /*
diff --git a/src/env/env_convert.h b/src/env/env_convert.h
index a8a6286..fe15b8b 100644
--- a/src/env/env_convert.h
+++ b/src/env/env_convert.h
@@ -6,16 +6,16 @@
 /*   By: khais <marvin@42.fr>                       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/19 14:38:43 by khais             #+#    #+#             */
-/*   Updated: 2025/02/19 14:39:39 by khais            ###   ########.fr       */
+/*   Updated: 2025/02/19 16:42:27 by khais            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #ifndef ENV_CONVERT_H
 # define ENV_CONVERT_H
 
-# include "env_manip.h"
+struct	s_env;
 
-char	**envp_from_env(t_env *env);
-t_env	*env_from_envp(char **envp);
+char			**envp_from_env(struct s_env *env);
+struct s_env	*env_from_envp(char **envp);
 
 #endif
diff --git a/src/env/env_manip.c b/src/env/env_manip.c
index b5ccc6a..a2dd72a 100644
--- a/src/env/env_manip.c
+++ b/src/env/env_manip.c
@@ -6,10 +6,12 @@
 /*   By: jguelen <marvin@42.fr>                     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/12 18:29:12 by jguelen           #+#    #+#             */
-/*   Updated: 2025/02/19 14:41:06 by khais            ###   ########.fr       */
+/*   Updated: 2025/02/19 16:41:38 by khais            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "env.h"
+#include "env_convert.h"
 #include "env_manip.h"
 #include "libft.h"
 #include "../ft_errno.h"
diff --git a/src/env/env_manip.h b/src/env/env_manip.h
index 96d2a4c..cdfdadb 100644
--- a/src/env/env_manip.h
+++ b/src/env/env_manip.h
@@ -6,20 +6,18 @@
 /*   By: jguelen <marvin@42.fr>                     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/14 13:46:39 by jguelen           #+#    #+#             */
-/*   Updated: 2025/02/19 14:43:49 by khais            ###   ########.fr       */
+/*   Updated: 2025/02/19 16:39:16 by khais            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #ifndef ENV_MANIP_H
 # define ENV_MANIP_H
 
-# include "envp.h"
-# include "env.h"
-# include "env_convert.h"
+struct	s_env;
 
-char	*env_get_val(t_env *env, char *key);
-void	env_rm_entry(t_env **env, char *key);
-t_env	*env_set_entry(t_env **env, char *key, char *value);
-t_env	*env_find_node_bykey(t_env *env, char *key);
+char			*env_get_val(struct s_env *env, char *key);
+void			env_rm_entry(struct s_env **env, char *key);
+struct s_env	*env_set_entry(struct s_env **env, char *key, char *value);
+struct s_env	*env_find_node_bykey(struct s_env *env, char *key);
 
 #endif
diff --git a/tests/test_env_manip.c b/tests/test_env_manip.c
index 292571c..58c9326 100644
--- a/tests/test_env_manip.c
+++ b/tests/test_env_manip.c
@@ -6,14 +6,16 @@
 /*   By: khais <marvin@42.fr>                       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/18 15:11:14 by khais             #+#    #+#             */
-/*   Updated: 2025/02/19 13:30:38 by khais            ###   ########.fr       */
+/*   Updated: 2025/02/19 16:41:53 by khais            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "../src/env/env.h"
+#include "../src/env/env_convert.h"
 #include "../src/env/env_manip.h"
+#include "../src/env/envp.h"
 #include "../src/ft_errno.h"
 #include "libft.h"
-#include "testutil.h"
 #include "unistd.h"
 #include <assert.h>