Commit 165868596783af1d296aa4fa30295b22cf7e79a2

Werner Lemberg 2020-06-13T21:15:45

Remove redundant inclusion of `ft2build.h'. * */*: Remove `#include <ft2build.h>' where possible. * include/freetype/freetype.h: Remove cpp error about missing inclusion of `ft2build.h'.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
diff --git a/ChangeLog b/ChangeLog
index b0327cd..9c4ab5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2020-06-13  Werner Lemberg  <wl@gnu.org>
+
+	Remove redundant inclusion of `ft2build.h'.
+
+	* */*: Remove `#include <ft2build.h>' where possible.
+
+	* include/freetype/freetype.h: Remove cpp error about missing
+	inclusion of `ft2build.h'.
+
 2020-06-08  David Turner  <david@freetype.org>
 
 	Make macros for header file names optional.
diff --git a/builds/mac/ftmac.c b/builds/mac/ftmac.c
index bba8424..2cb3046 100644
--- a/builds/mac/ftmac.c
+++ b/builds/mac/ftmac.c
@@ -62,7 +62,6 @@
   */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/tttags.h>
 #include <freetype/internal/ftstream.h>
diff --git a/builds/wince/ftdebug.c b/builds/wince/ftdebug.c
index c6c8e66..734c4f0 100644
--- a/builds/wince/ftdebug.c
+++ b/builds/wince/ftdebug.c
@@ -41,7 +41,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/ftdebug.h>
 
diff --git a/builds/windows/ftdebug.c b/builds/windows/ftdebug.c
index 81ca8b8..d589490 100644
--- a/builds/windows/ftdebug.c
+++ b/builds/windows/ftdebug.c
@@ -41,7 +41,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/ftdebug.h>
 
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 93cc9ab..3966278 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -20,11 +20,6 @@
 #define FREETYPE_H_
 
 
-#ifndef FT_FREETYPE_H
-#error "`ft2build.h' hasn't been included yet!"
-#endif
-
-
 #include <ft2build.h>
 #include FT_CONFIG_CONFIG_H
 #include <freetype/fttypes.h>
diff --git a/include/freetype/ftadvanc.h b/include/freetype/ftadvanc.h
index 8a43bdd..5050d3a 100644
--- a/include/freetype/ftadvanc.h
+++ b/include/freetype/ftadvanc.h
@@ -20,7 +20,6 @@
 #define FTADVANC_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftbbox.h b/include/freetype/ftbbox.h
index 2adb732..fda1ad9 100644
--- a/include/freetype/ftbbox.h
+++ b/include/freetype/ftbbox.h
@@ -31,7 +31,6 @@
 #define FTBBOX_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftbdf.h b/include/freetype/ftbdf.h
index 4732325..2e1daee 100644
--- a/include/freetype/ftbdf.h
+++ b/include/freetype/ftbdf.h
@@ -19,7 +19,6 @@
 #ifndef FTBDF_H_
 #define FTBDF_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftbitmap.h b/include/freetype/ftbitmap.h
index 8d43fd4..282c22e 100644
--- a/include/freetype/ftbitmap.h
+++ b/include/freetype/ftbitmap.h
@@ -20,7 +20,6 @@
 #define FTBITMAP_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/ftcolor.h>
 
diff --git a/include/freetype/ftbzip2.h b/include/freetype/ftbzip2.h
index a1411ef..fe582ea 100644
--- a/include/freetype/ftbzip2.h
+++ b/include/freetype/ftbzip2.h
@@ -19,7 +19,6 @@
 #ifndef FTBZIP2_H_
 #define FTBZIP2_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h
index 26f48fe..6047275 100644
--- a/include/freetype/ftcache.h
+++ b/include/freetype/ftcache.h
@@ -20,7 +20,6 @@
 #define FTCACHE_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftglyph.h>
 
 
diff --git a/include/freetype/ftcid.h b/include/freetype/ftcid.h
index ab002de..a29fb33 100644
--- a/include/freetype/ftcid.h
+++ b/include/freetype/ftcid.h
@@ -19,7 +19,6 @@
 #ifndef FTCID_H_
 #define FTCID_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftcolor.h b/include/freetype/ftcolor.h
index 44bcb8a..ecc6485 100644
--- a/include/freetype/ftcolor.h
+++ b/include/freetype/ftcolor.h
@@ -19,7 +19,6 @@
 #ifndef FTCOLOR_H_
 #define FTCOLOR_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftdriver.h b/include/freetype/ftdriver.h
index f7ec6f3..34fcaad 100644
--- a/include/freetype/ftdriver.h
+++ b/include/freetype/ftdriver.h
@@ -19,7 +19,6 @@
 #ifndef FTDRIVER_H_
 #define FTDRIVER_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/ftparams.h>
 
diff --git a/include/freetype/ftfntfmt.h b/include/freetype/ftfntfmt.h
index 5e235f3..f803349 100644
--- a/include/freetype/ftfntfmt.h
+++ b/include/freetype/ftfntfmt.h
@@ -19,7 +19,6 @@
 #ifndef FTFNTFMT_H_
 #define FTFNTFMT_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftgasp.h b/include/freetype/ftgasp.h
index 74eb904..6b76882 100644
--- a/include/freetype/ftgasp.h
+++ b/include/freetype/ftgasp.h
@@ -19,7 +19,6 @@
 #ifndef FTGASP_H_
 #define FTGASP_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h
index 88e63fb..704619e 100644
--- a/include/freetype/ftglyph.h
+++ b/include/freetype/ftglyph.h
@@ -33,7 +33,6 @@
 #define FTGLYPH_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftgxval.h b/include/freetype/ftgxval.h
index e617b81..354460a 100644
--- a/include/freetype/ftgxval.h
+++ b/include/freetype/ftgxval.h
@@ -28,7 +28,6 @@
 #ifndef FTGXVAL_H_
 #define FTGXVAL_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftgzip.h b/include/freetype/ftgzip.h
index 6148b3c..2aa8d75 100644
--- a/include/freetype/ftgzip.h
+++ b/include/freetype/ftgzip.h
@@ -19,7 +19,6 @@
 #ifndef FTGZIP_H_
 #define FTGZIP_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h
index 185967c..9fecd1f 100644
--- a/include/freetype/ftimage.h
+++ b/include/freetype/ftimage.h
@@ -30,7 +30,6 @@
 
   /* STANDALONE_ is from ftgrays.c */
 #ifndef STANDALONE_
-#include <ft2build.h>
 #endif
 
 
diff --git a/include/freetype/ftincrem.h b/include/freetype/ftincrem.h
index b1b3167..f67655e 100644
--- a/include/freetype/ftincrem.h
+++ b/include/freetype/ftincrem.h
@@ -19,7 +19,6 @@
 #ifndef FTINCREM_H_
 #define FTINCREM_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/ftparams.h>
 
diff --git a/include/freetype/ftlcdfil.h b/include/freetype/ftlcdfil.h
index 31cbbe2..b8c5c00 100644
--- a/include/freetype/ftlcdfil.h
+++ b/include/freetype/ftlcdfil.h
@@ -20,7 +20,6 @@
 #ifndef FTLCDFIL_H_
 #define FTLCDFIL_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/ftparams.h>
 
diff --git a/include/freetype/ftlist.h b/include/freetype/ftlist.h
index f6ce25f..4588922 100644
--- a/include/freetype/ftlist.h
+++ b/include/freetype/ftlist.h
@@ -28,7 +28,6 @@
 #define FTLIST_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftlzw.h b/include/freetype/ftlzw.h
index aec431c..904e19b 100644
--- a/include/freetype/ftlzw.h
+++ b/include/freetype/ftlzw.h
@@ -19,7 +19,6 @@
 #ifndef FTLZW_H_
 #define FTLZW_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftmac.h b/include/freetype/ftmac.h
index c1a0aa3..c9de981 100644
--- a/include/freetype/ftmac.h
+++ b/include/freetype/ftmac.h
@@ -29,7 +29,6 @@
 #define FTMAC_H_
 
 
-#include <ft2build.h>
 
 
 FT_BEGIN_HEADER
diff --git a/include/freetype/ftmm.h b/include/freetype/ftmm.h
index 7392fe4..d8781a8 100644
--- a/include/freetype/ftmm.h
+++ b/include/freetype/ftmm.h
@@ -20,7 +20,6 @@
 #define FTMM_H_
 
 
-#include <ft2build.h>
 #include <freetype/t1tables.h>
 
 
diff --git a/include/freetype/ftmodapi.h b/include/freetype/ftmodapi.h
index 09c3a23..4b5cdfb 100644
--- a/include/freetype/ftmodapi.h
+++ b/include/freetype/ftmodapi.h
@@ -20,7 +20,6 @@
 #define FTMODAPI_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftotval.h b/include/freetype/ftotval.h
index e912712..9c00ad3 100644
--- a/include/freetype/ftotval.h
+++ b/include/freetype/ftotval.h
@@ -30,7 +30,6 @@
 #ifndef FTOTVAL_H_
 #define FTOTVAL_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftoutln.h b/include/freetype/ftoutln.h
index 5039ee4..5069d18 100644
--- a/include/freetype/ftoutln.h
+++ b/include/freetype/ftoutln.h
@@ -21,7 +21,6 @@
 #define FTOUTLN_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftparams.h b/include/freetype/ftparams.h
index 9b893a1..55ea2a3 100644
--- a/include/freetype/ftparams.h
+++ b/include/freetype/ftparams.h
@@ -19,7 +19,6 @@
 #ifndef FTPARAMS_H_
 #define FTPARAMS_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftpfr.h b/include/freetype/ftpfr.h
index bd7f0aa..9a5383f 100644
--- a/include/freetype/ftpfr.h
+++ b/include/freetype/ftpfr.h
@@ -19,7 +19,6 @@
 #ifndef FTPFR_H_
 #define FTPFR_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftrender.h b/include/freetype/ftrender.h
index c33763c..8007951 100644
--- a/include/freetype/ftrender.h
+++ b/include/freetype/ftrender.h
@@ -20,7 +20,6 @@
 #define FTRENDER_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 #include <freetype/ftglyph.h>
 
diff --git a/include/freetype/ftsizes.h b/include/freetype/ftsizes.h
index a999042..a8682a3 100644
--- a/include/freetype/ftsizes.h
+++ b/include/freetype/ftsizes.h
@@ -29,7 +29,6 @@
 #define FTSIZES_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftsnames.h b/include/freetype/ftsnames.h
index 46b4dfd..729e6ab 100644
--- a/include/freetype/ftsnames.h
+++ b/include/freetype/ftsnames.h
@@ -23,7 +23,6 @@
 #define FTSNAMES_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/ftparams.h>
 
diff --git a/include/freetype/ftstroke.h b/include/freetype/ftstroke.h
index 18aee42..1c5477c 100644
--- a/include/freetype/ftstroke.h
+++ b/include/freetype/ftstroke.h
@@ -19,7 +19,6 @@
 #ifndef FTSTROKE_H_
 #define FTSTROKE_H_
 
-#include <ft2build.h>
 #include <freetype/ftoutln.h>
 #include <freetype/ftglyph.h>
 
diff --git a/include/freetype/ftsynth.h b/include/freetype/ftsynth.h
index 55b1a39..bdb4c57 100644
--- a/include/freetype/ftsynth.h
+++ b/include/freetype/ftsynth.h
@@ -45,7 +45,6 @@
 #define FTSYNTH_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ftsystem.h b/include/freetype/ftsystem.h
index f7fecb5..22aead7 100644
--- a/include/freetype/ftsystem.h
+++ b/include/freetype/ftsystem.h
@@ -20,7 +20,6 @@
 #define FTSYSTEM_H_
 
 
-#include <ft2build.h>
 
 
 FT_BEGIN_HEADER
diff --git a/include/freetype/ftwinfnt.h b/include/freetype/ftwinfnt.h
index 18341dc..786528c 100644
--- a/include/freetype/ftwinfnt.h
+++ b/include/freetype/ftwinfnt.h
@@ -19,7 +19,6 @@
 #ifndef FTWINFNT_H_
 #define FTWINFNT_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/internal/autohint.h b/include/freetype/internal/autohint.h
index f344ff1..d4220a2 100644
--- a/include/freetype/internal/autohint.h
+++ b/include/freetype/internal/autohint.h
@@ -70,7 +70,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 
diff --git a/include/freetype/internal/cffotypes.h b/include/freetype/internal/cffotypes.h
index 360af53..a316fd1 100644
--- a/include/freetype/internal/cffotypes.h
+++ b/include/freetype/internal/cffotypes.h
@@ -19,7 +19,6 @@
 #ifndef CFFOTYPES_H_
 #define CFFOTYPES_H_
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/cfftypes.h>
 #include <freetype/internal/tttypes.h>
diff --git a/include/freetype/internal/cfftypes.h b/include/freetype/internal/cfftypes.h
index e48ff1b..f21167b 100644
--- a/include/freetype/internal/cfftypes.h
+++ b/include/freetype/internal/cfftypes.h
@@ -21,7 +21,6 @@
 #define CFFTYPES_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/t1tables.h>
 #include <freetype/internal/ftserv.h>
diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h
index d8236d2..6bc2791 100644
--- a/include/freetype/internal/ftcalc.h
+++ b/include/freetype/internal/ftcalc.h
@@ -20,7 +20,6 @@
 #define FTCALC_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 
diff --git a/include/freetype/internal/ftdrv.h b/include/freetype/internal/ftdrv.h
index 36caa4f..a294516 100644
--- a/include/freetype/internal/ftdrv.h
+++ b/include/freetype/internal/ftdrv.h
@@ -20,7 +20,6 @@
 #define FTDRV_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 
 
diff --git a/include/freetype/internal/ftgloadr.h b/include/freetype/internal/ftgloadr.h
index f27dd2b..27b8659 100644
--- a/include/freetype/internal/ftgloadr.h
+++ b/include/freetype/internal/ftgloadr.h
@@ -20,7 +20,6 @@
 #define FTGLOADR_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 
diff --git a/include/freetype/internal/fthash.h b/include/freetype/internal/fthash.h
index 5833bc9..622ec76 100644
--- a/include/freetype/internal/fthash.h
+++ b/include/freetype/internal/fthash.h
@@ -43,7 +43,6 @@
 #define FTHASH_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 
diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h
index 7c667c1..c7ac1a7 100644
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -26,7 +26,6 @@
 #ifndef FTOBJS_H_
 #define FTOBJS_H_
 
-#include <ft2build.h>
 #include <freetype/ftrender.h>
 #include <freetype/ftsizes.h>
 #include <freetype/ftlcdfil.h>
diff --git a/include/freetype/internal/ftpsprop.h b/include/freetype/internal/ftpsprop.h
index d52ca2c..81ec291 100644
--- a/include/freetype/internal/ftpsprop.h
+++ b/include/freetype/internal/ftpsprop.h
@@ -20,7 +20,6 @@
 #define FTPSPROP_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 
diff --git a/include/freetype/internal/ftrfork.h b/include/freetype/internal/ftrfork.h
index 071743f..1b7b25a 100644
--- a/include/freetype/internal/ftrfork.h
+++ b/include/freetype/internal/ftrfork.h
@@ -25,7 +25,6 @@
 #define FTRFORK_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 
 
diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h
index a917b0a..8e0a262 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -21,7 +21,6 @@
 #define PSAUX_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/t1types.h>
 #include <freetype/internal/fthash.h>
diff --git a/include/freetype/internal/pshints.h b/include/freetype/internal/pshints.h
index 43bd79b..663e9d3 100644
--- a/include/freetype/internal/pshints.h
+++ b/include/freetype/internal/pshints.h
@@ -22,7 +22,6 @@
 #define PSHINTS_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/t1tables.h>
 
diff --git a/include/freetype/internal/sfnt.h b/include/freetype/internal/sfnt.h
index 283f0cb..b4c12db 100644
--- a/include/freetype/internal/sfnt.h
+++ b/include/freetype/internal/sfnt.h
@@ -20,7 +20,6 @@
 #define SFNT_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 #include <freetype/internal/tttypes.h>
 #include <freetype/internal/wofftypes.h>
diff --git a/include/freetype/internal/t1types.h b/include/freetype/internal/t1types.h
index 9fe12db..6a0fe5e 100644
--- a/include/freetype/internal/t1types.h
+++ b/include/freetype/internal/t1types.h
@@ -21,7 +21,6 @@
 #define T1TYPES_H_
 
 
-#include <ft2build.h>
 #include <freetype/t1tables.h>
 #include <freetype/internal/pshints.h>
 #include <freetype/internal/ftserv.h>
diff --git a/include/freetype/internal/tttypes.h b/include/freetype/internal/tttypes.h
index 4a41485..c36342c 100644
--- a/include/freetype/internal/tttypes.h
+++ b/include/freetype/internal/tttypes.h
@@ -21,7 +21,6 @@
 #define TTTYPES_H_
 
 
-#include <ft2build.h>
 #include <freetype/tttables.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/ftcolor.h>
diff --git a/include/freetype/internal/wofftypes.h b/include/freetype/internal/wofftypes.h
index a10fef9..1874a13 100644
--- a/include/freetype/internal/wofftypes.h
+++ b/include/freetype/internal/wofftypes.h
@@ -21,7 +21,6 @@
 #define WOFFTYPES_H_
 
 
-#include <ft2build.h>
 #include <freetype/tttables.h>
 #include <freetype/internal/ftobjs.h>
 
diff --git a/include/freetype/t1tables.h b/include/freetype/t1tables.h
index ed285fc..426e140 100644
--- a/include/freetype/t1tables.h
+++ b/include/freetype/t1tables.h
@@ -21,7 +21,6 @@
 #define T1TABLES_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/ttnameid.h b/include/freetype/ttnameid.h
index 9a00913..2b2ed4c 100644
--- a/include/freetype/ttnameid.h
+++ b/include/freetype/ttnameid.h
@@ -20,7 +20,6 @@
 #define TTNAMEID_H_
 
 
-#include <ft2build.h>
 
 
 FT_BEGIN_HEADER
diff --git a/include/freetype/tttables.h b/include/freetype/tttables.h
index 8cfd1d2..c8fa35e 100644
--- a/include/freetype/tttables.h
+++ b/include/freetype/tttables.h
@@ -21,7 +21,6 @@
 #define TTTABLES_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/include/freetype/tttags.h b/include/freetype/tttags.h
index 8ed6dbf..3c9fbd5 100644
--- a/include/freetype/tttags.h
+++ b/include/freetype/tttags.h
@@ -20,7 +20,6 @@
 #define TTAGS_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c
index 3c207a2..ed7a065 100644
--- a/src/autofit/afcjk.c
+++ b/src/autofit/afcjk.c
@@ -22,7 +22,6 @@
    *
    */
 
-#include <ft2build.h>
 #include <freetype/ftadvanc.h>
 #include <freetype/internal/ftdebug.h>
 
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index 41e3e66..6e9f28c 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftadvanc.h>
 #include <freetype/internal/ftdebug.h>
 
diff --git a/src/autofit/aflatin2.c b/src/autofit/aflatin2.c
index 1569c5d..902f398 100644
--- a/src/autofit/aflatin2.c
+++ b/src/autofit/aflatin2.c
@@ -21,7 +21,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftadvanc.h>
 
 
diff --git a/src/autofit/afmodule.h b/src/autofit/afmodule.h
index 75013ef..74c4ff6 100644
--- a/src/autofit/afmodule.h
+++ b/src/autofit/afmodule.h
@@ -19,7 +19,6 @@
 #ifndef AFMODULE_H_
 #define AFMODULE_H_
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/ftmodapi.h>
 
diff --git a/src/autofit/afshaper.c b/src/autofit/afshaper.c
index 80143a9..bbf7b6b 100644
--- a/src/autofit/afshaper.c
+++ b/src/autofit/afshaper.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/ftadvanc.h>
 #include "afglobal.h"
diff --git a/src/autofit/afshaper.h b/src/autofit/afshaper.h
index cc8693d..138c27b 100644
--- a/src/autofit/afshaper.h
+++ b/src/autofit/afshaper.h
@@ -20,7 +20,6 @@
 #define AFSHAPER_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 
diff --git a/src/autofit/aftypes.h b/src/autofit/aftypes.h
index 4bbe9a7..5f040c6 100644
--- a/src/autofit/aftypes.h
+++ b/src/autofit/aftypes.h
@@ -32,7 +32,6 @@
 #ifndef AFTYPES_H_
 #define AFTYPES_H_
 
-#include <ft2build.h>
 
 #include <freetype/freetype.h>
 #include <freetype/ftoutln.h>
diff --git a/src/autofit/autofit.c b/src/autofit/autofit.c
index 88be8bf..ef5e7f1 100644
--- a/src/autofit/autofit.c
+++ b/src/autofit/autofit.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "afangles.c"
 #include "afblue.c"
diff --git a/src/base/ftadvanc.c b/src/base/ftadvanc.c
index c19b5e3..c689e6a 100644
--- a/src/base/ftadvanc.c
+++ b/src/base/ftadvanc.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/ftadvanc.h>
diff --git a/src/base/ftbase.c b/src/base/ftbase.c
index b8242bb..bfbaffd 100644
--- a/src/base/ftbase.c
+++ b/src/base/ftbase.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #define  FT_MAKE_OPTION_SINGLE_OBJECT
 
 #include "ftadvanc.c"
diff --git a/src/base/ftbase.h b/src/base/ftbase.h
index ab37052..b03922a 100644
--- a/src/base/ftbase.h
+++ b/src/base/ftbase.h
@@ -20,7 +20,6 @@
 #define FTBASE_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 
 
diff --git a/src/base/ftbbox.c b/src/base/ftbbox.c
index 3e6661e..30a4eba 100644
--- a/src/base/ftbbox.c
+++ b/src/base/ftbbox.c
@@ -24,7 +24,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/ftbbox.h>
diff --git a/src/base/ftbdf.c b/src/base/ftbdf.c
index 26ffdf9..fc374c6 100644
--- a/src/base/ftbdf.c
+++ b/src/base/ftbdf.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/internal/ftobjs.h>
diff --git a/src/base/ftbitmap.c b/src/base/ftbitmap.c
index efa25ed..d109ee4 100644
--- a/src/base/ftbitmap.c
+++ b/src/base/ftbitmap.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/ftbitmap.h>
diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c
index d8b7584..b5258c8 100644
--- a/src/base/ftcalc.c
+++ b/src/base/ftcalc.c
@@ -32,7 +32,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/ftglyph.h>
 #include <freetype/fttrigon.h>
 #include <freetype/internal/ftcalc.h>
diff --git a/src/base/ftcid.c b/src/base/ftcid.c
index d02213e..ce8a876 100644
--- a/src/base/ftcid.c
+++ b/src/base/ftcid.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftcid.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/services/svcid.h>
diff --git a/src/base/ftcolor.c b/src/base/ftcolor.c
index 9e250ee..a50d680 100644
--- a/src/base/ftcolor.c
+++ b/src/base/ftcolor.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/sfnt.h>
 #include <freetype/internal/tttypes.h>
diff --git a/src/base/ftdebug.c b/src/base/ftdebug.c
index 0135385..62cf680 100644
--- a/src/base/ftdebug.c
+++ b/src/base/ftdebug.c
@@ -41,7 +41,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/ftdebug.h>
 
diff --git a/src/base/fterrors.c b/src/base/fterrors.c
index 0c18d24..eba9e76 100644
--- a/src/base/fterrors.c
+++ b/src/base/fterrors.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/fterrors.h>
 
diff --git a/src/base/ftfntfmt.c b/src/base/ftfntfmt.c
index 06baf4c..a45317e 100644
--- a/src/base/ftfntfmt.c
+++ b/src/base/ftfntfmt.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftfntfmt.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/services/svfntfmt.h>
diff --git a/src/base/ftfstype.c b/src/base/ftfstype.c
index 67111c6..bca548f 100644
--- a/src/base/ftfstype.c
+++ b/src/base/ftfstype.c
@@ -15,7 +15,6 @@
  *
  */
 
-#include <ft2build.h>
 #include <freetype/t1tables.h>
 #include <freetype/tttables.h>
 #include <freetype/internal/ftserv.h>
diff --git a/src/base/ftgasp.c b/src/base/ftgasp.c
index c721af5..eed05a3 100644
--- a/src/base/ftgasp.c
+++ b/src/base/ftgasp.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftgasp.h>
 #include <freetype/internal/tttypes.h>
 
diff --git a/src/base/ftgloadr.c b/src/base/ftgloadr.c
index fd7c950..faf7d85 100644
--- a/src/base/ftgloadr.c
+++ b/src/base/ftgloadr.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftgloadr.h>
 #include <freetype/internal/ftmemory.h>
diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c
index 2f85c6d..78dff7f 100644
--- a/src/base/ftglyph.c
+++ b/src/base/ftglyph.c
@@ -28,7 +28,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/ftglyph.h>
diff --git a/src/base/ftgxval.c b/src/base/ftgxval.c
index 9fc2ca8..f04df14 100644
--- a/src/base/ftgxval.c
+++ b/src/base/ftgxval.c
@@ -25,7 +25,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/internal/ftobjs.h>
diff --git a/src/base/fthash.c b/src/base/fthash.c
index 2251373..449b03a 100644
--- a/src/base/fthash.c
+++ b/src/base/fthash.c
@@ -39,7 +39,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/internal/fthash.h>
 #include <freetype/internal/ftmemory.h>
 
diff --git a/src/base/ftlcdfil.c b/src/base/ftlcdfil.c
index 3a02687..1e84dbc 100644
--- a/src/base/ftlcdfil.c
+++ b/src/base/ftlcdfil.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/ftlcdfil.h>
diff --git a/src/base/ftmac.c b/src/base/ftmac.c
index d71e229..55a631f 100644
--- a/src/base/ftmac.c
+++ b/src/base/ftmac.c
@@ -65,7 +65,6 @@
   */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/tttags.h>
 #include <freetype/internal/ftstream.h>
diff --git a/src/base/ftmm.c b/src/base/ftmm.c
index ce746be..9a702b9 100644
--- a/src/base/ftmm.c
+++ b/src/base/ftmm.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/ftmm.h>
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index d7b6424..532a06d 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftlist.h>
 #include <freetype/ftoutln.h>
 #include <freetype/ftfntfmt.h>
diff --git a/src/base/ftotval.c b/src/base/ftotval.c
index 198f055..90a5dd6 100644
--- a/src/base/ftotval.c
+++ b/src/base/ftotval.c
@@ -15,7 +15,6 @@
  *
  */
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/internal/ftobjs.h>
diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c
index 7a6c7fd..9935e05 100644
--- a/src/base/ftoutln.c
+++ b/src/base/ftoutln.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftoutln.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftcalc.h>
diff --git a/src/base/ftpatent.c b/src/base/ftpatent.c
index 5ec4e6f..a02c636 100644
--- a/src/base/ftpatent.c
+++ b/src/base/ftpatent.c
@@ -16,7 +16,6 @@
  *
  */
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/tttags.h>
 #include <freetype/internal/ftobjs.h>
diff --git a/src/base/ftpfr.c b/src/base/ftpfr.c
index 28916c3..c656fcd 100644
--- a/src/base/ftpfr.c
+++ b/src/base/ftpfr.c
@@ -15,7 +15,6 @@
  *
  */
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/internal/ftobjs.h>
diff --git a/src/base/ftpsprop.c b/src/base/ftpsprop.c
index 644e697..8c29f50 100644
--- a/src/base/ftpsprop.c
+++ b/src/base/ftpsprop.c
@@ -17,7 +17,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftdriver.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/psaux.h>
diff --git a/src/base/ftrfork.c b/src/base/ftrfork.c
index fba122f..ea7e310 100644
--- a/src/base/ftrfork.c
+++ b/src/base/ftrfork.c
@@ -24,7 +24,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/ftrfork.h>
diff --git a/src/base/ftsnames.c b/src/base/ftsnames.c
index 472c981..8507f28 100644
--- a/src/base/ftsnames.c
+++ b/src/base/ftsnames.c
@@ -19,7 +19,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/ftsnames.h>
diff --git a/src/base/ftstream.c b/src/base/ftstream.c
index eaa210c..d940254 100644
--- a/src/base/ftstream.c
+++ b/src/base/ftstream.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/ftdebug.h>
 
diff --git a/src/base/ftstroke.c b/src/base/ftstroke.c
index 6157185..56f98e1 100644
--- a/src/base/ftstroke.c
+++ b/src/base/ftstroke.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftstroke.h>
 #include <freetype/fttrigon.h>
 #include <freetype/ftoutln.h>
diff --git a/src/base/ftsynth.c b/src/base/ftsynth.c
index d98e89d..3c96272 100644
--- a/src/base/ftsynth.c
+++ b/src/base/ftsynth.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftsynth.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftobjs.h>
diff --git a/src/base/fttrigon.c b/src/base/fttrigon.c
index dedcee7..c6f027c 100644
--- a/src/base/fttrigon.c
+++ b/src/base/fttrigon.c
@@ -29,7 +29,6 @@
    *
    */
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftcalc.h>
 #include <freetype/fttrigon.h>
diff --git a/src/base/fttype1.c b/src/base/fttype1.c
index ce26e00..be60ed6 100644
--- a/src/base/fttype1.c
+++ b/src/base/fttype1.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftserv.h>
diff --git a/src/base/ftutil.c b/src/base/ftutil.c
index 0c18d8f..d90cfbc 100644
--- a/src/base/ftutil.c
+++ b/src/base/ftutil.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftmemory.h>
 #include <freetype/internal/ftobjs.h>
diff --git a/src/base/ftwinfnt.c b/src/base/ftwinfnt.c
index 8229540..699dc3d 100644
--- a/src/base/ftwinfnt.c
+++ b/src/base/ftwinfnt.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/ftwinfnt.h>
 #include <freetype/internal/ftobjs.h>
diff --git a/src/bdf/bdf.c b/src/bdf/bdf.c
index e54df66..249012e 100644
--- a/src/bdf/bdf.c
+++ b/src/bdf/bdf.c
@@ -26,7 +26,6 @@ THE SOFTWARE.
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "bdflib.c"
 #include "bdfdrivr.c"
diff --git a/src/bdf/bdf.h b/src/bdf/bdf.h
index 0057846..5acbd5f 100644
--- a/src/bdf/bdf.h
+++ b/src/bdf/bdf.h
@@ -30,7 +30,6 @@
  * Based on bdf.h,v 1.16 2000/03/16 20:08:51 mleisher
  */
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/fthash.h>
diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
index 0859b3b..e338808 100644
--- a/src/bdf/bdfdrivr.c
+++ b/src/bdf/bdfdrivr.c
@@ -24,7 +24,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include <ft2build.h>
 
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
diff --git a/src/bdf/bdfdrivr.h b/src/bdf/bdfdrivr.h
index b638a88..54aaa33 100644
--- a/src/bdf/bdfdrivr.h
+++ b/src/bdf/bdfdrivr.h
@@ -28,7 +28,6 @@ THE SOFTWARE.
 #ifndef BDFDRIVR_H_
 #define BDFDRIVR_H_
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 
 #include "bdf.h"
diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c
index 5c0fa40..a4ddb9a 100644
--- a/src/bdf/bdflib.c
+++ b/src/bdf/bdflib.c
@@ -31,7 +31,6 @@
    */
 
 
-#include <ft2build.h>
 
 #include <freetype/freetype.h>
 #include <freetype/internal/ftdebug.h>
diff --git a/src/bzip2/ftbzip2.c b/src/bzip2/ftbzip2.c
index acd4eb4..411c5d2 100644
--- a/src/bzip2/ftbzip2.c
+++ b/src/bzip2/ftbzip2.c
@@ -22,7 +22,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftmemory.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/ftdebug.h>
diff --git a/src/cache/ftcache.c b/src/cache/ftcache.c
index 4137f68..e90f463 100644
--- a/src/cache/ftcache.c
+++ b/src/cache/ftcache.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "ftcbasic.c"
 #include "ftccache.c"
diff --git a/src/cache/ftcbasic.c b/src/cache/ftcbasic.c
index 899b929..493fc0a 100644
--- a/src/cache/ftcbasic.c
+++ b/src/cache/ftcbasic.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/ftcache.h>
diff --git a/src/cache/ftccache.c b/src/cache/ftccache.c
index c6cac69..1c8e0f3 100644
--- a/src/cache/ftccache.c
+++ b/src/cache/ftccache.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "ftcmanag.h"
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftdebug.h>
diff --git a/src/cache/ftccback.h b/src/cache/ftccback.h
index cbe5395..802fd44 100644
--- a/src/cache/ftccback.h
+++ b/src/cache/ftccback.h
@@ -18,7 +18,6 @@
 #ifndef FTCCBACK_H_
 #define FTCCBACK_H_
 
-#include <ft2build.h>
 #include <freetype/ftcache.h>
 #include "ftcmru.h"
 #include "ftcimage.h"
diff --git a/src/cache/ftccmap.c b/src/cache/ftccmap.c
index 593cc55..468c008 100644
--- a/src/cache/ftccmap.c
+++ b/src/cache/ftccmap.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/ftcache.h>
 #include "ftcmanag.h"
diff --git a/src/cache/ftcglyph.c b/src/cache/ftcglyph.c
index 5e17df6..7f5438a 100644
--- a/src/cache/ftcglyph.c
+++ b/src/cache/ftcglyph.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/ftcache.h>
 #include "ftcglyph.h"
diff --git a/src/cache/ftcglyph.h b/src/cache/ftcglyph.h
index ef689f9..5629545 100644
--- a/src/cache/ftcglyph.h
+++ b/src/cache/ftcglyph.h
@@ -117,7 +117,6 @@
 #define FTCGLYPH_H_
 
 
-#include <ft2build.h>
 #include "ftcmanag.h"
 
 
diff --git a/src/cache/ftcimage.c b/src/cache/ftcimage.c
index 65cc2f6..58ebad8 100644
--- a/src/cache/ftcimage.c
+++ b/src/cache/ftcimage.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftcache.h>
 #include "ftcimage.h"
 #include <freetype/internal/ftmemory.h>
diff --git a/src/cache/ftcimage.h b/src/cache/ftcimage.h
index a360f48..a400788 100644
--- a/src/cache/ftcimage.h
+++ b/src/cache/ftcimage.h
@@ -36,7 +36,6 @@
 #define FTCIMAGE_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftcache.h>
 #include "ftcglyph.h"
 
diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c
index 18a02e3..436d41f 100644
--- a/src/cache/ftcmanag.c
+++ b/src/cache/ftcmanag.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftcache.h>
 #include "ftcmanag.h"
 #include <freetype/internal/ftobjs.h>
diff --git a/src/cache/ftcmanag.h b/src/cache/ftcmanag.h
index 1ea560f..6c6ec68 100644
--- a/src/cache/ftcmanag.h
+++ b/src/cache/ftcmanag.h
@@ -63,7 +63,6 @@
 #define FTCMANAG_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftcache.h>
 #include "ftcmru.h"
 #include "ftccache.h"
diff --git a/src/cache/ftcmru.c b/src/cache/ftcmru.c
index 44c0a62..8feed45 100644
--- a/src/cache/ftcmru.c
+++ b/src/cache/ftcmru.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftcache.h>
 #include "ftcmru.h"
 #include <freetype/internal/ftobjs.h>
diff --git a/src/cache/ftcmru.h b/src/cache/ftcmru.h
index a27ea5f..e7c2a8f 100644
--- a/src/cache/ftcmru.h
+++ b/src/cache/ftcmru.h
@@ -44,7 +44,6 @@
 #define FTCMRU_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c
index 2dd51f9..e0db930 100644
--- a/src/cache/ftcsbits.c
+++ b/src/cache/ftcsbits.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftcache.h>
 #include "ftcsbits.h"
 #include <freetype/internal/ftobjs.h>
diff --git a/src/cache/ftcsbits.h b/src/cache/ftcsbits.h
index b1e09b2..46f797e 100644
--- a/src/cache/ftcsbits.h
+++ b/src/cache/ftcsbits.h
@@ -20,7 +20,6 @@
 #define FTCSBITS_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftcache.h>
 #include "ftcglyph.h"
 
diff --git a/src/cff/cff.c b/src/cff/cff.c
index 755228b..0fa6c87 100644
--- a/src/cff/cff.c
+++ b/src/cff/cff.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "cffcmap.c"
 #include "cffdrivr.c"
diff --git a/src/cff/cffcmap.c b/src/cff/cffcmap.c
index b244461..6d16ed4 100644
--- a/src/cff/cffcmap.c
+++ b/src/cff/cffcmap.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include "cffcmap.h"
 #include "cffload.h"
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index b513cc3..af0ec71 100644
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
diff --git a/src/cff/cffdrivr.h b/src/cff/cffdrivr.h
index c1175c6..d198dd3 100644
--- a/src/cff/cffdrivr.h
+++ b/src/cff/cffdrivr.h
@@ -20,7 +20,6 @@
 #define CFFDRIVER_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 
 
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index 1171acf..5381489 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/sfnt.h>
diff --git a/src/cff/cffgload.h b/src/cff/cffgload.h
index eaf2ab5..3b312f4 100644
--- a/src/cff/cffgload.h
+++ b/src/cff/cffgload.h
@@ -20,7 +20,6 @@
 #define CFFGLOAD_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/cffotypes.h>
 
diff --git a/src/cff/cffload.c b/src/cff/cffload.c
index c98272a..3a3df6b 100644
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftstream.h>
diff --git a/src/cff/cffload.h b/src/cff/cffload.h
index 6b1bb97..fc998db 100644
--- a/src/cff/cffload.h
+++ b/src/cff/cffload.h
@@ -20,7 +20,6 @@
 #define CFFLOAD_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/cfftypes.h>
 #include "cffparse.h"
 #include <freetype/internal/cffotypes.h>  /* for CFF_Face */
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index 5e58315..981bc70 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftcalc.h>
diff --git a/src/cff/cffobjs.h b/src/cff/cffobjs.h
index 6f12b95..845bd90 100644
--- a/src/cff/cffobjs.h
+++ b/src/cff/cffobjs.h
@@ -20,7 +20,6 @@
 #define CFFOBJS_H_
 
 
-#include <ft2build.h>
 
 
 FT_BEGIN_HEADER
diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c
index 17e4a8e..25c90d2 100644
--- a/src/cff/cffparse.c
+++ b/src/cff/cffparse.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "cffparse.h"
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/ftdebug.h>
diff --git a/src/cff/cffparse.h b/src/cff/cffparse.h
index 35cf2b6..6f3fbb3 100644
--- a/src/cff/cffparse.h
+++ b/src/cff/cffparse.h
@@ -20,7 +20,6 @@
 #define CFFPARSE_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/cfftypes.h>
 #include <freetype/internal/ftobjs.h>
 
diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c
index 0eb2a1a..54aa62f 100644
--- a/src/cid/cidgload.c
+++ b/src/cid/cidgload.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "cidload.h"
 #include "cidgload.h"
 #include <freetype/internal/ftdebug.h>
diff --git a/src/cid/cidgload.h b/src/cid/cidgload.h
index 251c93c..da36e37 100644
--- a/src/cid/cidgload.h
+++ b/src/cid/cidgload.h
@@ -20,7 +20,6 @@
 #define CIDGLOAD_H_
 
 
-#include <ft2build.h>
 #include "cidobjs.h"
 
 
diff --git a/src/cid/cidload.h b/src/cid/cidload.h
index bb16222..06fb9ef 100644
--- a/src/cid/cidload.h
+++ b/src/cid/cidload.h
@@ -20,7 +20,6 @@
 #define CIDLOAD_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftstream.h>
 #include "cidparse.h"
 
diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
index 67dae5e..2d284ca 100644
--- a/src/cid/cidobjs.c
+++ b/src/cid/cidobjs.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 
diff --git a/src/cid/cidparse.c b/src/cid/cidparse.c
index 3b65e19..1fc098b 100644
--- a/src/cid/cidparse.c
+++ b/src/cid/cidparse.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftstream.h>
diff --git a/src/cid/cidparse.h b/src/cid/cidparse.h
index ab27434..0b49beb 100644
--- a/src/cid/cidparse.h
+++ b/src/cid/cidparse.h
@@ -20,7 +20,6 @@
 #define CIDPARSE_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/t1types.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/psaux.h>
diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c
index 7eaec06..d08cea1 100644
--- a/src/cid/cidriver.c
+++ b/src/cid/cidriver.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "cidriver.h"
 #include "cidgload.h"
 #include <freetype/internal/ftdebug.h>
diff --git a/src/cid/cidriver.h b/src/cid/cidriver.h
index 0895efb..0fc8ed3 100644
--- a/src/cid/cidriver.h
+++ b/src/cid/cidriver.h
@@ -20,7 +20,6 @@
 #define CIDRIVER_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 
 
diff --git a/src/cid/type1cid.c b/src/cid/type1cid.c
index ba91410..082e8bf 100644
--- a/src/cid/type1cid.c
+++ b/src/cid/type1cid.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "cidgload.c"
 #include "cidload.c"
diff --git a/src/gxvalid/gxvalid.c b/src/gxvalid/gxvalid.c
index cb655ae..683b8a6 100644
--- a/src/gxvalid/gxvalid.c
+++ b/src/gxvalid/gxvalid.c
@@ -18,7 +18,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "gxvbsln.c"
 #include "gxvcommn.c"
diff --git a/src/gxvalid/gxvalid.h b/src/gxvalid/gxvalid.h
index ac9cae0..ff2812d 100644
--- a/src/gxvalid/gxvalid.h
+++ b/src/gxvalid/gxvalid.h
@@ -28,7 +28,6 @@
 #ifndef GXVALID_H_
 #define GXVALID_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #include "gxverror.h"                     /* must come before `ftvalid.h' */
diff --git a/src/gxvalid/gxvcommn.h b/src/gxvalid/gxvcommn.h
index f36799f..59d1492 100644
--- a/src/gxvalid/gxvcommn.h
+++ b/src/gxvalid/gxvcommn.h
@@ -43,7 +43,6 @@
 #define GXVCOMMN_H_
 
 
-#include <ft2build.h>
 #include "gxvalid.h"
 #include <freetype/internal/ftdebug.h>
 #include <freetype/ftsnames.h>
diff --git a/src/gxvalid/gxvmod.c b/src/gxvalid/gxvmod.c
index c431816..a467e87 100644
--- a/src/gxvalid/gxvmod.c
+++ b/src/gxvalid/gxvmod.c
@@ -25,7 +25,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/tttables.h>
 #include <freetype/tttags.h>
 #include <freetype/ftgxval.h>
diff --git a/src/gxvalid/gxvmod.h b/src/gxvalid/gxvmod.h
index 80c198f..f2982c9 100644
--- a/src/gxvalid/gxvmod.h
+++ b/src/gxvalid/gxvmod.h
@@ -29,7 +29,6 @@
 #ifndef GXVMOD_H_
 #define GXVMOD_H_
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 
 
diff --git a/src/gzip/ftgzip.c b/src/gzip/ftgzip.c
index 1495a98..de7d0fd 100644
--- a/src/gzip/ftgzip.c
+++ b/src/gzip/ftgzip.c
@@ -20,7 +20,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftmemory.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/ftdebug.h>
diff --git a/src/lzw/ftlzw.c b/src/lzw/ftlzw.c
index 1e2073b..ddb81e6 100644
--- a/src/lzw/ftlzw.c
+++ b/src/lzw/ftlzw.c
@@ -21,7 +21,6 @@
  *
  */
 
-#include <ft2build.h>
 #include <freetype/internal/ftmemory.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/ftdebug.h>
diff --git a/src/lzw/ftzopen.h b/src/lzw/ftzopen.h
index 6a7a730..cb9206b 100644
--- a/src/lzw/ftzopen.h
+++ b/src/lzw/ftzopen.h
@@ -22,7 +22,6 @@
 #ifndef FTZOPEN_H_
 #define FTZOPEN_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 
diff --git a/src/otvalid/otvalid.c b/src/otvalid/otvalid.c
index 487d336..d640209 100644
--- a/src/otvalid/otvalid.c
+++ b/src/otvalid/otvalid.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "otvbase.c"
 #include "otvcommn.c"
diff --git a/src/otvalid/otvalid.h b/src/otvalid/otvalid.h
index c4d26a6..8208ff0 100644
--- a/src/otvalid/otvalid.h
+++ b/src/otvalid/otvalid.h
@@ -20,7 +20,6 @@
 #define OTVALID_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #include "otverror.h"                      /* must come before `ftvalid.h' */
diff --git a/src/otvalid/otvcommn.h b/src/otvalid/otvcommn.h
index 0755c44..f992603 100644
--- a/src/otvalid/otvcommn.h
+++ b/src/otvalid/otvcommn.h
@@ -20,7 +20,6 @@
 #define OTVCOMMN_H_
 
 
-#include <ft2build.h>
 #include "otvalid.h"
 #include <freetype/internal/ftdebug.h>
 
diff --git a/src/otvalid/otvmod.c b/src/otvalid/otvmod.c
index 5fe8737..0188b27 100644
--- a/src/otvalid/otvmod.c
+++ b/src/otvalid/otvmod.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/tttables.h>
 #include <freetype/tttags.h>
 #include <freetype/ftotval.h>
diff --git a/src/otvalid/otvmod.h b/src/otvalid/otvmod.h
index 6f2e750..efd6da0 100644
--- a/src/otvalid/otvmod.h
+++ b/src/otvalid/otvmod.h
@@ -21,7 +21,6 @@
 #define OTVMOD_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 
 
diff --git a/src/pcf/pcf.c b/src/pcf/pcf.c
index 8ffd6e2..6b30fb2 100644
--- a/src/pcf/pcf.c
+++ b/src/pcf/pcf.c
@@ -26,7 +26,6 @@ THE SOFTWARE.
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "pcfdrivr.c"
 #include "pcfread.c"
diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h
index 1338030..3134cc3 100644
--- a/src/pcf/pcf.h
+++ b/src/pcf/pcf.h
@@ -29,7 +29,6 @@ THE SOFTWARE.
 #define PCF_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 #include <freetype/internal/ftstream.h>
 
diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
index c3ab0a4..b0b5ee4 100644
--- a/src/pcf/pcfdrivr.c
+++ b/src/pcf/pcfdrivr.c
@@ -25,7 +25,6 @@ THE SOFTWARE.
 */
 
 
-#include <ft2build.h>
 
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
diff --git a/src/pcf/pcfdrivr.h b/src/pcf/pcfdrivr.h
index dac2f22..d465393 100644
--- a/src/pcf/pcfdrivr.h
+++ b/src/pcf/pcfdrivr.h
@@ -28,7 +28,6 @@ THE SOFTWARE.
 #ifndef PCFDRIVR_H_
 #define PCFDRIVR_H_
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 
 
diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
index 7cc33a3..08878a2 100644
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -25,7 +25,6 @@ THE SOFTWARE.
 */
 
 
-#include <ft2build.h>
 
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
diff --git a/src/pcf/pcfread.h b/src/pcf/pcfread.h
index bed30e5..a54648f 100644
--- a/src/pcf/pcfread.h
+++ b/src/pcf/pcfread.h
@@ -29,7 +29,6 @@ THE SOFTWARE.
 #define PCFREAD_H_
 
 
-#include <ft2build.h>
 
 FT_BEGIN_HEADER
 
diff --git a/src/pcf/pcfutil.c b/src/pcf/pcfutil.c
index 045c42d..5d3c007 100644
--- a/src/pcf/pcfutil.c
+++ b/src/pcf/pcfutil.c
@@ -32,7 +32,6 @@ in this Software without prior written authorization from The Open Group.
 /* Modified for use with FreeType */
 
 
-#include <ft2build.h>
 #include "pcfutil.h"
 
 
diff --git a/src/pfr/pfr.c b/src/pfr/pfr.c
index 5dea6fa..9264c77 100644
--- a/src/pfr/pfr.c
+++ b/src/pfr/pfr.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "pfrcmap.c"
 #include "pfrdrivr.c"
diff --git a/src/pfr/pfrcmap.c b/src/pfr/pfrcmap.c
index b43fd7f..ebc7b84 100644
--- a/src/pfr/pfrcmap.c
+++ b/src/pfr/pfrcmap.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include "pfrcmap.h"
 #include "pfrobjs.h"
diff --git a/src/pfr/pfrcmap.h b/src/pfr/pfrcmap.h
index 251d85b..a6d920c 100644
--- a/src/pfr/pfrcmap.h
+++ b/src/pfr/pfrcmap.h
@@ -19,7 +19,6 @@
 #ifndef PFRCMAP_H_
 #define PFRCMAP_H_
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include "pfrtypes.h"
 
diff --git a/src/pfr/pfrdrivr.c b/src/pfr/pfrdrivr.c
index e0b3154..b143208 100644
--- a/src/pfr/pfrdrivr.c
+++ b/src/pfr/pfrdrivr.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/services/svpfr.h>
diff --git a/src/pfr/pfrdrivr.h b/src/pfr/pfrdrivr.h
index 1400e27..7646b4d 100644
--- a/src/pfr/pfrdrivr.h
+++ b/src/pfr/pfrdrivr.h
@@ -20,7 +20,6 @@
 #define PFRDRIVR_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 
 
diff --git a/src/pfr/pfrtypes.h b/src/pfr/pfrtypes.h
index 83bf5f2..06fb82d 100644
--- a/src/pfr/pfrtypes.h
+++ b/src/pfr/pfrtypes.h
@@ -19,7 +19,6 @@
 #ifndef PFRTYPES_H_
 #define PFRTYPES_H_
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 
 FT_BEGIN_HEADER
diff --git a/src/psaux/afmparse.c b/src/psaux/afmparse.c
index 9dbf9d5..2d6a0d9 100644
--- a/src/psaux/afmparse.c
+++ b/src/psaux/afmparse.c
@@ -15,7 +15,6 @@
  *
  */
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/psaux.h>
diff --git a/src/psaux/afmparse.h b/src/psaux/afmparse.h
index 8e8a587..16a3a3e 100644
--- a/src/psaux/afmparse.h
+++ b/src/psaux/afmparse.h
@@ -20,7 +20,6 @@
 #define AFMPARSE_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/psaux.h>
 
 
diff --git a/src/psaux/cffdecode.c b/src/psaux/cffdecode.c
index 7ed6c5b..3d2da1e 100644
--- a/src/psaux/cffdecode.c
+++ b/src/psaux/cffdecode.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftserv.h>
diff --git a/src/psaux/cffdecode.h b/src/psaux/cffdecode.h
index e7f095b..77a4962 100644
--- a/src/psaux/cffdecode.h
+++ b/src/psaux/cffdecode.h
@@ -20,7 +20,6 @@
 #define CFFDECODE_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/psaux.h>
 
 
diff --git a/src/psaux/psaux.c b/src/psaux/psaux.c
index 96d2484..f428222 100644
--- a/src/psaux/psaux.c
+++ b/src/psaux/psaux.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "afmparse.c"
 #include "psauxmod.c"
diff --git a/src/psaux/psauxmod.c b/src/psaux/psauxmod.c
index bb52079..bfc507c 100644
--- a/src/psaux/psauxmod.c
+++ b/src/psaux/psauxmod.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "psauxmod.h"
 #include "psobjs.h"
 #include "t1decode.h"
diff --git a/src/psaux/psauxmod.h b/src/psaux/psauxmod.h
index 4582f9f..400d0ea 100644
--- a/src/psaux/psauxmod.h
+++ b/src/psaux/psauxmod.h
@@ -20,7 +20,6 @@
 #define PSAUXMOD_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 
 #include <freetype/internal/psaux.h>
diff --git a/src/psaux/psconv.c b/src/psaux/psconv.c
index ae6e55f..4cf5cd5 100644
--- a/src/psaux/psconv.c
+++ b/src/psaux/psconv.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/psaux.h>
 #include <freetype/internal/ftdebug.h>
 
diff --git a/src/psaux/psconv.h b/src/psaux/psconv.h
index 00f303b..833e827 100644
--- a/src/psaux/psconv.h
+++ b/src/psaux/psconv.h
@@ -20,7 +20,6 @@
 #define PSCONV_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/psaux.h>
 
 FT_BEGIN_HEADER
diff --git a/src/psaux/psfont.c b/src/psaux/psfont.c
index ba584a5..0db1f0c 100644
--- a/src/psaux/psfont.c
+++ b/src/psaux/psfont.c
@@ -36,7 +36,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftcalc.h>
 
 #include "psft.h"
diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
index 9b1711b..4b8f58c 100644
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/psaux.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftcalc.h>
diff --git a/src/psaux/psobjs.h b/src/psaux/psobjs.h
index 6bed57f..fdad672 100644
--- a/src/psaux/psobjs.h
+++ b/src/psaux/psobjs.h
@@ -20,7 +20,6 @@
 #define PSOBJS_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/psaux.h>
 #include <freetype/internal/cffotypes.h>
 
diff --git a/src/psaux/pstypes.h b/src/psaux/pstypes.h
index 8d30481..435ef7e 100644
--- a/src/psaux/pstypes.h
+++ b/src/psaux/pstypes.h
@@ -39,7 +39,6 @@
 #ifndef PSTYPES_H_
 #define PSTYPES_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 
diff --git a/src/psaux/t1cmap.h b/src/psaux/t1cmap.h
index 5dc2c33..0317965 100644
--- a/src/psaux/t1cmap.h
+++ b/src/psaux/t1cmap.h
@@ -19,7 +19,6 @@
 #ifndef T1CMAP_H_
 #define T1CMAP_H_
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/t1types.h>
 
diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
index b42b9c6..5761c53 100644
--- a/src/psaux/t1decode.c
+++ b/src/psaux/t1decode.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftcalc.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/pshints.h>
diff --git a/src/psaux/t1decode.h b/src/psaux/t1decode.h
index 0e0f6e3..b793504 100644
--- a/src/psaux/t1decode.h
+++ b/src/psaux/t1decode.h
@@ -20,7 +20,6 @@
 #define T1DECODE_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/psaux.h>
 #include <freetype/internal/t1types.h>
 
diff --git a/src/pshinter/pshalgo.c b/src/pshinter/pshalgo.c
index 7d68e41..920b9a7 100644
--- a/src/pshinter/pshalgo.c
+++ b/src/pshinter/pshalgo.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftcalc.h>
diff --git a/src/pshinter/pshglob.c b/src/pshinter/pshglob.c
index 6baaf83..cdc1c3a 100644
--- a/src/pshinter/pshglob.c
+++ b/src/pshinter/pshglob.c
@@ -17,7 +17,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftcalc.h>
diff --git a/src/pshinter/pshinter.c b/src/pshinter/pshinter.c
index 6009db5..3cca0ad 100644
--- a/src/pshinter/pshinter.c
+++ b/src/pshinter/pshinter.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "pshalgo.c"
 #include "pshglob.c"
diff --git a/src/pshinter/pshmod.c b/src/pshinter/pshmod.c
index 405edbb..801bf92 100644
--- a/src/pshinter/pshmod.c
+++ b/src/pshinter/pshmod.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include "pshrec.h"
 #include "pshalgo.h"
diff --git a/src/pshinter/pshmod.h b/src/pshinter/pshmod.h
index f5c8626..2a6eb1c 100644
--- a/src/pshinter/pshmod.h
+++ b/src/pshinter/pshmod.h
@@ -20,7 +20,6 @@
 #define PSHMOD_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 
 
diff --git a/src/pshinter/pshrec.c b/src/pshinter/pshrec.c
index df3873d..36debf1 100644
--- a/src/pshinter/pshrec.c
+++ b/src/pshinter/pshrec.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftdebug.h>
diff --git a/src/pshinter/pshrec.h b/src/pshinter/pshrec.h
index e0a4cd1..b13c7be 100644
--- a/src/pshinter/pshrec.h
+++ b/src/pshinter/pshrec.h
@@ -32,7 +32,6 @@
 #define PSHREC_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/pshints.h>
 #include "pshglob.h"
 
diff --git a/src/psnames/psmodule.c b/src/psnames/psmodule.c
index 58e8df8..b38f9d3 100644
--- a/src/psnames/psmodule.c
+++ b/src/psnames/psmodule.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/services/svpscmap.h>
diff --git a/src/psnames/psmodule.h b/src/psnames/psmodule.h
index d0628a8..c85a9ec 100644
--- a/src/psnames/psmodule.h
+++ b/src/psnames/psmodule.h
@@ -20,7 +20,6 @@
 #define PSMODULE_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 
 
diff --git a/src/psnames/psnames.c b/src/psnames/psnames.c
index 5ac3897..cff3685 100644
--- a/src/psnames/psnames.c
+++ b/src/psnames/psnames.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "psmodule.c"
 
diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c
index a633ae1..6a85f25 100644
--- a/src/raster/ftraster.c
+++ b/src/raster/ftraster.c
@@ -62,7 +62,6 @@
 
 #else /* !STANDALONE_ */
 
-#include <ft2build.h>
 #include "ftraster.h"
 #include <freetype/internal/ftcalc.h> /* for FT_MulDiv and FT_MulDiv_No_Round */
 #include <freetype/ftoutln.h>         /* for FT_Outline_Get_CBox              */
diff --git a/src/raster/ftrend1.c b/src/raster/ftrend1.c
index cdb2cfc..57fed9b 100644
--- a/src/raster/ftrend1.c
+++ b/src/raster/ftrend1.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/ftoutln.h>
diff --git a/src/raster/ftrend1.h b/src/raster/ftrend1.h
index caeaa18..3f6be53 100644
--- a/src/raster/ftrend1.h
+++ b/src/raster/ftrend1.h
@@ -20,7 +20,6 @@
 #define FTREND1_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftrender.h>
 
 
diff --git a/src/raster/raster.c b/src/raster/raster.c
index 08431c8..cd37943 100644
--- a/src/raster/raster.c
+++ b/src/raster/raster.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "ftraster.c"
 #include "ftrend1.c"
diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c
index 3acc1d5..7388837 100644
--- a/src/sfnt/pngshim.c
+++ b/src/sfnt/pngshim.c
@@ -17,7 +17,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
diff --git a/src/sfnt/pngshim.h b/src/sfnt/pngshim.h
index d2c9e2b..2d6e83d 100644
--- a/src/sfnt/pngshim.h
+++ b/src/sfnt/pngshim.h
@@ -21,7 +21,6 @@
 #define PNGSHIM_H_
 
 
-#include <ft2build.h>
 #include "ttload.h"
 
 
diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c
index d17b25a..0f463a3 100644
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/sfnt.h>
 #include <freetype/internal/ftobjs.h>
diff --git a/src/sfnt/sfdriver.h b/src/sfnt/sfdriver.h
index ca7c517..1ac2706 100644
--- a/src/sfnt/sfdriver.h
+++ b/src/sfnt/sfdriver.h
@@ -20,7 +20,6 @@
 #define SFDRIVER_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 
 
diff --git a/src/sfnt/sfnt.c b/src/sfnt/sfnt.c
index 9db7935..471239f 100644
--- a/src/sfnt/sfnt.c
+++ b/src/sfnt/sfnt.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "pngshim.c"
 #include "sfdriver.c"
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index 7eb1d4c..22da061 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "sfobjs.h"
 #include "ttload.h"
 #include "ttcmap.h"
diff --git a/src/sfnt/sfobjs.h b/src/sfnt/sfobjs.h
index da9bac5..e8e3042 100644
--- a/src/sfnt/sfobjs.h
+++ b/src/sfnt/sfobjs.h
@@ -20,7 +20,6 @@
 #define SFOBJS_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/sfnt.h>
 #include <freetype/internal/ftobjs.h>
 
diff --git a/src/sfnt/sfwoff.c b/src/sfnt/sfwoff.c
index 7df3535..f0a32e1 100644
--- a/src/sfnt/sfwoff.c
+++ b/src/sfnt/sfwoff.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "sfwoff.h"
 #include <freetype/tttags.h>
 #include <freetype/internal/ftdebug.h>
diff --git a/src/sfnt/sfwoff.h b/src/sfnt/sfwoff.h
index 13f67f7..d177ab1 100644
--- a/src/sfnt/sfwoff.h
+++ b/src/sfnt/sfwoff.h
@@ -20,7 +20,6 @@
 #define SFWOFF_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/sfnt.h>
 #include <freetype/internal/ftobjs.h>
 
diff --git a/src/sfnt/sfwoff2.c b/src/sfnt/sfwoff2.c
index 2714d5c..3f59044 100644
--- a/src/sfnt/sfwoff2.c
+++ b/src/sfnt/sfwoff2.c
@@ -15,7 +15,6 @@
  *
  */
 
-#include <ft2build.h>
 #include "sfwoff2.h"
 #include "woff2tags.h"
 #include <freetype/tttags.h>
diff --git a/src/sfnt/sfwoff2.h b/src/sfnt/sfwoff2.h
index 6b43f27..798f66b 100644
--- a/src/sfnt/sfwoff2.h
+++ b/src/sfnt/sfwoff2.h
@@ -20,7 +20,6 @@
 #define SFWOFF2_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/sfnt.h>
 #include <freetype/internal/ftobjs.h>
 
diff --git a/src/sfnt/ttbdf.c b/src/sfnt/ttbdf.c
index b3f2881..a287d3a 100644
--- a/src/sfnt/ttbdf.c
+++ b/src/sfnt/ttbdf.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
diff --git a/src/sfnt/ttbdf.h b/src/sfnt/ttbdf.h
index a1ed688..e60c01c 100644
--- a/src/sfnt/ttbdf.h
+++ b/src/sfnt/ttbdf.h
@@ -20,7 +20,6 @@
 #define TTBDF_H_
 
 
-#include <ft2build.h>
 #include "ttload.h"
 #include <freetype/ftbdf.h>
 
diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
index 0ac1a96..e54baf9 100644
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include "sferrors.h"                      /* must come before `ftvalid.h' */
diff --git a/src/sfnt/ttcmap.h b/src/sfnt/ttcmap.h
index afe9945..428ad21 100644
--- a/src/sfnt/ttcmap.h
+++ b/src/sfnt/ttcmap.h
@@ -20,7 +20,6 @@
 #define TTCMAP_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/tttypes.h>
 #include <freetype/internal/ftvalid.h>
 #include <freetype/internal/services/svttcmap.h>
diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c
index 082e1a7..7476c42 100644
--- a/src/sfnt/ttcolr.c
+++ b/src/sfnt/ttcolr.c
@@ -27,7 +27,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
diff --git a/src/sfnt/ttcolr.h b/src/sfnt/ttcolr.h
index 8da6b3a..6412162 100644
--- a/src/sfnt/ttcolr.h
+++ b/src/sfnt/ttcolr.h
@@ -22,7 +22,6 @@
 #define __TTCOLR_H__
 
 
-#include <ft2build.h>
 #include "ttload.h"
 
 
diff --git a/src/sfnt/ttcpal.c b/src/sfnt/ttcpal.c
index bded2e3..bdf7bfa 100644
--- a/src/sfnt/ttcpal.c
+++ b/src/sfnt/ttcpal.c
@@ -27,7 +27,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
diff --git a/src/sfnt/ttcpal.h b/src/sfnt/ttcpal.h
index f2e116b..b544be6 100644
--- a/src/sfnt/ttcpal.h
+++ b/src/sfnt/ttcpal.h
@@ -22,7 +22,6 @@
 #define __TTCPAL_H__
 
 
-#include <ft2build.h>
 #include "ttload.h"
 
 
diff --git a/src/sfnt/ttkern.c b/src/sfnt/ttkern.c
index a6df222..d4a70c7 100644
--- a/src/sfnt/ttkern.c
+++ b/src/sfnt/ttkern.c
@@ -17,7 +17,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
diff --git a/src/sfnt/ttkern.h b/src/sfnt/ttkern.h
index 5b0e363..f44b5bd 100644
--- a/src/sfnt/ttkern.h
+++ b/src/sfnt/ttkern.h
@@ -21,7 +21,6 @@
 #define TTKERN_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/tttypes.h>
 
diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c
index c10ddcd..8e9591b 100644
--- a/src/sfnt/ttload.c
+++ b/src/sfnt/ttload.c
@@ -17,7 +17,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
diff --git a/src/sfnt/ttload.h b/src/sfnt/ttload.h
index ba1bece..4e53d8b 100644
--- a/src/sfnt/ttload.h
+++ b/src/sfnt/ttload.h
@@ -21,7 +21,6 @@
 #define TTLOAD_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/tttypes.h>
 
diff --git a/src/sfnt/ttmtx.c b/src/sfnt/ttmtx.c
index ab68f50..0211233 100644
--- a/src/sfnt/ttmtx.c
+++ b/src/sfnt/ttmtx.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
diff --git a/src/sfnt/ttmtx.h b/src/sfnt/ttmtx.h
index 6eb5eb3..dba65ca 100644
--- a/src/sfnt/ttmtx.h
+++ b/src/sfnt/ttmtx.h
@@ -20,7 +20,6 @@
 #define TTMTX_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/tttypes.h>
 
diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c
index db2a2b8..ffc90b6 100644
--- a/src/sfnt/ttpost.c
+++ b/src/sfnt/ttpost.c
@@ -25,7 +25,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c
index 3bd37ad..293c6fd 100644
--- a/src/sfnt/ttsbit.c
+++ b/src/sfnt/ttsbit.c
@@ -19,7 +19,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
diff --git a/src/sfnt/ttsbit.h b/src/sfnt/ttsbit.h
index dfeb886..b867e43 100644
--- a/src/sfnt/ttsbit.h
+++ b/src/sfnt/ttsbit.h
@@ -20,7 +20,6 @@
 #define TTSBIT_H_
 
 
-#include <ft2build.h>
 #include "ttload.h"
 
 
diff --git a/src/sfnt/woff2tags.c b/src/sfnt/woff2tags.c
index 04713bd..9775385 100644
--- a/src/sfnt/woff2tags.c
+++ b/src/sfnt/woff2tags.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/tttags.h>
 
 
diff --git a/src/sfnt/woff2tags.h b/src/sfnt/woff2tags.h
index cd0d386..a312483 100644
--- a/src/sfnt/woff2tags.h
+++ b/src/sfnt/woff2tags.h
@@ -20,7 +20,6 @@
 #define WOFF2TAGS_H
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 
 
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index bbc29ce..fd64548 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -278,7 +278,6 @@ typedef ptrdiff_t  FT_PtrDist;
 #else /* !STANDALONE_ */
 
 
-#include <ft2build.h>
 #include "ftgrays.h"
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftdebug.h>
diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c
index 3b42d43..95e14d3 100644
--- a/src/smooth/ftsmooth.c
+++ b/src/smooth/ftsmooth.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/ftoutln.h>
diff --git a/src/smooth/ftsmooth.h b/src/smooth/ftsmooth.h
index 420b3d6..22a88d5 100644
--- a/src/smooth/ftsmooth.h
+++ b/src/smooth/ftsmooth.h
@@ -20,7 +20,6 @@
 #define FTSMOOTH_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftrender.h>
 
 
diff --git a/src/smooth/smooth.c b/src/smooth/smooth.c
index 6ad9424..04b531c 100644
--- a/src/smooth/smooth.c
+++ b/src/smooth/smooth.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "ftgrays.c"
 #include "ftsmooth.c"
diff --git a/src/tools/test_afm.c b/src/tools/test_afm.c
index c322f0e..a4b2268 100644
--- a/src/tools/test_afm.c
+++ b/src/tools/test_afm.c
@@ -2,7 +2,6 @@
  * gcc -DFT2_BUILD_LIBRARY -I../../include -o test_afm test_afm.c \
  *     -L../../objs/.libs -lfreetype -lz -static
  */
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/psaux.h>
diff --git a/src/tools/test_bbox.c b/src/tools/test_bbox.c
index d17a3ba..d9fd932 100644
--- a/src/tools/test_bbox.c
+++ b/src/tools/test_bbox.c
@@ -1,4 +1,3 @@
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/ftbbox.h>
 
diff --git a/src/tools/test_trig.c b/src/tools/test_trig.c
index 9213cc8..4f3410a 100644
--- a/src/tools/test_trig.c
+++ b/src/tools/test_trig.c
@@ -1,4 +1,3 @@
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/fttrigon.h>
 
diff --git a/src/truetype/truetype.c b/src/truetype/truetype.c
index 1f15b29..41b6808 100644
--- a/src/truetype/truetype.c
+++ b/src/truetype/truetype.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "ttdriver.c"   /* driver interface    */
 #include "ttgload.c"    /* glyph loader        */
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index ce14d78..bf830b1 100644
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/sfnt.h>
diff --git a/src/truetype/ttdriver.h b/src/truetype/ttdriver.h
index 204d353..ee1438e 100644
--- a/src/truetype/ttdriver.h
+++ b/src/truetype/ttdriver.h
@@ -20,7 +20,6 @@
 #define TTDRIVER_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 
 
diff --git a/src/truetype/ttgload.h b/src/truetype/ttgload.h
index 9a8c3e7..8f72cd5 100644
--- a/src/truetype/ttgload.h
+++ b/src/truetype/ttgload.h
@@ -20,7 +20,6 @@
 #define TTGLOAD_H_
 
 
-#include <ft2build.h>
 #include "ttobjs.h"
 
 #ifdef TT_USE_BYTECODE_INTERPRETER
diff --git a/src/truetype/ttgxvar.h b/src/truetype/ttgxvar.h
index 11664e9..26e89bc 100644
--- a/src/truetype/ttgxvar.h
+++ b/src/truetype/ttgxvar.h
@@ -20,7 +20,6 @@
 #define TTGXVAR_H_
 
 
-#include <ft2build.h>
 #include "ttobjs.h"
 
 
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index 6d76339..6aecfb4 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -20,7 +20,6 @@
 /* issues; many thanks!                                                */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftcalc.h>
 #include <freetype/fttrigon.h>
diff --git a/src/truetype/ttinterp.h b/src/truetype/ttinterp.h
index 07e4ad6..2b6c749 100644
--- a/src/truetype/ttinterp.h
+++ b/src/truetype/ttinterp.h
@@ -19,7 +19,6 @@
 #ifndef TTINTERP_H_
 #define TTINTERP_H_
 
-#include <ft2build.h>
 #include "ttobjs.h"
 
 
diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index c5a1887..04d2373 100644
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
diff --git a/src/truetype/ttobjs.h b/src/truetype/ttobjs.h
index 7e81d2a..d986dea 100644
--- a/src/truetype/ttobjs.h
+++ b/src/truetype/ttobjs.h
@@ -20,7 +20,6 @@
 #define TTOBJS_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/tttypes.h>
 
diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c
index 42c9467..bf0f99f 100644
--- a/src/truetype/ttpload.c
+++ b/src/truetype/ttpload.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftstream.h>
diff --git a/src/truetype/ttpload.h b/src/truetype/ttpload.h
index eb5f5a4..bb669e0 100644
--- a/src/truetype/ttpload.h
+++ b/src/truetype/ttpload.h
@@ -20,7 +20,6 @@
 #define TTPLOAD_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/tttypes.h>
 
 
diff --git a/src/truetype/ttsubpix.c b/src/truetype/ttsubpix.c
index c110086..56667de 100644
--- a/src/truetype/ttsubpix.c
+++ b/src/truetype/ttsubpix.c
@@ -15,7 +15,6 @@
  *
  */
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftcalc.h>
 #include <freetype/internal/ftstream.h>
diff --git a/src/truetype/ttsubpix.h b/src/truetype/ttsubpix.h
index 23adf7e..229a6cf 100644
--- a/src/truetype/ttsubpix.h
+++ b/src/truetype/ttsubpix.h
@@ -19,7 +19,6 @@
 #ifndef TTSUBPIX_H_
 #define TTSUBPIX_H_
 
-#include <ft2build.h>
 #include "ttobjs.h"
 #include "ttinterp.h"
 
diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c
index 69295be..b9cd66b 100644
--- a/src/type1/t1afm.c
+++ b/src/type1/t1afm.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "t1afm.h"
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
diff --git a/src/type1/t1afm.h b/src/type1/t1afm.h
index 97b41f3..edf919c 100644
--- a/src/type1/t1afm.h
+++ b/src/type1/t1afm.h
@@ -19,7 +19,6 @@
 #ifndef T1AFM_H_
 #define T1AFM_H_
 
-#include <ft2build.h>
 #include "t1objs.h"
 #include <freetype/internal/t1types.h>
 
diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c
index 87d463b..b786a87 100644
--- a/src/type1/t1driver.c
+++ b/src/type1/t1driver.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "t1driver.h"
 #include "t1gload.h"
 #include "t1load.h"
diff --git a/src/type1/t1driver.h b/src/type1/t1driver.h
index a96dce2..e7eae0b 100644
--- a/src/type1/t1driver.h
+++ b/src/type1/t1driver.h
@@ -20,7 +20,6 @@
 #define T1DRIVER_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 
 
diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c
index 0026ae5..9d04bd2 100644
--- a/src/type1/t1gload.c
+++ b/src/type1/t1gload.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "t1gload.h"
 #include <freetype/internal/ftcalc.h>
 #include <freetype/internal/ftdebug.h>
diff --git a/src/type1/t1gload.h b/src/type1/t1gload.h
index 59fae82..9947507 100644
--- a/src/type1/t1gload.h
+++ b/src/type1/t1gload.h
@@ -20,7 +20,6 @@
 #define T1GLOAD_H_
 
 
-#include <ft2build.h>
 #include "t1objs.h"
 
 
diff --git a/src/type1/t1load.h b/src/type1/t1load.h
index 0712ad6..4396415 100644
--- a/src/type1/t1load.h
+++ b/src/type1/t1load.h
@@ -20,7 +20,6 @@
 #define T1LOAD_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/psaux.h>
 #include <freetype/ftmm.h>
diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
index ff2786b..9defdfc 100644
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftcalc.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
diff --git a/src/type1/t1parse.c b/src/type1/t1parse.c
index 0007d55..74cf38b 100644
--- a/src/type1/t1parse.c
+++ b/src/type1/t1parse.c
@@ -33,7 +33,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/psaux.h>
diff --git a/src/type1/t1parse.h b/src/type1/t1parse.h
index 6aaccb8..1ea0110 100644
--- a/src/type1/t1parse.h
+++ b/src/type1/t1parse.h
@@ -20,7 +20,6 @@
 #define T1PARSE_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/t1types.h>
 #include <freetype/internal/ftstream.h>
 
diff --git a/src/type1/type1.c b/src/type1/type1.c
index 95dbaeb..cadee78 100644
--- a/src/type1/type1.c
+++ b/src/type1/type1.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "t1afm.c"
 #include "t1driver.c"
diff --git a/src/type42/t42drivr.h b/src/type42/t42drivr.h
index 49461ce..8bf2afc 100644
--- a/src/type42/t42drivr.h
+++ b/src/type42/t42drivr.h
@@ -20,7 +20,6 @@
 #define T42DRIVR_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 
 
diff --git a/src/type42/t42objs.h b/src/type42/t42objs.h
index b3452fb..69f5cff 100644
--- a/src/type42/t42objs.h
+++ b/src/type42/t42objs.h
@@ -19,7 +19,6 @@
 #ifndef T42OBJS_H_
 #define T42OBJS_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/t1tables.h>
 #include <freetype/internal/t1types.h>
diff --git a/src/type42/t42types.h b/src/type42/t42types.h
index 01af605..ba0cc21 100644
--- a/src/type42/t42types.h
+++ b/src/type42/t42types.h
@@ -20,7 +20,6 @@
 #define T42TYPES_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/t1tables.h>
 #include <freetype/internal/t1types.h>
diff --git a/src/type42/type42.c b/src/type42/type42.c
index 4739b3c..012559e 100644
--- a/src/type42/type42.c
+++ b/src/type42/type42.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "t42drivr.c"
 #include "t42objs.c"
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index 6931ef4..e83312d 100644
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -18,7 +18,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftwinfnt.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
diff --git a/src/winfonts/winfnt.h b/src/winfonts/winfnt.h
index 0ea8595..3367c77 100644
--- a/src/winfonts/winfnt.h
+++ b/src/winfonts/winfnt.h
@@ -21,7 +21,6 @@
 #define WINFNT_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftwinfnt.h>
 #include <freetype/internal/ftdrv.h>