diff --git a/include/freetype/config/ft2build.h b/include/freetype/config/ft2build.h
index 5eddcdbeb..1d6bc4d48 100644
--- a/include/freetype/config/ft2build.h
+++ b/include/freetype/config/ft2build.h
@@ -80,8 +80,7 @@
   /* Its parameter is the file pathname, relative to the public root of a  */
   /* given header file.                                                    */
   /*                                                                       */
-#define FT2_PUBLIC_FILE_( x )  < ## FT2_ROOT ## / ## x ## >
-#define FT2_PUBLIC_FILE( x )   FT2_PUBLIC_FILE_(x)
+#define FT2_PUBLIC_FILE( x )  < ## FT2_ROOT ## / ## x ## >
 
 
   /*************************************************************************/
@@ -90,8 +89,7 @@
   /* Its parameter is the file pathname, relative to the configuration     */
   /* root directory of a given header file.                                */
   /*                                                                       */
-#define FT2_CONFIG_FILE_( x )  < ## FT2_CONFIG_ROOT ## / ## x ## >
-#define FT2_CONFIG_FILE( x )   FT2_CONFIG_FILE_(x)
+#define FT2_CONFIG_FILE( x )  < ## FT2_CONFIG_ROOT ## / ## x ## >
 
 
   /*************************************************************************/
@@ -100,8 +98,7 @@
   /* file.  Its parameter is the file pathname, relative to the            */
   /* configuration root directory of a given header file.                  */
   /*                                                                       */
-#define FT2_INTERNAL_FILE_( x )  < ## FT2_ROOT ## / ## internal ## / ## x ## >
-#define FT2_INTERNAL_FILE( x )   FT2_INTERNAL_FILE_(x)
+#define FT2_INTERNAL_FILE( x )  < ## FT2_ROOT ## / ## internal ## / ## x ## >
 
 
   /*************************************************************************/
@@ -119,13 +116,11 @@
   /* FT_FLAT_COMPILATION.                                                  */
   /*                                                                       */
 #ifdef FT_FLAT_COMPILATION
-#define FT_SOURCE_FILE_( d, x )  #x
+#define FT_SOURCE_FILE( d, x )  #x
 #else
-#define FT_SOURCE_FILE_( d, x )  < ## d ## / ## x ## >
+#define FT_SOURCE_FILE( d, x )  < ## d ## / ## x ## >
 #endif
 
-#define FT_SOURCE_FILE( d, x )  FT_SOURCE_FILE_(d,x)
-
 
   /*************************************************************************/
   /*                                                                       */
@@ -210,7 +205,8 @@
 
 
   /* now include internal headers definitions from <freetype/internal/...> */
-#include FT2_PUBLIC_FILE(internal/internal.h)
+#define FT_INTERNAL_H  FT2_INTERNAL_FILE(internal.h)
+#include FT_INTERNAL_H
 
 
 #endif /* __FT2_BUILD_H__ */