diff --git a/ase/lib/awk/Awk.hpp b/ase/inc/ase/awk/Awk.hpp
similarity index 99%
rename from ase/lib/awk/Awk.hpp
rename to ase/inc/ase/awk/Awk.hpp
index 96f15331..a52e794c 100644
--- a/ase/lib/awk/Awk.hpp
+++ b/ase/inc/ase/awk/Awk.hpp
@@ -1,5 +1,5 @@
 /*
- * $Id: Awk.hpp 129 2008-03-13 05:45:36Z baconevi $
+ * $Id: Awk.hpp 183 2008-06-03 08:18:55Z baconevi $
  *
  * {License}
  */
diff --git a/ase/lib/awk/StdAwk.hpp b/ase/inc/ase/awk/StdAwk.hpp
similarity index 98%
rename from ase/lib/awk/StdAwk.hpp
rename to ase/inc/ase/awk/StdAwk.hpp
index 65f03107..cf42ee4c 100644
--- a/ase/lib/awk/StdAwk.hpp
+++ b/ase/inc/ase/awk/StdAwk.hpp
@@ -1,5 +1,5 @@
 /*
- * $Id: StdAwk.hpp 115 2008-03-03 11:13:15Z baconevi $
+ * $Id: StdAwk.hpp 183 2008-06-03 08:18:55Z baconevi $
  *
  * {License}
  */
diff --git a/ase/lib/awk/awk.h b/ase/inc/ase/awk/awk.h
similarity index 99%
rename from ase/lib/awk/awk.h
rename to ase/inc/ase/awk/awk.h
index 35cb1d44..ad42ec83 100644
--- a/ase/lib/awk/awk.h
+++ b/ase/inc/ase/awk/awk.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: awk.h 115 2008-03-03 11:13:15Z baconevi $
+ * $Id: awk.h 183 2008-06-03 08:18:55Z baconevi $
  *
  * {License}
  */
diff --git a/ase/lib/awk/val.h b/ase/inc/ase/awk/val.h
similarity index 99%
rename from ase/lib/awk/val.h
rename to ase/inc/ase/awk/val.h
index 83afd4d7..c2a7878c 100644
--- a/ase/lib/awk/val.h
+++ b/ase/inc/ase/awk/val.h
@@ -1,5 +1,5 @@
 /*
- * $Id: val.h 155 2008-03-22 06:47:27Z baconevi $
+ * $Id: val.h 183 2008-06-03 08:18:55Z baconevi $
  *
  * {License}
  */
diff --git a/ase/lib/awk/awk.c b/ase/lib/awk/awk.c
index 5affc46c..32944838 100644
--- a/ase/lib/awk/awk.c
+++ b/ase/lib/awk/awk.c
@@ -1,5 +1,5 @@
 /*
- * $Id: awk.c 115 2008-03-03 11:13:15Z baconevi $ 
+ * $Id: awk.c 192 2008-06-06 10:33:44Z baconevi $ 
  *
  * {License}
  */
@@ -9,7 +9,7 @@
 #define Library
 #endif
 
-#include <ase/awk/awk_i.h>
+#include "awk_i.h"
 
 static void free_word (void* awk, void* ptr);
 static void free_afn (void* awk, void* afn);
diff --git a/ase/lib/awk/awk_i.h b/ase/lib/awk/awk_i.h
index 93d82c8f..670d8854 100644
--- a/ase/lib/awk/awk_i.h
+++ b/ase/lib/awk/awk_i.h
@@ -1,5 +1,5 @@
 /*
- * $Id: awk_i.h 115 2008-03-03 11:13:15Z baconevi $
+ * $Id: awk_i.h 192 2008-06-06 10:33:44Z baconevi $
  *
  * {License}
  */
@@ -16,14 +16,14 @@ typedef struct ase_awk_chain_t ase_awk_chain_t;
 typedef struct ase_awk_tree_t ase_awk_tree_t;
 
 #include <ase/awk/awk.h>
-#include <ase/awk/tree.h>
 #include <ase/awk/val.h>
-#include <ase/awk/func.h>
-#include <ase/awk/tab.h>
-#include <ase/awk/parse.h>
-#include <ase/awk/run.h>
-#include <ase/awk/extio.h>
-#include <ase/awk/misc.h>
+#include "tree.h"
+#include "func.h"
+#include "tab.h"
+#include "parse.h"
+#include "run.h"
+#include "extio.h"
+#include "misc.h"
 
 #ifdef _MSC_VER
 #pragma warning (disable: 4996)
diff --git a/ase/lib/awk/err.c b/ase/lib/awk/err.c
index eecb57b1..75db40e8 100644
--- a/ase/lib/awk/err.c
+++ b/ase/lib/awk/err.c
@@ -1,10 +1,10 @@
 /*
- * $Id: err.c 115 2008-03-03 11:13:15Z baconevi $
+ * $Id: err.c 192 2008-06-06 10:33:44Z baconevi $
  *
  * {License}
  */
 
-#include <ase/awk/awk_i.h>
+#include "awk_i.h"
 
 static const ase_char_t* __geterrstr (int errnum)
 {
diff --git a/ase/lib/awk/extio.c b/ase/lib/awk/extio.c
index 1e09fdb4..022a40f9 100644
--- a/ase/lib/awk/extio.c
+++ b/ase/lib/awk/extio.c
@@ -1,10 +1,10 @@
 /*
- * $Id: extio.c 115 2008-03-03 11:13:15Z baconevi $
+ * $Id: extio.c 192 2008-06-06 10:33:44Z baconevi $
  *
  * {License}
  */
 
-#include <ase/awk/awk_i.h>
+#include "awk_i.h"
 
 enum
 {
diff --git a/ase/lib/awk/func.c b/ase/lib/awk/func.c
index f7d42ec2..21e5a888 100644
--- a/ase/lib/awk/func.c
+++ b/ase/lib/awk/func.c
@@ -1,10 +1,10 @@
 /*
- * $Id: func.c 115 2008-03-03 11:13:15Z baconevi $
+ * $Id: func.c 192 2008-06-06 10:33:44Z baconevi $
  *
  * {License}
  */
 
-#include <ase/awk/awk_i.h>
+#include "awk_i.h"
 
 static int bfn_close   (ase_awk_run_t*, const ase_char_t*, ase_size_t);
 static int bfn_fflush  (ase_awk_run_t*, const ase_char_t*, ase_size_t);
diff --git a/ase/lib/awk/makefile.in b/ase/lib/awk/makefile.in
index 5ca22713..cfffcccf 100644
--- a/ase/lib/awk/makefile.in
+++ b/ase/lib/awk/makefile.in
@@ -4,7 +4,7 @@
 
 NAME = aseawk
 
-TOP_BUILDDIR = @abs_top_builddir@
+TOP_DIR = @abs_top_builddir@
 TOP_INSTALLDIR = @prefix@/ase
 
 CC = @CC@
@@ -12,14 +12,14 @@ CXX = @CXX@
 AR = @AR@
 RANLIB = @RANLIB@
 
-CFLAGS = @CFLAGS@ -I@abs_top_builddir@/..
-CXXFLAGS = @CXXFLAGS@ -I@abs_top_builddir@/..
+CFLAGS = @CFLAGS@ -I$(TOP_DIR)/inc
+CXXFLAGS = @CXXFLAGS@ -I$(TOP_DIR)/inc
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 MODE = @BUILDMODE@
 
 CJ = @CJ@
-CJFLAGS = @CJFLAGS@ --classpath=@abs_top_builddir@/.. -fjni 
+CJFLAGS = @CJFLAGS@ --classpath=$(TOP_DIR)/.. -fjni 
 BUILD_CJ = @BUILD_CJ@
 
 JAVAC = @JAVAC@
@@ -27,10 +27,10 @@ JAR = @JAR@
 CFLAGS_JNI = @CFLAGS_JNI@
 BUILD_JNI = @BUILD_JNI@
 
-LIBTOOL_COMPILE = ../libtool --mode=compile
-LIBTOOL_LINK = ../libtool --mode=link 
+LIBTOOL_COMPILE = $(TOP_DIR)/libtool --mode=compile
+LIBTOOL_LINK = $(TOP_DIR)/libtool --mode=link 
 
-OUT_DIR = ../$(MODE)/lib
+OUT_DIR = $(TOP_DIR)/out/$(MODE)/lib
 OUT_FILE_LIB = $(OUT_DIR)/lib$(NAME).a
 OUT_FILE_JNI = $(OUT_DIR)/lib$(NAME)_jni.la
 OUT_FILE_LIB_CXX = $(OUT_DIR)/lib$(NAME)++.a
@@ -188,10 +188,10 @@ $(TMP_DIR)/ase/awk/Argument.class: Argument.java
 $(TMP_DIR)/ase/awk/Clearable.class: Clearable.java
 	$(JAVAC) -classpath ../.. -d $(TMP_DIR) Clearable.java
 
-$(TMP_DIR)/cxx/Awk.o: Awk.cpp Awk.hpp
+$(TMP_DIR)/cxx/Awk.o: Awk.cpp
 	$(CXX) $(CXXFLAGS) -o $@ -c Awk.cpp
 
-$(TMP_DIR)/cxx/StdAwk.o: StdAwk.cpp StdAwk.hpp Awk.hpp
+$(TMP_DIR)/cxx/StdAwk.o: StdAwk.cpp
 	$(CXX) $(CXXFLAGS) -o $@ -c StdAwk.cpp
 
 $(TMP_DIR)/cj/Awk.o: Awk.java
diff --git a/ase/lib/awk/misc.c b/ase/lib/awk/misc.c
index 3f2b2164..4bab3561 100644
--- a/ase/lib/awk/misc.c
+++ b/ase/lib/awk/misc.c
@@ -1,10 +1,10 @@
 /*
- * $Id: misc.c 115 2008-03-03 11:13:15Z baconevi $
+ * $Id: misc.c 192 2008-06-06 10:33:44Z baconevi $
  *
  * {License}
  */
 
-#include <ase/awk/awk_i.h>
+#include "awk_i.h"
 
 void* ase_awk_malloc (ase_awk_t* awk, ase_size_t size)
 {
diff --git a/ase/lib/awk/parse.c b/ase/lib/awk/parse.c
index a6599fd8..f58148b0 100644
--- a/ase/lib/awk/parse.c
+++ b/ase/lib/awk/parse.c
@@ -1,10 +1,10 @@
 /*
- * $Id: parse.c 115 2008-03-03 11:13:15Z baconevi $
+ * $Id: parse.c 192 2008-06-06 10:33:44Z baconevi $
  *
  * {License}
  */
 
-#include <ase/awk/awk_i.h>
+#include "awk_i.h"
 
 enum
 {
diff --git a/ase/lib/awk/rec.c b/ase/lib/awk/rec.c
index 2b4b5e75..4abb0b65 100644
--- a/ase/lib/awk/rec.c
+++ b/ase/lib/awk/rec.c
@@ -1,10 +1,10 @@
 /*
- * $Id: rec.c 115 2008-03-03 11:13:15Z baconevi $
+ * $Id: rec.c 192 2008-06-06 10:33:44Z baconevi $
  *
  * {License}
  */
 
-#include <ase/awk/awk_i.h>
+#include "awk_i.h"
 
 static int split_record (ase_awk_run_t* run);
 static int recomp_record_fields (
diff --git a/ase/lib/awk/run.c b/ase/lib/awk/run.c
index f90f3e2d..4b7c4d0a 100644
--- a/ase/lib/awk/run.c
+++ b/ase/lib/awk/run.c
@@ -1,10 +1,10 @@
 /*
- * $Id: run.c 155 2008-03-22 06:47:27Z baconevi $
+ * $Id: run.c 192 2008-06-06 10:33:44Z baconevi $
  *
  * {License}
  */
 
-#include <ase/awk/awk_i.h>
+#include "awk_i.h"
 
 #ifdef DEBUG_RUN
 #include <ase/utl/stdio.h>
diff --git a/ase/lib/awk/tab.c b/ase/lib/awk/tab.c
index b613292f..251bf2d1 100644
--- a/ase/lib/awk/tab.c
+++ b/ase/lib/awk/tab.c
@@ -1,10 +1,10 @@
 /*
- * $Id: tab.c 115 2008-03-03 11:13:15Z baconevi $
+ * $Id: tab.c 192 2008-06-06 10:33:44Z baconevi $
  *
  * {License}
  */
 
-#include <ase/awk/awk_i.h>
+#include "awk_i.h"
 
 ase_awk_tab_t* ase_awk_tab_open (ase_awk_tab_t* tab, ase_awk_t* awk)
 {
diff --git a/ase/lib/awk/tree.c b/ase/lib/awk/tree.c
index 3e392408..526c5b37 100644
--- a/ase/lib/awk/tree.c
+++ b/ase/lib/awk/tree.c
@@ -1,10 +1,10 @@
 /*
- * $Id: tree.c 115 2008-03-03 11:13:15Z baconevi $
+ * $Id: tree.c 192 2008-06-06 10:33:44Z baconevi $
  *
  * {License}
  */
 
-#include <ase/awk/awk_i.h>
+#include "awk_i.h"
 
 static const ase_char_t* assop_str[] =
 {
diff --git a/ase/lib/awk/val.c b/ase/lib/awk/val.c
index 1ec50992..d3709700 100644
--- a/ase/lib/awk/val.c
+++ b/ase/lib/awk/val.c
@@ -1,10 +1,10 @@
 /*
- * $Id: val.c 156 2008-03-22 12:09:35Z baconevi $
+ * $Id: val.c 192 2008-06-06 10:33:44Z baconevi $
  *
  * {License}
  */
 
-#include <ase/awk/awk_i.h>
+#include "awk_i.h"
 
 #ifdef DEBUG_VAL
 #include <ase/utl/stdio.h>