diff --git a/ase/lsp/token.h b/ase/lsp/token.h
index d03ccb09..f6f0e029 100644
--- a/ase/lsp/token.h
+++ b/ase/lsp/token.h
@@ -1,11 +1,11 @@
 /*
- * $Id: token.h,v 1.2 2005-02-04 16:00:37 bacon Exp $
+ * $Id: token.h,v 1.3 2005-02-04 16:03:25 bacon Exp $
  */
 
 #ifndef _XP_LISP_TOKEN_H_
 #define _XP_LISP_TOKEN_H_
 
-#include "types.h"
+#include <xp/lisp/types.h>
 
 struct xp_lisp_token_t 
 {
diff --git a/ase/lsp/types.h b/ase/lsp/types.h
index 6f707612..21914d83 100644
--- a/ase/lsp/types.h
+++ b/ase/lsp/types.h
@@ -1,23 +1,23 @@
 /*
- * $Id: types.h,v 1.1 2005-02-04 15:39:11 bacon Exp $
+ * $Id: types.h,v 1.2 2005-02-04 16:00:37 bacon Exp $
  */
 
-#ifndef _RBL_TYPES_H_
-#define _RBL_TYPES_H_
+#ifndef _XP_LISP_TYPES_H_
+#define _XP_LISP_TYPES_H_
 
-#include <rb/types.h>
-#include <rb/macros.h>
+#include <xp/types.h>
+#include <xp/macros.h>
 
-typedef rb_char xp_lisp_char;
-typedef rb_cint xp_lisp_cint;
+typedef xp_char_t xp_lisp_char;
+typedef xp_cint_t xp_lisp_cint;
 typedef int     xp_lisp_int;
 typedef float   xp_lisp_float;
 
-#define RBL_CHAR(x)  RB_CHAR(x)
-#define RBL_TEXT(x)  RB_TEXT(x)
-#define RBL_CHAR_END RB_EOF
+#define XP_LISP_CHAR(x)  XP_CHAR(x)
+#define XP_LISP_TEXT(x)  XP_TEXT(x)
+#define XP_LISP_CHAR_END XP_EOF
 
-#define xp_lisp_ensure(x) RB_ENSURE(x)
-#define xp_lisp_assert(x) RB_ASSERT(x)
+#define xp_lisp_ensure(x) XP_ENSURE(x)
+#define xp_lisp_assert(x) XP_ASSERT(x)
 
 #endif