--- pam_bioapi-0.2.1/configure.bioapi	2006-06-24 15:58:30.000000000 +0900
+++ pam_bioapi-0.2.1/configure	2006-06-24 15:59:38.000000000 +0900
@@ -19887,7 +19887,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <bioapi.h>
+#include <bioapi/bioapi.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -19930,7 +19930,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <bioapi.h>
+#include <bioapi/bioapi.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -20032,7 +20032,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <bioapi_util.h>
+#include <bioapi/bioapi_util.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -20075,7 +20075,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <bioapi_util.h>
+#include <bioapi/bioapi_util.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -20171,9 +20171,9 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <bioapi_type.h>
+#include <bioapi/bioapi_type.h>
 
-#include <bioapi_uuid.h>
+#include <bioapi/bioapi_uuid.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--- pam_bioapi-0.2.1/configure.ac.bioapi	2006-06-24 16:00:00.000000000 +0900
+++ pam_bioapi-0.2.1/configure.ac	2006-06-24 16:01:03.000000000 +0900
@@ -33,11 +33,11 @@
 
 AC_DEFINE(UNIX)
 
-AC_CHECK_HEADER([bioapi.h], ,AC_MSG_ERROR([cannot find required header: bioapi.h]))
-AC_CHECK_HEADER([bioapi_util.h], ,AC_MSG_ERROR([cannot find required header: bioapi_util.h]))
+AC_CHECK_HEADER([bioapi/bioapi.h], ,AC_MSG_ERROR([cannot find required header: bioapi/bioapi.h]))
+AC_CHECK_HEADER([bioapi/bioapi_util.h], ,AC_MSG_ERROR([cannot find required header: bioapi/bioapi_util.h]))
 
-#The "#include" is a workaround until bioapi_uuid.h is fixed
-AC_CHECK_HEADER([bioapi_uuid.h], ,AC_MSG_ERROR([cannot find required header: bioapi_uuid.h]),[#include <bioapi_type.h>])
+#The "include" is a workaround until bioapi_uuid.h is fixed
+AC_CHECK_HEADER([bioapi/bioapi_uuid.h], ,AC_MSG_ERROR([cannot find required header: bioapi/bioapi_uuid.h]),[#include <bioapi/bioapi_type.h>])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
--- pam_bioapi-0.2.1/libpam_bioapi/pam_bioapi.c.bioapi	2006-06-24 15:57:48.000000000 +0900
+++ pam_bioapi-0.2.1/libpam_bioapi/pam_bioapi.c	2006-06-24 15:58:12.000000000 +0900
@@ -24,9 +24,9 @@
 #define PAM_SM_PASSWORD /* we provide "password" setting functions, in our case enrollment of the biometric */
 #include <security/_pam_macros.h>
 #include <security/pam_modules.h>
-#include <bioapi.h>
-#include <bioapi_util.h>
-#include <bioapi_uuid.h>
+#include <bioapi/bioapi.h>
+#include <bioapi/bioapi_util.h>
+#include <bioapi/bioapi_uuid.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>