diff --git a/exec/include/exec/_builtins.h b/exec/include/exec/_builtins.h
new file mode 100644
index 00000000..006619c6
--- /dev/null
+++ b/exec/include/exec/_builtins.h
@@ -0,0 +1,50 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   _builtins.h                                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: maiboyer <maiboyer@student.42.fr>          +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/08/10 18:43:56 by maiboyer          #+#    #+#             */
+/*   Updated: 2024/08/30 19:12:45 by maiboyer         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef _BUILTINS_H
+# define _BUILTINS_H
+
+# include "app/env.h"
+# include "app/state.h"
+# include "exec/_run_ast.h"
+# include "me/os/os.h"
+# include "me/types.h"
+# include "me/vec/vec_str.h"
+
+typedef struct s_builtin_spawn_info	t_builtin_spawn_info;
+
+struct s_builtin_spawn_info
+{
+	t_vec_str	args;
+	t_fd		*stdin;
+	t_fd		*stdout;
+	t_fd		*stderr;
+};
+
+t_error			builtin_cd____(\
+	t_state *state, t_builtin_spawn_info info, t_i32 *exit_code);
+t_error			builtin_echo__(\
+	t_state *state, t_builtin_spawn_info info, t_i32 *exit_code);
+t_error			builtin_env___(\
+	t_state *state, t_builtin_spawn_info info, t_i32 *exit_code);
+t_error			builtin_exit__(\
+	t_state *state, t_builtin_spawn_info info, t_i32 *exit_code);
+t_error			builtin_export(\
+	t_state *state, t_builtin_spawn_info info, t_i32 *exit_code);
+t_error			builtin_pwd___(\
+	t_state *state, t_builtin_spawn_info info, t_i32 *exit_code);
+t_error			builtin_unset_(\
+	t_state *state, t_builtin_spawn_info info, t_i32 *exit_code);
+t_error			builtin_debug_(\
+	t_state *state, t_builtin_spawn_info info, t_i32 *exit_code);
+
+#endif /* BUILTINS_H */
diff --git a/exec/include/exec/_builtins_func.h b/exec/include/exec/_builtins_func.h
new file mode 100644
index 00000000..735f59f4
--- /dev/null
+++ b/exec/include/exec/_builtins_func.h
@@ -0,0 +1,21 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   _builtins_func.h                                   :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: maiboyer <maiboyer@student.42.fr>          +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/08/30 19:05:24 by maiboyer          #+#    #+#             */
+/*   Updated: 2024/08/30 19:13:17 by maiboyer         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef _BUILTINS_FUNC_H
+# define _BUILTINS_FUNC_H
+
+# include "me/types.h"
+
+typedef t_error	((*t_builtin_func)(t_state *state, \
+				t_builtin_spawn_info info, t_i32 *exit_code));
+
+#endif /* _BUILTIN_FUNC_H */
diff --git a/exec/include/exec/builtins.h b/exec/include/exec/builtins.h
index 568c2491..4bfa1815 100644
--- a/exec/include/exec/builtins.h
+++ b/exec/include/exec/builtins.h
@@ -5,49 +5,15 @@
 /*                                                    +:+ +:+         +:+     */
 /*   By: maiboyer <maiboyer@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2024/08/10 18:43:56 by maiboyer          #+#    #+#             */
-/*   Updated: 2024/08/30 18:22:17 by rparodi          ###   ########.fr       */
+/*   Created: 2024/08/30 19:12:38 by maiboyer          #+#    #+#             */
+/*   Updated: 2024/08/30 19:13:26 by maiboyer         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #ifndef BUILTINS_H
 # define BUILTINS_H
 
-# include "app/env.h"
-# include "app/state.h"
-# include "exec/_run_ast.h"
-# include "me/os/os.h"
-# include "me/types.h"
-# include "me/vec/vec_str.h"
-
-typedef struct s_builtin_spawn_info	t_builtin_spawn_info;
-
-struct s_builtin_spawn_info
-{
-	t_vec_str	args;
-	t_fd		*stdin;
-	t_fd		*stdout;
-	t_fd		*stderr;
-};
-
-typedef t_error	(*t_builtin_func)\
-		(t_state *state, t_builtin_spawn_info info, t_i32 *exit_code);
-
-t_error			builtin_cd____(\
-	t_state *state, t_builtin_spawn_info info, t_i32 *exit_code);
-t_error			builtin_echo__(\
-	t_state *state, t_builtin_spawn_info info, t_i32 *exit_code);
-t_error			builtin_env___(\
-	t_state *state, t_builtin_spawn_info info, t_i32 *exit_code);
-t_error			builtin_exit__(\
-	t_state *state, t_builtin_spawn_info info, t_i32 *exit_code);
-t_error			builtin_export(\
-	t_state *state, t_builtin_spawn_info info, t_i32 *exit_code);
-t_error			builtin_pwd___(\
-	t_state *state, t_builtin_spawn_info info, t_i32 *exit_code);
-t_error			builtin_unset_(\
-	t_state *state, t_builtin_spawn_info info, t_i32 *exit_code);
-t_error			builtin_debug_(\
-	t_state *state, t_builtin_spawn_info info, t_i32 *exit_code);
+# include "exec/_builtins.h"
+# include "exec/_builtins_func.h"
 
 #endif /* BUILTINS_H */