Index: kernel/generic/include/proc/program.h
===================================================================
--- kernel/generic/include/proc/program.h	(revision 61bacded878f459ea118aa64c4d85fac0742a54a)
+++ kernel/generic/include/proc/program.h	(revision 61bacded878f459ea118aa64c4d85fac0742a54a)
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup genericproc
+ * @{
+ */
+/** @file
+ */
+
+#ifndef KERN_PROGRAM_H_
+#define KERN_PROGRAM_H_
+
+#include <arch/types.h>
+
+struct task;
+struct thread;
+
+/** Program info structure.
+ *
+ * A program is an abstraction of a freshly created (not yet running)
+ * userspace task containing a main thread along with its userspace stack.
+ */
+typedef struct program {
+	struct task *task;		/**< Program task */
+	struct thread *main_thread;	/**< Program main thread */
+} program_t;
+
+extern void *program_loader;
+
+extern void program_create(as_t *as, uintptr_t entry_addr, program_t *p);
+extern int program_create_from_image(void *image_addr, program_t *p);
+extern int program_create_loader(program_t *p);
+extern void program_ready(program_t *p);
+
+extern unative_t sys_program_spawn_loader(int *uspace_phone_id);
+
+#endif
+
+/** @}
+ */
Index: kernel/generic/include/proc/task.h
===================================================================
--- kernel/generic/include/proc/task.h	(revision 7ac426ecbe598b545eba79916f325e44c686226a)
+++ kernel/generic/include/proc/task.h	(revision 61bacded878f459ea118aa64c4d85fac0742a54a)
@@ -133,5 +133,4 @@
 
 extern unative_t sys_task_get_id(task_id_t *uspace_task_id);
-extern unative_t sys_task_spawn(void *image, size_t size);
 
 #endif
Index: kernel/generic/include/proc/thread.h
===================================================================
--- kernel/generic/include/proc/thread.h	(revision 7ac426ecbe598b545eba79916f325e44c686226a)
+++ kernel/generic/include/proc/thread.h	(revision 61bacded878f459ea118aa64c4d85fac0742a54a)
@@ -249,6 +249,4 @@
 extern bool thread_exists(thread_t *t);
 
-extern thread_t *thread_create_program(void *program_addr, char *name);
-
 /** Fpu context slab cache. */
 extern slab_cache_t *fpu_context_slab;