diff --git a/ase/awk/map.c b/ase/awk/map.c
index de614b2a..d4fbf63b 100644
--- a/ase/awk/map.c
+++ b/ase/awk/map.c
@@ -1,8 +1,8 @@
 /*
- * $Id: map.c,v 1.2 2006-03-02 15:36:30 bacon Exp $
+ * $Id: map.c,v 1.3 2006-03-03 11:51:48 bacon Exp $
  */
 
-#include <xp/awk/map.h>
+#include <xp/awk/awk.h>
 
 #ifndef __STAND_ALONE
 #include <xp/bas/memory.h>
diff --git a/ase/awk/map.h b/ase/awk/map.h
index dd050c14..83fe0aad 100644
--- a/ase/awk/map.h
+++ b/ase/awk/map.h
@@ -1,10 +1,14 @@
 /*
- * $Id: map.h,v 1.1 2006-03-02 15:10:59 bacon Exp $
+ * $Id: map.h,v 1.2 2006-03-03 11:51:48 bacon Exp $
  */
 
 #ifndef _XP_AWK_MAP_H_
 #define _XP_AWK_MAP_H_
 
+#ifndef _XP_AWK_AWK_H_
+#error Never include this file directly. Include <xp/awk/awk.h> instead
+#endif
+
 #ifdef __STAND_ALONE
 #include <xp/awk/sa.h>
 #else
diff --git a/ase/awk/sa.c b/ase/awk/sa.c
index 9ec3369d..d706f6a6 100644
--- a/ase/awk/sa.c
+++ b/ase/awk/sa.c
@@ -1,8 +1,8 @@
 /*
- * $Id: sa.c,v 1.7 2006-01-20 17:00:36 bacon Exp $
+ * $Id: sa.c,v 1.8 2006-03-03 11:51:48 bacon Exp $
  */
 
-#include <xp/awk/sa.h>
+#include <xp/awk/awk.h>
 
 #ifdef __STAND_ALONE
 
diff --git a/ase/awk/sa.h b/ase/awk/sa.h
index b84e2080..2568cfee 100644
--- a/ase/awk/sa.h
+++ b/ase/awk/sa.h
@@ -1,10 +1,14 @@
 /*
- * $Id: sa.h,v 1.11 2006-03-03 11:45:45 bacon Exp $
+ * $Id: sa.h,v 1.12 2006-03-03 11:51:48 bacon Exp $
  */
 
 #ifndef _XP_AWK_SA_H_
 #define _XP_AWK_SA_H_
 
+#ifndef _XP_AWK_AWK_H_
+#error Never include this file directly. Include <xp/awk/awk.h> instead
+#endif
+
 #ifdef __STAND_ALONE 
 
 #include <stdio.h>
diff --git a/ase/awk/tab.c b/ase/awk/tab.c
index d29456c1..ed9fe4d5 100644
--- a/ase/awk/tab.c
+++ b/ase/awk/tab.c
@@ -1,8 +1,8 @@
 /*
- * $Id: tab.c,v 1.4 2006-02-05 14:21:18 bacon Exp $
+ * $Id: tab.c,v 1.5 2006-03-03 11:51:48 bacon Exp $
  */
 
-#include <xp/awk/tab.h>
+#include <xp/awk/awk.h>
 
 #ifndef __STAND_ALONE
 #include <xp/bas/memory.h>
diff --git a/ase/awk/tab.h b/ase/awk/tab.h
index f2b39408..3306cc84 100644
--- a/ase/awk/tab.h
+++ b/ase/awk/tab.h
@@ -1,10 +1,14 @@
 /*
- * $Id: tab.h,v 1.3 2006-02-05 14:21:18 bacon Exp $
+ * $Id: tab.h,v 1.4 2006-03-03 11:51:48 bacon Exp $
  */
 
 #ifndef _XP_AWK_TAB_H_
 #define _XP_AWK_TAB_H_
 
+#ifndef _XP_AWK_AWK_H_
+#error Never include this file directly. Include <xp/awk/awk.h> instead
+#endif
+
 #ifdef __STAND_ALONE
 #include <xp/awk/sa.h>
 #else
diff --git a/ase/awk/tree.h b/ase/awk/tree.h
index 44d90c05..d089c4e7 100644
--- a/ase/awk/tree.h
+++ b/ase/awk/tree.h
@@ -1,12 +1,12 @@
 /*
- * $Id: tree.h,v 1.23 2006-03-03 11:45:45 bacon Exp $
+ * $Id: tree.h,v 1.24 2006-03-03 11:51:48 bacon Exp $
  */
 
 #ifndef _XP_AWK_TREE_H_
 #define _XP_AWK_TREE_H_
 
 #ifndef _XP_AWK_AWK_H_
-#error Never include this file directly. Include <xp/aw/awk.h> instead
+#error Never include this file directly. Include <xp/awk/awk.h> instead
 #endif
 
 enum