*** ./lib/driver/utf8.c.ORIG	Mon May  2 10:50:35 2011
--- ./lib/driver/utf8.c	Mon May  2 11:00:22 2011
***************
*** 31,37 ****
  #include <stdlib.h>
  #endif
  
! #ifdef HAVE_ICONV
  # include <iconv.h>
  #endif
  
--- 31,37 ----
  #include <stdlib.h>
  #endif
  
! #if defined(HAVE_ICONV) || defined(_AIX)
  # include <iconv.h>
  #endif
  
*** ./include/cdio/types.h.ORIG	Sat Nov 29 05:52:43 2008
--- ./include/cdio/types.h	Mon May  2 12:58:39 2011
***************
*** 108,114 ****
  #endif
    
  #ifndef __cplusplus
! # if defined(HAVE_STDBOOL_H)
  #  include <stdbool.h>
  # else
     /* ISO/IEC 9899:1999 <stdbool.h> missing -- enabling workaround */
--- 108,114 ----
  #endif
    
  #ifndef __cplusplus
! # if defined(_AIX52)
  #  include <stdbool.h>
  # else
     /* ISO/IEC 9899:1999 <stdbool.h> missing -- enabling workaround */