Index: Makefile
===================================================================
--- Makefile	(revision 3da998735e5c2c2edd772100b8b6ddef7aa85c15)
+++ Makefile	(revision 5a4c75466ef97501b585dcafcca85b611d1a8191)
@@ -39,6 +39,12 @@
 	libadt \
 	init \
-	pci \
 	ns
+
+ifeq ($(ARCH), amd64)
+	DIRS += pci
+endif
+ifeq ($(ARCH), ia32)
+	DIRS += pci
+endif
 
 BUILDS := $(addsuffix .build,$(DIRS))
Index: init/init.c
===================================================================
--- init/init.c	(revision 3da998735e5c2c2edd772100b8b6ddef7aa85c15)
+++ init/init.c	(revision 5a4c75466ef97501b585dcafcca85b611d1a8191)
@@ -37,4 +37,5 @@
 #include <psthread.h>
 #include <futex.h>
+#include <as.h>
 
 int a;
Index: libc/generic/as.c
===================================================================
--- libc/generic/as.c	(revision 3da998735e5c2c2edd772100b8b6ddef7aa85c15)
+++ libc/generic/as.c	(revision 5a4c75466ef97501b585dcafcca85b611d1a8191)
@@ -27,4 +27,5 @@
  */ 
 
+#include <as.h>
 #include <libc.h>
 #include <unistd.h>
Index: libc/include/as.h
===================================================================
--- libc/include/as.h	(revision 5a4c75466ef97501b585dcafcca85b611d1a8191)
+++ libc/include/as.h	(revision 5a4c75466ef97501b585dcafcca85b611d1a8191)
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2005 Martin Decky
+ * 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.
+ */
+
+#ifndef __AS_H__
+#define __AS_H__
+
+#include <types.h>
+#include <task.h>
+
+extern void *as_area_create(void *address, size_t size, int flags);
+extern void *as_area_resize(void *address, size_t size, int flags);
+extern int as_area_accept(task_id_t id, void *base, size_t size, int flags);
+extern int as_area_send(task_id_t id, void *base);
+
+#endif
Index: libc/include/unistd.h
===================================================================
--- libc/include/unistd.h	(revision 3da998735e5c2c2edd772100b8b6ddef7aa85c15)
+++ libc/include/unistd.h	(revision 5a4c75466ef97501b585dcafcca85b611d1a8191)
@@ -32,5 +32,4 @@
 #include <types.h>
 #include <arch/mm/page.h>
-#include <task.h>
 
 #define NULL 0
@@ -39,8 +38,4 @@
 extern ssize_t write(int fd, const void * buf, size_t count);
 extern void _exit(int status);
-extern void *as_area_create(void *address, size_t size, int flags);
-extern void *as_area_resize(void *address, size_t size, int flags);
-extern int as_area_accept(task_id_t id, void *base, size_t size, int flags);
-extern int as_area_send(task_id_t id, void *base);
 void *sbrk(ssize_t incr);