- updated all source files to adhere to the new inclusion scheme

- the CFF loader now loads the encodings and charset tables
  though doesn't use them for now

5 files changed, 19 insertions, 55 deletions

diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index 6b67705fb..ca863b7ee 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -122,21 +122,11 @@
 
 #else /* _STANDALONE_ */
 
-
-#ifdef FT_FLAT_COMPILE
-
-#include "ftgrays.h"
-
-#else
-
-#include <smooth/ftgrays.h>
-
-#endif
-
-
-#include <freetype/internal/ftobjs.h>  /* for FT_UNUSED()               */
-#include <freetype/internal/ftdebug.h> /* for FT_TRACE() and FT_ERROR() */
-#include <freetype/ftoutln.h>          /* for FT_Outline_Decompose()    */
+#include  <ft2build.h>
+#include  FT_SOURCE_FILE(smooth,ftgrays.h)
+#include  FT_INTERNAL_OBJECTS_H
+#include  FT_INTERNAL_DEBUG_H
+#include  FT_OUTLINE_H
 
 #define ErrRaster_Invalid_Mode     FT_Err_Cannot_Render_Glyph
 #define ErrRaster_Invalid_Outline  FT_Err_Invalid_Outline
diff --git a/src/smooth/ftgrays.h b/src/smooth/ftgrays.h
index 5055f6d26..cfbd8bbd2 100644
--- a/src/smooth/ftgrays.h
+++ b/src/smooth/ftgrays.h
@@ -25,7 +25,8 @@
 #ifdef _STANDALONE_
 #include "ftimage.h"
 #else
-#include <freetype/ftimage.h>
+#include <ft2build.h>
+#include FT_IMAGE_H
 #endif
 
   /*************************************************************************/
diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c
index 09e1ce7fa..47f201b88 100644
--- a/src/smooth/ftsmooth.c
+++ b/src/smooth/ftsmooth.c
@@ -15,23 +15,11 @@
 /*                                                                         */
 /***************************************************************************/
 
-
-#include <freetype/internal/ftobjs.h>
-#include <freetype/ftoutln.h>
-
-
-#ifdef FT_FLAT_COMPILE
-
-#include "ftsmooth.h"
-#include "ftgrays.h"
-
-#else
-
-#include <smooth/ftsmooth.h>
-#include <smooth/ftgrays.h>
-
-#endif
-
+#include <ft2build.h>
+#include FT_INTERNAL_OBJECTS_H
+#include FT_OUTLINE_H
+#include FT_SOURCE_FILE(smooth,ftsmooth.h)
+#include FT_SOURCE_FILE(smooth,ftgrays.h)
 
   /* initialize renderer -- init its raster */
   static
diff --git a/src/smooth/ftsmooth.h b/src/smooth/ftsmooth.h
index 723b4141b..332e18e8f 100644
--- a/src/smooth/ftsmooth.h
+++ b/src/smooth/ftsmooth.h
@@ -19,13 +19,11 @@
 #ifndef FTSMOOTH_H
 #define FTSMOOTH_H
 
-#include <freetype/ftrender.h>
+#include <ft2build.h>
+#include FT_RENDER_H
 
 
-#ifdef __cplusplus
-  extern "C" {
-#endif
-
+FT_BEGIN_HEADER
 
 #ifndef FT_CONFIG_OPTION_NO_STD_RASTER
   FT_EXPORT_VAR( const FT_Renderer_Class )  ft_std_renderer_class;
@@ -35,10 +33,7 @@
   FT_EXPORT_VAR( const FT_Renderer_Class )  ft_smooth_renderer_class;
 #endif
 
-#ifdef __cplusplus
-  }
-#endif
-
+FT_END_HEADER
 
 #endif /* FTSMOOTH_H */
 
diff --git a/src/smooth/smooth.c b/src/smooth/smooth.c
index 41cc4aea5..d9f186e15 100644
--- a/src/smooth/smooth.c
+++ b/src/smooth/smooth.c
@@ -18,18 +18,8 @@
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
 
-
-#ifdef FT_FLAT_COMPILE
-
-#include "ftgrays.c"
-#include "ftsmooth.c"
-
-#else
-
-#include <smooth/ftgrays.c>
-#include <smooth/ftsmooth.c>
-
-#endif
-
+#include <ft2build.h>
+#include FT_SOURCE_FILE(smooth,ftgrays.c)
+#include FT_SOURCE_FILE(smooth,ftsmooth.c)
 
 /* END */