diff --git a/ase/configure b/ase/configure
index ff649175..336f8ebd 100755
--- a/ase/configure
+++ b/ase/configure
@@ -1902,7 +1902,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-ac_config_headers="$ac_config_headers cmn/conf_unx.h"
+ac_config_headers="$ac_config_headers inc/ase/cmn/conf_unx.h"
 
 ac_aux_dir=
 for ac_dir in config "$srcdir"/config; do
@@ -27185,7 +27185,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "cmn/conf_unx.h") CONFIG_HEADERS="$CONFIG_HEADERS cmn/conf_unx.h" ;;
+    "inc/ase/cmn/conf_unx.h") CONFIG_HEADERS="$CONFIG_HEADERS inc/ase/cmn/conf_unx.h" ;;
     "makefile") CONFIG_FILES="$CONFIG_FILES makefile" ;;
     "lib/cmn/makefile") CONFIG_FILES="$CONFIG_FILES lib/cmn/makefile" ;;
     "lib/awk/makefile") CONFIG_FILES="$CONFIG_FILES lib/awk/makefile" ;;
diff --git a/ase/configure.ac b/ase/configure.ac
index 96464e9f..c18e632c 100644
--- a/ase/configure.ac
+++ b/ase/configure.ac
@@ -5,7 +5,7 @@
 AC_PREREQ(2.53)
 AC_INIT([ase], [deb-0.1.0])
 AC_REVISION([$Revision: 1.5 $])
-AC_CONFIG_HEADER([cmn/conf_unx.h])
+AC_CONFIG_HEADER([inc/ase/cmn/conf_unx.h])
 AC_CONFIG_AUX_DIR(config)
 
 # Checks for programs.
diff --git a/ase/lib/cmn/makefile.in b/ase/lib/cmn/makefile.in
index 2c09472d..b7ecbcbd 100644
--- a/ase/lib/cmn/makefile.in
+++ b/ase/lib/cmn/makefile.in
@@ -4,16 +4,18 @@
 
 NAME = asecmn
 
+TOP_DIR = @abs_top_builddir@
+
 CC = @CC@
 AR = @AR@
 MAKE = @MAKE@
 RANLIB = @RANLIB@
-CFLAGS = @CFLAGS@ -I@abs_top_builddir@/..
+CFLAGS = @CFLAGS@ -I$(TOP_DIR)/inc
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 MODE = @BUILDMODE@
 
-OUT_DIR = ../$(MODE)/lib
+OUT_DIR = $(TOP_DIR)/out/$(MODE)/lib
 OUT_FILE = $(OUT_DIR)/lib$(NAME).a
 
 TMP_DIR = $(MODE)