diff --git a/ase/awk/rex.h b/ase/awk/rex.h
index 3ba7532d..cb2b7ba3 100644
--- a/ase/awk/rex.h
+++ b/ase/awk/rex.h
@@ -1,5 +1,5 @@
 /*
- * $Id: rex.h,v 1.22 2006-11-15 05:49:22 bacon Exp $
+ * $Id: rex.h,v 1.23 2006-11-19 11:55:16 bacon Exp $
  **/
 
 #ifndef _ASE_AWK_REX_H_
@@ -42,7 +42,7 @@
 #define ASE_AWK_REX_LEN(code) \
 	(*(ase_size_t*)((ase_byte_t*)(code)+ase_sizeof(ase_size_t)))
 
-enum ase_awk_rex_option_t
+enum ase_awk_rex_opt_t
 {
 	ASE_AWK_REX_IGNORECASE = (1 << 0)
 };
diff --git a/ase/awk/run.c b/ase/awk/run.c
index 719281c6..d2d2d08f 100644
--- a/ase/awk/run.c
+++ b/ase/awk/run.c
@@ -1,5 +1,5 @@
 /*
- * $Id: run.c,v 1.273 2006-11-19 10:52:51 bacon Exp $
+ * $Id: run.c,v 1.274 2006-11-19 11:55:16 bacon Exp $
  */
 
 #include <ase/awk/awk_i.h>
@@ -16,7 +16,7 @@
 #define STACK_GLOBAL(run,n) ((run)->stack[(n)])
 #define STACK_RETVAL_GLOBAL(run) ((run)->stack[(run)->awk->tree.nglobals+2])
 
-enum
+enum exit_level_t
 {
 	EXIT_NONE,
 	EXIT_BREAK,
diff --git a/ase/awk/run.h b/ase/awk/run.h
index f696ed96..1faef18e 100644
--- a/ase/awk/run.h
+++ b/ase/awk/run.h
@@ -1,5 +1,5 @@
 /*
- * $Id: run.h,v 1.25 2006-11-18 15:36:57 bacon Exp $
+ * $Id: run.h,v 1.26 2006-11-19 11:55:17 bacon Exp $
  */
 
 #ifndef _ASE_AWK_RUN_H_
@@ -9,19 +9,19 @@
 #error Never include this file directly. Include <ase/awk/awk.h> instead
 #endif
 
-enum
+enum ase_awk_assop_type_t
 {
 	/* if you change this, you have to change __assop_str in tree.c */
-	ASE_AWK_ASSOP_NONE,
-	ASE_AWK_ASSOP_PLUS,
-	ASE_AWK_ASSOP_MINUS,
-	ASE_AWK_ASSOP_MUL,
-	ASE_AWK_ASSOP_DIV,
-	ASE_AWK_ASSOP_MOD,
-	ASE_AWK_ASSOP_EXP
+	ASE_AWK_ASSOP_NONE, 
+	ASE_AWK_ASSOP_PLUS,  /* += */
+	ASE_AWK_ASSOP_MINUS, /* -= */
+	ASE_AWK_ASSOP_MUL,   /* *= */
+	ASE_AWK_ASSOP_DIV,   /* /= */
+	ASE_AWK_ASSOP_MOD,   /* %= */
+	ASE_AWK_ASSOP_EXP    /* **= */
 };
 
-enum 
+enum  ase_awk_binop_type_t
 {
 	/* if you change this, you have to change 
 	 * __binop_str in tree.c and __binop_func in run.c accordingly. */ 
@@ -55,7 +55,7 @@ enum
 	ASE_AWK_BINOP_NM
 };
 
-enum
+enum ase_awk_unrop_type_t
 {
 	/* if you change this, you have to change 
 	 * __unrop_str in tree.c accordingly. */ 
@@ -65,7 +65,7 @@ enum
 	ASE_AWK_UNROP_BNOT
 };
 
-enum
+enum ase_awk_incop_type_t
 {
 	/* if you change this, you have to change 
 	 * __incop_str in tree.c accordingly. */ 
@@ -73,7 +73,7 @@ enum
 	ASE_AWK_INCOP_MINUS
 };
 
-enum
+enum ase_awk_global_id_t
 {
 	/* this table should match __bvtab in parse.c.
 	 * in addition, ase_awk_setglobal also counts 
diff --git a/ase/awk/tree.h b/ase/awk/tree.h
index dfcbe1e8..205142a9 100644
--- a/ase/awk/tree.h
+++ b/ase/awk/tree.h
@@ -1,5 +1,5 @@
 /*
- * $Id: tree.h,v 1.78 2006-10-31 10:13:15 bacon Exp $
+ * $Id: tree.h,v 1.79 2006-11-19 11:55:17 bacon Exp $
  */
 
 #ifndef _ASE_AWK_TREE_H_
@@ -9,7 +9,7 @@
 #error Never include this file directly. Include <ase/awk/awk.h> instead
 #endif
 
-enum
+enum ase_awk_nde_type_t
 {
 	ASE_AWK_NDE_NULL,
 
@@ -65,7 +65,7 @@ enum
 	ASE_AWK_NDE_GETLINE,
 };
 
-enum
+enum ase_awk_in_type_t
 {
 	/* the order of these values match 
 	 * __in_type_map and __in_opt_map in extio.c */
@@ -76,7 +76,7 @@ enum
 	ASE_AWK_IN_CONSOLE
 };
 
-enum
+enum ase_awk_out_type_t
 {
 	/* the order of these values match 
 	 * __out_type_map and __out_opt_map in extio.c */
diff --git a/ase/awk/val.h b/ase/awk/val.h
index 59e80c75..355ddf77 100644
--- a/ase/awk/val.h
+++ b/ase/awk/val.h
@@ -1,5 +1,5 @@
 /*
- * $Id: val.h,v 1.51 2006-11-16 15:16:25 bacon Exp $
+ * $Id: val.h,v 1.52 2006-11-19 11:55:17 bacon Exp $
  */
 
 #ifndef _ASE_AWK_VAL_H_
@@ -9,7 +9,7 @@
 #error Never include this file directly. Include <ase/awk/awk.h> instead
 #endif
 
-enum
+enum ase_awk_val_type_t
 {
 	/* the values between ASE_AWK_VAL_NIL and ASE_AWK_VAL_STR inclusive
 	 * must be synchronized with an internal table of the __cmp_val 
@@ -24,7 +24,7 @@ enum
 	ASE_AWK_VAL_REF  = 6
 };
 
-enum
+enum ase_awk_val_ref_id_t
 {
 	/* keep these items in the same order as corresponding items
 	 * in tree.h */
@@ -39,7 +39,7 @@ enum
 	ASE_AWK_VAL_REF_POS
 };
 
-enum
+enum ase_awk_valtostr_opt_t
 {
 	ASE_AWK_VALTOSTR_CLEAR = (1 << 0),
 	ASE_AWK_VALTOSTR_PRINT = (1 << 1)