diff --git a/ase/doc/en/ase-assert.man b/ase/doc/en/ase-assert.man
index f5de7af8..1e54f916 100644
--- a/ase/doc/en/ase-assert.man
+++ b/ase/doc/en/ase-assert.man
@@ -11,5 +11,5 @@ These macros requires linking with libaseutl.a unless you define ase_assert_puts
 
 You may define your own output function for assertion output.
 
-Include: ase/cor/macros.h
+Include: ase/cmn/macros.h
 Link: libaseutl.a
diff --git a/ase/lib/cmn/conf_msw.h b/ase/inc/ase/cmn/conf_msw.h
similarity index 95%
rename from ase/lib/cmn/conf_msw.h
rename to ase/inc/ase/cmn/conf_msw.h
index 39ad5302..aa655fe3 100644
--- a/ase/lib/cmn/conf_msw.h
+++ b/ase/inc/ase/cmn/conf_msw.h
@@ -1,5 +1,5 @@
 /*
- * $Id: conf_msw.h 116 2008-03-03 11:15:37Z baconevi $
+ * $Id: conf_msw.h 182 2008-06-03 08:17:42Z baconevi $
  *
  * {License}
  */
diff --git a/ase/lib/cmn/conf_unx.h.in b/ase/inc/ase/cmn/conf_unx.h.in
similarity index 100%
rename from ase/lib/cmn/conf_unx.h.in
rename to ase/inc/ase/cmn/conf_unx.h.in
diff --git a/ase/lib/cmn/conf_vms.h b/ase/inc/ase/cmn/conf_vms.h
similarity index 97%
rename from ase/lib/cmn/conf_vms.h
rename to ase/inc/ase/cmn/conf_vms.h
index 42803adf..be1bd050 100644
--- a/ase/lib/cmn/conf_vms.h
+++ b/ase/inc/ase/cmn/conf_vms.h
@@ -1,5 +1,5 @@
 /*
- * $Id: conf_vms.h 116 2008-03-03 11:15:37Z baconevi $
+ * $Id: conf_vms.h 182 2008-06-03 08:17:42Z baconevi $
  *
  * {License}
  */
diff --git a/ase/lib/cmn/macros.h b/ase/inc/ase/cmn/macros.h
similarity index 100%
rename from ase/lib/cmn/macros.h
rename to ase/inc/ase/cmn/macros.h
diff --git a/ase/lib/cmn/map.h b/ase/inc/ase/cmn/map.h
similarity index 98%
rename from ase/lib/cmn/map.h
rename to ase/inc/ase/cmn/map.h
index e1aa1f9f..2cd50c53 100644
--- a/ase/lib/cmn/map.h
+++ b/ase/inc/ase/cmn/map.h
@@ -1,5 +1,5 @@
 /*
- * $Id: map.h 158 2008-03-22 13:19:33Z baconevi $
+ * $Id: map.h 182 2008-06-03 08:17:42Z baconevi $
  *
  * {License}
  */
diff --git a/ase/lib/cmn/mem.h b/ase/inc/ase/cmn/mem.h
similarity index 93%
rename from ase/lib/cmn/mem.h
rename to ase/inc/ase/cmn/mem.h
index b2cbebcd..702a9776 100644
--- a/ase/lib/cmn/mem.h
+++ b/ase/inc/ase/cmn/mem.h
@@ -1,5 +1,5 @@
 /*
- * $Id: mem.h 177 2008-04-26 04:58:10Z baconevi $
+ * $Id: mem.h 182 2008-06-03 08:17:42Z baconevi $
  *
  * {License}
  */
diff --git a/ase/lib/cmn/pack.h b/ase/inc/ase/cmn/pack.h
similarity index 84%
rename from ase/lib/cmn/pack.h
rename to ase/inc/ase/cmn/pack.h
index a1521bca..ba8d9251 100644
--- a/ase/lib/cmn/pack.h
+++ b/ase/inc/ase/cmn/pack.h
@@ -1,5 +1,5 @@
 /*
- * $Id: pack.h 116 2008-03-03 11:15:37Z baconevi $
+ * $Id: pack.h 182 2008-06-03 08:17:42Z baconevi $
  *
  * {License}
  */
diff --git a/ase/lib/cmn/rex.h b/ase/inc/ase/cmn/rex.h
similarity index 98%
rename from ase/lib/cmn/rex.h
rename to ase/inc/ase/cmn/rex.h
index 45f02c05..767de1af 100644
--- a/ase/lib/cmn/rex.h
+++ b/ase/inc/ase/cmn/rex.h
@@ -1,5 +1,5 @@
 /*
- * $Id: rex.h 116 2008-03-03 11:15:37Z baconevi $
+ * $Id: rex.h 182 2008-06-03 08:17:42Z baconevi $
  *
  * {License}
  */
diff --git a/ase/lib/cmn/str.h b/ase/inc/ase/cmn/str.h
similarity index 99%
rename from ase/lib/cmn/str.h
rename to ase/inc/ase/cmn/str.h
index 0ff4f4e1..31d4955c 100644
--- a/ase/lib/cmn/str.h
+++ b/ase/inc/ase/cmn/str.h
@@ -1,5 +1,5 @@
 /*
- * $Id: str.h 159 2008-04-01 08:37:30Z baconevi $
+ * $Id: str.h 182 2008-06-03 08:17:42Z baconevi $
  *
  * {License}
  */
diff --git a/ase/lib/cmn/types.h b/ase/inc/ase/cmn/types.h
similarity index 99%
rename from ase/lib/cmn/types.h
rename to ase/inc/ase/cmn/types.h
index a03175d1..1e0121d6 100644
--- a/ase/lib/cmn/types.h
+++ b/ase/inc/ase/cmn/types.h
@@ -1,5 +1,5 @@
 /*
- * $Id: types.h 155 2008-03-22 06:47:27Z baconevi $
+ * $Id: types.h 182 2008-06-03 08:17:42Z baconevi $
  *
  * {License}
  */
diff --git a/ase/lib/cmn/unpack.h b/ase/inc/ase/cmn/unpack.h
similarity index 82%
rename from ase/lib/cmn/unpack.h
rename to ase/inc/ase/cmn/unpack.h
index b6a851df..5a120cd3 100644
--- a/ase/lib/cmn/unpack.h
+++ b/ase/inc/ase/cmn/unpack.h
@@ -1,5 +1,5 @@
 /*
- * $Id: unpack.h 116 2008-03-03 11:15:37Z baconevi $
+ * $Id: unpack.h 182 2008-06-03 08:17:42Z baconevi $
  *
  * {License}
  */