Index: builds/unix/freetype-config.in
--- builds/unix/freetype-config.in.orig	2022-01-27 08:43:19.000000000 +0100
+++ builds/unix/freetype-config.in	2022-05-01 22:28:50.585615000 +0200
@@ -43,7 +43,7 @@
 
   version=%ft_version%
 
-  cflags="-I${SYSROOT}$includedir/freetype2"
+  cflags="-I${SYSROOT}$includedir/freetype"
   dynamic_libs="-lfreetype"
   static_libs="%LIBSSTATIC_CONFIG%"
   if test "${SYSROOT}$libdir" != "/usr/lib"   &&
@@ -179,20 +179,20 @@
 fi
 
 if test "$echo_ft_version" = "yes" ; then
-  major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+  major=`grep define ${SYSROOT}$includedir/freetype/freetype.h \
          | grep FREETYPE_MAJOR \
          | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
-  minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+  minor=`grep define ${SYSROOT}$includedir/freetype/freetype.h \
          | grep FREETYPE_MINOR \
          | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
-  patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+  patch=`grep define ${SYSROOT}$includedir/freetype/freetype.h \
          | grep FREETYPE_PATCH \
          | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
   echo $major.$minor.$patch
 fi
 
 if test "$echo_cflags" = "yes" ; then
-  echo $cflags | sed "s|$orig_includedir/freetype2|$includedir/freetype2|"
+  echo $cflags | sed "s|$orig_includedir|$includedir|"
 fi
 
 if test "$echo_libs" = "yes" ; then
Index: builds/unix/freetype2.in
--- builds/unix/freetype2.in.orig	2022-05-01 22:28:50.585761000 +0200
+++ builds/unix/freetype2.in	2022-05-01 22:29:40.931824000 +0200
@@ -11,4 +11,4 @@
 Requires.private: %PKGCONFIG_REQUIRES_PRIVATE%
 Libs: %PKGCONFIG_LIBS%
 Libs.private: %PKGCONFIG_LIBS_PRIVATE%
-Cflags: -I${includedir}/freetype2
+Cflags: -I${includedir}/freetype
Index: builds/unix/install.mk
--- builds/unix/install.mk.orig	2022-01-27 08:43:19.000000000 +0100
+++ builds/unix/install.mk	2022-05-01 22:28:50.585950000 +0200
@@ -34,11 +34,11 @@
 # configured version overwrites the generic one.
 #
 install: $(PROJECT_LIBRARY)
-	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2
+	-$(DELDIR) $(DESTDIR)$(includedir)/freetype
 	-$(DELETE) $(DESTDIR)$(includedir)/ft2build.h
 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)                               \
                          $(DESTDIR)$(libdir)/pkgconfig                     \
-                         $(DESTDIR)$(includedir)/freetype2/freetype/config \
+                         $(DESTDIR)$(includedir)/freetype/config \
                          $(DESTDIR)$(datadir)/aclocal
 ifeq ($(INSTALL_FT2_CONFIG),TRUE)
 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)                               \
@@ -48,20 +48,20 @@
                                   $(PROJECT_LIBRARY) $(DESTDIR)$(libdir)
 	-for P in $(PUBLIC_H) ; do                           \
           $(INSTALL_DATA)                                    \
-            $$P $(DESTDIR)$(includedir)/freetype2/freetype ; \
+            $$P $(DESTDIR)$(includedir)/freetype ; \
         done
 	-for P in $(CONFIG_H) ; do                                  \
           $(INSTALL_DATA)                                           \
-            $$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \
+            $$P $(DESTDIR)$(includedir)/freetype/config ; \
         done
 	$(INSTALL_DATA) $(TOP_DIR)/include/ft2build.h                  \
-          $(DESTDIR)$(includedir)/freetype2/ft2build.h
+          $(DESTDIR)$(includedir)/freetype/ft2build.h
 	$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h                        \
-          $(DESTDIR)$(includedir)/freetype2/freetype/config/ftconfig.h
+          $(DESTDIR)$(includedir)/freetype/config/ftconfig.h
 	$(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h                          \
-          $(DESTDIR)$(includedir)/freetype2/freetype/config/ftmodule.h
+          $(DESTDIR)$(includedir)/freetype/config/ftmodule.h
 	$(INSTALL_DATA) $(OBJ_BUILD)/ftoption.h                        \
-          $(DESTDIR)$(includedir)/freetype2/freetype/config/ftoption.h
+          $(DESTDIR)$(includedir)/freetype/config/ftoption.h
 	$(INSTALL_SCRIPT) -m 644 $(PLATFORM_DIR)/freetype2.m4          \
           $(DESTDIR)$(datadir)/aclocal/freetype2.m4
 	$(INSTALL_SCRIPT) -m 644 $(OBJ_BUILD)/freetype2.pc             \
