cleanups
diff --git a/src/base/ftbase.c b/src/base/ftbase.c
index 82d0b14..3918700 100644
--- a/src/base/ftbase.c
+++ b/src/base/ftbase.c
@@ -16,14 +16,14 @@
/***************************************************************************/
-#include <ft2build.h>
-#include FT_SOURCE_FILE(base,ftcalc.c)
-#include FT_SOURCE_FILE(base,ftobjs.c)
-#include FT_SOURCE_FILE(base,ftstream.c)
-#include FT_SOURCE_FILE(base,ftlist.c)
-#include FT_SOURCE_FILE(base,ftoutln.c)
-#include FT_SOURCE_FILE(base,ftextend.c)
-#include FT_SOURCE_FILE(base,ftnames.c)
+#include <ft2build.h>
+#include FT_SOURCE_FILE(base,ftcalc.c)
+#include FT_SOURCE_FILE(base,ftobjs.c)
+#include FT_SOURCE_FILE(base,ftstream.c)
+#include FT_SOURCE_FILE(base,ftlist.c)
+#include FT_SOURCE_FILE(base,ftoutln.c)
+#include FT_SOURCE_FILE(base,ftextend.c)
+#include FT_SOURCE_FILE(base,ftnames.c)
/* END */
diff --git a/src/base/ftbbox.c b/src/base/ftbbox.c
index f6ebb07..657227b 100644
--- a/src/base/ftbbox.c
+++ b/src/base/ftbbox.c
@@ -23,10 +23,11 @@
/* */
/*************************************************************************/
-#include <ft2build.h>
-#include FT_BBOX_H
-#include FT_IMAGE_H
-#include FT_OUTLINE_H
+
+#include <ft2build.h>
+#include FT_BBOX_H
+#include FT_IMAGE_H
+#include FT_OUTLINE_H
typedef struct TBBox_Rec_
diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c
index e955779..c1a3ffd 100644
--- a/src/base/ftcalc.c
+++ b/src/base/ftcalc.c
@@ -30,10 +30,11 @@
/* */
/*************************************************************************/
-#include <ft2build.h>
-#include FT_INTERNAL_CALC_H
-#include FT_INTERNAL_DEBUG_H
-#include FT_INTERNAL_OBJECTS_H
+
+#include <ft2build.h>
+#include FT_INTERNAL_CALC_H
+#include FT_INTERNAL_DEBUG_H
+#include FT_INTERNAL_OBJECTS_H
/*************************************************************************/
diff --git a/src/base/ftdebug.c b/src/base/ftdebug.c
index 3032b4f..d8489c6 100644
--- a/src/base/ftdebug.c
+++ b/src/base/ftdebug.c
@@ -40,8 +40,10 @@
/* */
/*************************************************************************/
-#include <ft2build.h>
-#include FT_INTERNAL_DEBUG_H
+
+#include <ft2build.h>
+#include FT_INTERNAL_DEBUG_H
+
#ifdef FT_DEBUG_LEVEL_TRACE
char ft_trace_levels[trace_max];
diff --git a/src/base/ftextend.c b/src/base/ftextend.c
index 18c39f7..eba24c3 100644
--- a/src/base/ftextend.c
+++ b/src/base/ftextend.c
@@ -24,9 +24,10 @@
/* */
/*************************************************************************/
-#include <ft2build.h>
-#include FT_INTERNAL_EXTEND_H
-#include FT_INTERNAL_DEBUG_H
+
+#include <ft2build.h>
+#include FT_INTERNAL_EXTEND_H
+#include FT_INTERNAL_DEBUG_H
/*************************************************************************/
diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c
index d1b5263..510dcbe 100644
--- a/src/base/ftglyph.c
+++ b/src/base/ftglyph.c
@@ -27,10 +27,11 @@
/* */
/*************************************************************************/
-#include <ft2build.h>
-#include FT_GLYPH_H
-#include FT_OUTLINE_H
-#include FT_INTERNAL_OBJECTS_H
+
+#include <ft2build.h>
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
+#include FT_INTERNAL_OBJECTS_H
/*************************************************************************/
diff --git a/src/base/ftinit.c b/src/base/ftinit.c
index ed61504..f0d1e8d 100644
--- a/src/base/ftinit.c
+++ b/src/base/ftinit.c
@@ -36,11 +36,12 @@
/* */
/*************************************************************************/
-#include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_DEBUG_H
-#include FT_MODULE_H
+
+#include <ft2build.h>
+#include FT_CONFIG_CONFIG_H
+#include FT_INTERNAL_OBJECTS_H
+#include FT_INTERNAL_DEBUG_H
+#include FT_MODULE_H
/*************************************************************************/
diff --git a/src/base/ftlist.c b/src/base/ftlist.c
index f72db24..94564e0 100644
--- a/src/base/ftlist.c
+++ b/src/base/ftlist.c
@@ -23,10 +23,10 @@
/*************************************************************************/
-#include <ft2build.h>
-#include FT_LIST_H
-#include FT_INTERNAL_DEBUG_H
-#include FT_INTERNAL_OBJECTS_H
+#include <ft2build.h>
+#include FT_LIST_H
+#include FT_INTERNAL_DEBUG_H
+#include FT_INTERNAL_OBJECTS_H
/*************************************************************************/
diff --git a/src/base/ftmac.c b/src/base/ftmac.c
index 55ba30a..08681b3 100644
--- a/src/base/ftmac.c
+++ b/src/base/ftmac.c
@@ -56,11 +56,12 @@
and delegate the rest of the work to it, by calling FT_Open_Face().
*/
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_INTERNAL_STREAM_H
-#include FT_SOURCE_FILE(truetype/ttobjs.h)
-#include FT_SOURCE_FILE(type1/t1objs.h)
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_INTERNAL_STREAM_H
+#include FT_SOURCE_FILE(truetype/ttobjs.h)
+#include FT_SOURCE_FILE(type1/t1objs.h)
#include <Resources.h>
#include <Fonts.h>
diff --git a/src/base/ftmm.c b/src/base/ftmm.c
index 24479ef..7e9dbe0 100644
--- a/src/base/ftmm.c
+++ b/src/base/ftmm.c
@@ -15,9 +15,10 @@
/* */
/***************************************************************************/
-#include <ft2build.h>
-#include FT_MULTIPLE_MASTERS_H
-#include FT_INTERNAL_OBJECTS_H
+
+#include <ft2build.h>
+#include FT_MULTIPLE_MASTERS_H
+#include FT_INTERNAL_OBJECTS_H
/*************************************************************************/
diff --git a/src/base/ftnames.c b/src/base/ftnames.c
index de030db..d6ae8b9 100644
--- a/src/base/ftnames.c
+++ b/src/base/ftnames.c
@@ -18,9 +18,10 @@
/* */
/***************************************************************************/
-#include <ft2build.h>
-#include FT_NAMES_H
-#include FT_INTERNAL_TRUETYPE_TYPES_H
+
+#include <ft2build.h>
+#include FT_NAMES_H
+#include FT_INTERNAL_TRUETYPE_TYPES_H
#ifdef TT_CONFIG_OPTION_SFNT_NAMES
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 58e796d..a0c6713 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -15,12 +15,13 @@
/* */
/***************************************************************************/
-#include <ft2build.h>
-#include FT_LIST_H
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_DEBUG_H
-#include FT_INTERNAL_STREAM_H
-#include FT_TRUETYPE_TABLES_H
+
+#include <ft2build.h>
+#include FT_LIST_H
+#include FT_INTERNAL_OBJECTS_H
+#include FT_INTERNAL_DEBUG_H
+#include FT_INTERNAL_STREAM_H
+#include FT_TRUETYPE_TABLES_H
#include <string.h> /* for strcmp() */
diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c
index 1cf7e54..f8294c6 100644
--- a/src/base/ftoutln.c
+++ b/src/base/ftoutln.c
@@ -22,9 +22,10 @@
/* */
/*************************************************************************/
-#include <ft2build.h>
-#include FT_OUTLINE_H
-#include FT_INTERNAL_OBJECTS_H
+
+#include <ft2build.h>
+#include FT_OUTLINE_H
+#include FT_INTERNAL_OBJECTS_H
/*************************************************************************/
diff --git a/src/base/ftstream.c b/src/base/ftstream.c
index 999ae70..1ada68c 100644
--- a/src/base/ftstream.c
+++ b/src/base/ftstream.c
@@ -15,9 +15,10 @@
/* */
/***************************************************************************/
-#include <ft2build.h>
-#include FT_INTERNAL_STREAM_H
-#include FT_INTERNAL_DEBUG_H
+
+#include <ft2build.h>
+#include FT_INTERNAL_STREAM_H
+#include FT_INTERNAL_DEBUG_H
/*************************************************************************/
diff --git a/src/base/ftsynth.c b/src/base/ftsynth.c
index c9cb59b..604e1bf 100644
--- a/src/base/ftsynth.c
+++ b/src/base/ftsynth.c
@@ -15,10 +15,11 @@
/* */
/***************************************************************************/
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H
-#include FT_OUTLINE_H
-#include FT_SYNTHESIS_H
+
+#include <ft2build.h>
+#include FT_INTERNAL_OBJECTS_H
+#include FT_OUTLINE_H
+#include FT_SYNTHESIS_H
#define FT_BOLD_THRESHOLD 0x0100
diff --git a/src/base/ftsystem.c b/src/base/ftsystem.c
index e1eb9f2..5b97e80 100644
--- a/src/base/ftsystem.c
+++ b/src/base/ftsystem.c
@@ -24,12 +24,13 @@
/* */
/*************************************************************************/
-#include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
-#include FT_INTERNAL_DEBUG_H
-#include FT_SYSTEM_H
-#include FT_ERRORS_H
-#include FT_TYPES_H
+
+#include <ft2build.h>
+#include FT_CONFIG_CONFIG_H
+#include FT_INTERNAL_DEBUG_H
+#include FT_SYSTEM_H
+#include FT_ERRORS_H
+#include FT_TYPES_H
#include <stdio.h>
#include <stdlib.h>