diff --git a/headers/private/kernel/syscalls.h b/headers/private/kernel/syscalls.h
index dbebe7c94e..3fc8965455 100644
--- a/headers/private/kernel/syscalls.h
+++ b/headers/private/kernel/syscalls.h
@@ -258,9 +258,6 @@ int sys_sysctl(int *name, uint namlen, void *oldp, size_t *oldlen,
 		void *newp, size_t newlen);
 int sys_socket(int family, int type, int proto);
 
-int sys_setenv(const char *userName, const char *userValue, int overwrite);
-int sys_getenv(const char *name, char **value);
-
 /* System informations */
 extern status_t		_kern_get_system_info(system_info *info, size_t size);
 
diff --git a/headers/private/kernel/team.h b/headers/private/kernel/team.h
index 64215139d8..0ff074905d 100644
--- a/headers/private/kernel/team.h
+++ b/headers/private/kernel/team.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004, Haiku Inc.
+ * Copyright 2004-2005, Haiku Inc.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _TEAM_H
@@ -49,10 +49,6 @@ status_t _user_get_team_info(team_id id, team_info *info);
 status_t _user_get_next_team_info(int32 *cookie, team_info *info);
 status_t _user_get_team_usage_info(team_id team, int32 who, team_usage_info *info, size_t size);
 
-// ToDo: please move the "env" setter/getter out of the kernel!
-int _user_setenv(const char *name, const char *value, int overwrite);
-int _user_getenv(const char *name, char **value);
-
 #ifdef __cplusplus
 }
 #endif