Remove the extra INCLUDES line from most automake Mafiles. This is not

configure.in

@@ -154,7 +154,7 @@ if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
        LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
 fi
 
-INCLUDES="-I\$(top_builddir)/libzend -I\$(top_builddir)/TSRM"
+INCLUDES="-I\$(top_builddir)/libzend -I\$(top_srcdir) -I\$(top_srcdir)/libzend"
 AC_SUBST(INCLUDES)
 
 AC_CHECK_LIB(nsl, gethostname, [
@@ -641,6 +641,8 @@ AC_ARG_ENABLE(thread-safety,
     TSRM_LIB='TSRM/libtsrm.la'
     TSRM_DIR=TSRM
     AC_DEFINE(ZTS)
+    INCLUDES="$INCLUDES -I$\(top_builddir)/TSRM"
+    CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)

ext/apache/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_apache.la
 libphpext_apache_la_SOURCES=apache.c
 

ext/aspell/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_aspell.la
 libphpext_aspell_la_SOURCES=aspell.c
 

ext/bcmath/Makefile.am

@@ -1,5 +1,4 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_bcmath.la
 libphpext_bcmath_la_SOURCES=bcmath.c number.c

ext/dav/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_dav.la
 libphpext_dav_la_SOURCES=dav.c
 

ext/db/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_db.la
 libphpext_db_la_SOURCES=db.c
 

ext/dba/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_dba.la
 libphpext_dba_la_SOURCES=dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c \
 		dba_ndbm.c

ext/dbase/Makefile.am

@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in -*- makefile -*-
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_dbase.la
 libphpext_dbase_la_SOURCES=dbf_head.c dbf_rec.c dbf_misc.c dbf_ndx.c dbase.c
 

ext/fdf/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_fdf.la
 libphpext_fdf_la_SOURCES=fdf.c
 

ext/filepro/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_filepro.la
 libphpext_filepro_la_SOURCES=filepro.c
 

ext/ftp/Makefile.am

@@ -1,5 +1,4 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_ftp.la
 libphpext_ftp_la_SOURCES=php_ftp.c ftp.c

ext/gd/Makefile.am

@@ -1,7 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
 SRC=gd.c gdcache.c gdttf.c
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=@GD_STATIC@
 EXTRA_LTLIBRARIES=libphpext_gd.la gd.la
 libphpext_gd_la_SOURCES=$(SRC)

ext/gettext/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_gettext.la
 libphpext_gettext_la_SOURCES=gettext.c
 

ext/hyperwave/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_hyperwave.la
 libphpext_hyperwave_la_SOURCES=hw.c hg_comm.c
 

ext/icap/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_icap.la
 libphpext_icap_la_SOURCES=php3_icap.c
 

ext/imap/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_imap.la
 libphpext_imap_la_SOURCES=imap.c
 

ext/informix/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_informix.la
 noinst_LIBRARIES=libifx.a
 libifx_a_SOURCES=stub.c

ext/interbase/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_interbase.la
 libphpext_interbase_la_SOURCES=interbase.c
 

ext/ldap/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_ldap.la
 libphpext_ldap_la_SOURCES=ldap.c
 

ext/mcal/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_mcal.la
 libphpext_mcal_la_SOURCES=php3_mcal.c
 

ext/mcrypt/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_mcrypt.la
 libphpext_mcrypt_la_SOURCES=mcrypt.c
 

ext/mhash/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_mhash.la
 libphpext_mhash_la_SOURCES=mhash.c
 

ext/msql/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_msql.la
 libphpext_msql_la_SOURCES=php_msql.c
 

ext/oci8/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_oci8.la
 libphpext_oci8_la_SOURCES=oci8.c
 

ext/odbc/Makefile.am

@@ -1,4 +1,3 @@
 ## Process this file with automake to produce Makefile.in
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_odbc.la
 libphpext_odbc_la_SOURCES=php_odbc.c velocis.c

ext/oracle/Makefile.am

@@ -1,5 +1,4 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_oracle.la
 libphpext_oracle_la_SOURCES=oracle.c

ext/pcre/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_pcre.la
 libphpext_pcre_la_SOURCES=php_pcre.c
 libphpext_pcre_la_LIBADD = @PCRE_LIBADD@

ext/pdf/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_pdf.la
 libphpext_pdf_la_SOURCES=pdf.c
 

ext/readline/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_readline.la
 libphpext_readline_la_SOURCES=readline.c
 

ext/session/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_session.la
 libphpext_session_la_SOURCES=session.c mod_files.c mod_mm.c mod_user.c
 

ext/standard/Makefile.am

@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_standard.la
 libphpext_standard_la_SOURCES=\
 	base64.c basic_functions.c browscap.c crypt.c cyr_convert.c datetime.c \

ext/sybase/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_sybase.la
 libphpext_sybase_la_SOURCES=sybase.c
 

ext/sybase_ct/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_sybase_ct.la
 libphpext_sybase_ct_la_SOURCES=php_sybase_ct.c
 

ext/sysvsem/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_sysvsem.la
 libphpext_sysvsem_la_SOURCES=sysvsem.c
 

ext/sysvshm/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_sysvshm.la
 libphpext_sysvshm_la_SOURCES=sysvshm.c
 

ext/wddx/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_wddx.la
 libphpext_wddx_la_SOURCES=wddx.c
 

ext/yp/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_yp.la
 libphpext_yp_la_SOURCES=yp.c
 

ext/zlib/Makefile.am

@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_zlib.la
 libphpext_zlib_la_SOURCES=zlib.c
 

sapi/aolserver/Makefile.am

@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpsapi_aolserver.la
 libphpsapi_aolserver_la_SOURCES=aolserver.c

sapi/cgi/Makefile.am

@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpsapi_cgi.la
 libphpsapi_cgi_la_SOURCES=cgi_main.c

sapi/isapi/Makefile.am

@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LIBRARIES=libphpsapi_isapi.a
 libphpsapi_isapi_a_SOURCES=php4isapi.c