diff --git a/ase/lsp/array.c b/ase/lsp/array.c
index 108924c8..05b82fae 100644
--- a/ase/lsp/array.c
+++ b/ase/lsp/array.c
@@ -1,9 +1,9 @@
 /*
- * $Id: array.c,v 1.2 2005-02-04 16:00:37 bacon Exp $
+ * $Id: array.c,v 1.3 2005-02-05 05:43:55 bacon Exp $
  */
 
 #include <xp/lisp/array.h>
-#include <xp/c/stdlib.h>
+#include <xp/c/memory.h>
 #include <xp/c/assert.h>
 
 xp_lisp_array_t* xp_lisp_array_new (xp_size_t capacity)
diff --git a/ase/lsp/env.c b/ase/lsp/env.c
index 401852e4..7e5aa572 100644
--- a/ase/lsp/env.c
+++ b/ase/lsp/env.c
@@ -1,9 +1,10 @@
 /*
- * $Id: env.c,v 1.3 2005-02-05 05:18:20 bacon Exp $
+ * $Id: env.c,v 1.4 2005-02-05 05:43:55 bacon Exp $
  */
 
 #include <xp/lisp/env.h>
-#include <xp/c/stdlib.h>
+#include <xp/c/memory.h>
+#include <xp/c/assert.h>
 
 xp_lisp_assoc_t* xp_lisp_assoc_new (xp_lisp_obj_t* name, xp_lisp_obj_t* value)
 {
diff --git a/ase/lsp/eval.c b/ase/lsp/eval.c
index 1f0e828e..8f7eae95 100644
--- a/ase/lsp/eval.c
+++ b/ase/lsp/eval.c
@@ -1,10 +1,11 @@
 /*
- * $Id: eval.c,v 1.4 2005-02-05 05:18:20 bacon Exp $
+ * $Id: eval.c,v 1.5 2005-02-05 05:43:55 bacon Exp $
  */
 
 #include <xp/lisp/lisp.h>
 #include <xp/lisp/env.h>
 #include <xp/lisp/primitive.h>
+#include <xp/c/assert.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -54,7 +55,7 @@ static xp_lisp_obj_t* make_func (xp_lisp_t* lsp, xp_lisp_obj_t* cdr, int is_macr
 	// TODO: lambda expression syntax check.
 	xp_lisp_obj_t* func, * formal, * body;
 
-	printf ("about to create a function or a macro ....\n");
+printf ("about to create a function or a macro ....\n");
 
 	if (cdr == lsp->mem->nil) {
 		lsp->error = XP_LISP_ERR_TOO_FEW_ARGS;
diff --git a/ase/lsp/lisp.c b/ase/lsp/lisp.c
index 97b0582d..1766a14b 100644
--- a/ase/lsp/lisp.c
+++ b/ase/lsp/lisp.c
@@ -1,9 +1,9 @@
 /*
- * $Id: lisp.c,v 1.5 2005-02-05 05:30:25 bacon Exp $
+ * $Id: lisp.c,v 1.6 2005-02-05 05:43:55 bacon Exp $
  */
 
 #include <xp/lisp/lisp.h>
-#include <xp/c/stdlib.h>
+#include <xp/c/memory.h>
 #include <xp/c/assert.h>
 
 xp_lisp_t* xp_lisp_new (xp_size_t mem_ubound, xp_size_t mem_ubound_inc)
diff --git a/ase/lsp/memory.c b/ase/lsp/memory.c
index d8980c6e..c342678f 100644
--- a/ase/lsp/memory.c
+++ b/ase/lsp/memory.c
@@ -1,10 +1,10 @@
 /*
- * $Id: memory.c,v 1.5 2005-02-05 05:30:25 bacon Exp $
+ * $Id: memory.c,v 1.6 2005-02-05 05:43:55 bacon Exp $
  */
 
 #include <xp/lisp/memory.h> 
 #include <xp/lisp/primitive.h>
-#include <xp/c/stdlib.h>
+#include <xp/c/memory.h>
 #include <xp/c/assert.h>
 
 xp_lisp_mem_t* xp_lisp_mem_new (xp_size_t ubound, xp_size_t ubound_inc)
diff --git a/ase/lsp/read.c b/ase/lsp/read.c
index ca7db3f1..02a39bb7 100644
--- a/ase/lsp/read.c
+++ b/ase/lsp/read.c
@@ -1,10 +1,11 @@
 /*
- * $Id: read.c,v 1.5 2005-02-05 05:30:25 bacon Exp $
+ * $Id: read.c,v 1.6 2005-02-05 05:43:55 bacon Exp $
  */
 
 #include <xp/lisp/lisp.h>
 #include <xp/lisp/token.h>
 #include <xp/c/assert.h>
+#include <xp/c/ctype.h>
 
 #define IS_SPACE(x) xp_isspace(x)
 #define IS_DIGIT(x) xp_isdigit(x)
diff --git a/ase/lsp/token.c b/ase/lsp/token.c
index f4dcbfa5..25cfd86b 100644
--- a/ase/lsp/token.c
+++ b/ase/lsp/token.c
@@ -1,9 +1,9 @@
 /*
- * $Id: token.c,v 1.5 2005-02-05 05:30:25 bacon Exp $
+ * $Id: token.c,v 1.6 2005-02-05 05:43:55 bacon Exp $
  */
 
 #include <xp/lisp/token.h>
-#include <xp/c/stdlib.h>
+#include <xp/c/memory.h>
 #include <xp/c/assert.h>
 
 xp_lisp_token_t* xp_lisp_token_new (xp_size_t capacity)
diff --git a/ase/makefile.in b/ase/makefile.in
index ee0a50f0..11e55ca2 100644
--- a/ase/makefile.in
+++ b/ase/makefile.in
@@ -1,4 +1,4 @@
-SUBDIRS=c
+SUBDIRS=c lisp
 
 all:
 	@for i in $(SUBDIRS); \
diff --git a/ase/test/lsp/lisp.c b/ase/test/lsp/lisp.c
index c74261b8..8312ceaa 100644
--- a/ase/test/lsp/lisp.c
+++ b/ase/test/lsp/lisp.c
@@ -1,5 +1,6 @@
 #include <xp/lisp/lisp.h>
 #include <xp/c/stdio.h>
+#include <xp/c/ctype.h>
 
 #ifdef LINUX
 #include <mcheck.h>