diff -ur php-7.1.1.orig/scripts/Makefile.frag php-7.1.1/scripts/Makefile.frag
--- php-7.1.1.orig/scripts/Makefile.frag	2017-01-17 20:44:42.000000000 +0000
+++ php-7.1.1/scripts/Makefile.frag	2017-02-08 14:41:37.810333971 +0000
@@ -3,8 +3,8 @@
 # Build environment install
 #
 
-phpincludedir = $(includedir)/php
-phpbuilddir = $(libdir)/build
+phpincludedir = $(includedir)/php/php$(program_suffix)
+phpbuilddir = $(libdir)/php/php$(program_suffix)/build
 
 BUILD_FILES = \
 	scripts/phpize.m4 \
diff -ur php-7.1.1.orig/scripts/php-config.in php-7.1.1/scripts/php-config.in
--- php-7.1.1.orig/scripts/php-config.in	2017-01-17 20:44:42.000000000 +0000
+++ php-7.1.1/scripts/php-config.in	2017-02-08 14:41:37.810333971 +0000
@@ -6,7 +6,7 @@
 exec_prefix="@exec_prefix@"
 version="@PHP_VERSION@"
 vernum="@PHP_VERSION_ID@"
-include_dir="@includedir@/php"
+include_dir="@includedir@/php/php@program_suffix@"
 includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
 ldflags="@PHP_LDFLAGS@"
 libs="@EXTRA_LIBS@"
diff -ur php-7.1.1.orig/scripts/phpize.in php-7.1.1/scripts/phpize.in
--- php-7.1.1.orig/scripts/phpize.in	2017-01-17 20:44:42.000000000 +0000
+++ php-7.1.1/scripts/phpize.in	2017-02-08 14:41:37.810333971 +0000
@@ -4,8 +4,8 @@
 prefix='@prefix@'
 datarootdir='@datarootdir@'
 exec_prefix="`eval echo @exec_prefix@`"
-phpdir="`eval echo @libdir@`/build"
-includedir="`eval echo @includedir@`/php"
+phpdir="`eval echo @libdir@`/php/php@program_suffix@/build"
+includedir="`eval echo @includedir@`/php/php@program_suffix@"
 builddir="`pwd`"
 SED="@SED@"