kc3-lang/ftgl

diff --git a/include/FTFont.h b/include/FTFont.h
index ab3c673..f61a565 100644
--- a/include/FTFont.h
+++ b/include/FTFont.h
@@ -23,11 +23,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef    __FTFont__
-#define    __FTFont__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
+#ifndef __FTFont__
+#define __FTFont__
 
 #include <ftgl.h>
 
@@ -45,15 +42,15 @@ class FTFontImpl;
  * appropriate type.
  *
  * It is good practice after using these functions to test the error
- * code returned. <code>FT_Error Error()</code>. Check the freetype file fterrdef.h
- * for error definitions.
+ * code returned. <code>FT_Error Error()</code>. Check the freetype file
+ * fterrdef.h for error definitions.
  *
  * @see     FTFace
  * @see     FTSize
  */
 class FTGL_EXPORT FTFont
 {
-        /* Allow FTLayout classes to access DoRender and CheckGlyph */
+        /* Allow FTLayout classes to access this->impl. */
         friend class FTLayoutImpl;
 
     public:
@@ -321,12 +318,10 @@ class FTGL_EXPORT FTFont
     protected:
         FTFontImpl *impl;
 };
+
 #endif //__cplusplus
 
-#ifdef __cplusplus
-extern "C" {
-namespace C {
-#endif
+FTGL_BEGIN_C_DECLS
 
 FTGL_EXPORT void ftglDestroyFont(FTGLfont*);
 
@@ -356,10 +351,7 @@ FTGL_EXPORT void  ftglRenderMode (FTGLfont*, const char *, int);
 
 FTGL_EXPORT FT_Error ftglError (FTGLfont*);
 
-#ifdef __cplusplus
-}
-}
-#endif
+FTGL_END_C_DECLS
 
 #endif  //  __FTFont__
 
diff --git a/include/FTGLBitmapFont.h b/include/FTGLBitmapFont.h
index 6ff99ae..606cb76 100644
--- a/include/FTGLBitmapFont.h
+++ b/include/FTGLBitmapFont.h
@@ -64,15 +64,9 @@ class FTGL_EXPORT FTGLBitmapFont : public FTFont
 
 #endif //__cplusplus
 
-#ifdef __cplusplus
-extern "C" {
-namespace C {
-#endif
-FTGL_EXPORT FTGLfont *ftglCreateBitmapFont(const char *fontname);
-#ifdef __cplusplus
-}
-}
-#endif
+FTGL_BEGIN_C_DECLS
+    FTGL_EXPORT FTGLfont *ftglCreateBitmapFont(const char *fontname);
+FTGL_END_C_DECLS
 
 #endif  //  __FTGLBitmapFont__
 
diff --git a/include/FTGLExtrdFont.h b/include/FTGLExtrdFont.h
index 7fd4794..da4fcbb 100644
--- a/include/FTGLExtrdFont.h
+++ b/include/FTGLExtrdFont.h
@@ -64,15 +64,9 @@ class FTGL_EXPORT FTGLExtrdFont : public FTFont
 
 #endif //__cplusplus
 
-#ifdef __cplusplus
-extern "C" {
-namespace C {
-#endif
-FTGL_EXPORT FTGLfont *ftglCreateExtrdFont(const char *fontname);
-#ifdef __cplusplus
-}
-}
-#endif
+FTGL_BEGIN_C_DECLS
+    FTGL_EXPORT FTGLfont *ftglCreateExtrdFont(const char *fontname);
+FTGL_END_C_DECLS
 
 #endif // __FTGLExtrdFont__
 
diff --git a/include/FTGLOutlineFont.h b/include/FTGLOutlineFont.h
index 5c293f9..2c4b5f3 100644
--- a/include/FTGLOutlineFont.h
+++ b/include/FTGLOutlineFont.h
@@ -64,16 +64,8 @@ class FTGL_EXPORT FTGLOutlineFont : public FTFont
 
 #endif //__cplusplus
 
-#ifdef __cplusplus
-namespace C {
-extern "C" {
-#endif
-
-FTGL_EXPORT FTGLfont *ftglCreateOutlineFont(const char *fontname);
-
-#ifdef __cplusplus
-}
-}
-#endif
+FTGL_BEGIN_C_DECLS
+    FTGL_EXPORT FTGLfont *ftglCreateOutlineFont(const char *fontname);
+FTGL_END_C_DECLS
 
 #endif // __FTGLOutlineFont__
diff --git a/include/FTGLPixmapFont.h b/include/FTGLPixmapFont.h
index 4bbeab8..12cb293 100644
--- a/include/FTGLPixmapFont.h
+++ b/include/FTGLPixmapFont.h
@@ -60,15 +60,9 @@ class FTGL_EXPORT FTGLPixmapFont : public FTFont
         ~FTGLPixmapFont();
 };
 
-#ifdef __cplusplus
-extern "C" {
-namespace C {
-#endif
-FTGL_EXPORT FTGLfont *ftglCreatePixmapFont(const char *fontname);
-#ifdef __cplusplus
-}
-}
-#endif
+FTGL_BEGIN_C_DECLS
+    FTGL_EXPORT FTGLfont *ftglCreatePixmapFont(const char *fontname);
+FTGL_END_C_DECLS
 
 #endif  //  __FTGLPixmapFont__
 
diff --git a/include/FTGLPolygonFont.h b/include/FTGLPolygonFont.h
index a34e7f3..bb77574 100644
--- a/include/FTGLPolygonFont.h
+++ b/include/FTGLPolygonFont.h
@@ -64,15 +64,9 @@ class FTGL_EXPORT FTGLPolygonFont : public FTFont
 
 #endif //__cplusplus
 
-#ifdef __cplusplus
-extern "C" {
-namespace C {
-#endif
-FTGL_EXPORT FTGLfont *ftglCreatePolygonFont(const char *fontname);
-#ifdef __cplusplus
-}
-}
-#endif
+FTGL_BEGIN_C_DECLS
+    FTGL_EXPORT FTGLfont *ftglCreatePolygonFont(const char *fontname);
+FTGL_END_C_DECLS
 
 #endif  //  __FTGLPolygonFont__
 
diff --git a/include/FTGLTextureFont.h b/include/FTGLTextureFont.h
index 278c1c5..3e812a4 100644
--- a/include/FTGLTextureFont.h
+++ b/include/FTGLTextureFont.h
@@ -64,15 +64,9 @@ class  FTGL_EXPORT FTGLTextureFont : public FTFont
 
 #endif //__cplusplus
 
-#ifdef __cplusplus
-extern "C" {
-namespace C {
-#endif
-FTGL_EXPORT FTGLfont *ftglCreateTextureFont(const char *fontname);
-#ifdef __cplusplus
-}
-}
-#endif
+FTGL_BEGIN_C_DECLS
+    FTGL_EXPORT FTGLfont *ftglCreateTextureFont(const char *fontname);
+FTGL_END_C_DECLS
 
 #endif // __FTGLTextureFont__
 
diff --git a/include/FTLayout.h b/include/FTLayout.h
index fcce92a..77f1445 100644
--- a/include/FTLayout.h
+++ b/include/FTLayout.h
@@ -70,10 +70,7 @@ class FTGL_EXPORT FTLayout
 
 #endif //__cplusplus
 
-#ifdef __cplusplus
-extern "C" {
-namespace C {
-#endif
+FTGL_BEGIN_C_DECLS
 
 FTGL_EXPORT void ftglDestroyLayout(FTGLlayout*);
 
@@ -100,10 +97,7 @@ FTGL_EXPORT int                 ftglLayoutGetAlignement  (FTGLlayout *);
 FTGL_EXPORT void  ftglLayoutSetLineSpacing (FTGLlayout *, const float);
 FTGL_EXPORT float ftglLayoutGetLineSpacing (FTGLlayout *);
 
-#ifdef __cplusplus
-}
-}
-#endif
+FTGL_END_C_DECLS
 
 #endif  /* __FTLayout__ */
 
diff --git a/include/FTSimpleLayout.h b/include/FTSimpleLayout.h
index c66bc70..26fb6c1 100644
--- a/include/FTSimpleLayout.h
+++ b/include/FTSimpleLayout.h
@@ -122,17 +122,9 @@ class FTGL_EXPORT FTSimpleLayout : public FTLayout
 
 #endif //__cplusplus
 
-#ifdef __cplusplus
-extern "C" {
-namespace C {
-#endif
-
-FTGL_EXPORT FTGLlayout *ftglCreateSimpleLayout();
-
-#ifdef __cplusplus
-}
-}
-#endif
+FTGL_BEGIN_C_DECLS
+    FTGL_EXPORT FTGLlayout *ftglCreateSimpleLayout();
+FTGL_END_C_DECLS
 
 #endif  /* __FTSimpleLayout__ */
 
diff --git a/include/ftgl.h b/include/ftgl.h
index 225c822..cde4e52 100644
--- a/include/ftgl.h
+++ b/include/ftgl.h
@@ -26,24 +26,31 @@
 #ifndef __ftgl__
 #define __ftgl__
 
+/* We need the Freetype headers */
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+/* Floating point types used by the library */
 typedef double   FTGL_DOUBLE;
 typedef float    FTGL_FLOAT;
 
+/* Macros used to declare C-linkage types and symbols */
 #ifdef __cplusplus
-extern "C" {
-namespace C {
+#   define FTGL_BEGIN_C_DECLS extern "C" { namespace FTGL {
+#   define FTGL_END_C_DECLS } }
+#else
+#   define FTGL_BEGIN_C_DECLS
+#   define FTGL_END_C_DECLS
 #endif
 
-struct _FTGLFont;
-typedef struct _FTGLfont FTGLfont;
+FTGL_BEGIN_C_DECLS
 
-struct _FTGLlayout;
-typedef struct _FTGLlayout FTGLlayout;
+    struct _FTGLFont;
+    typedef struct _FTGLfont FTGLfont;
+    struct _FTGLlayout;
+    typedef struct _FTGLlayout FTGLlayout;
 
-#ifdef __cplusplus
-}
-}
-#endif
+FTGL_END_C_DECLS
 
 #ifdef __cplusplus
 namespace FTGL
@@ -53,7 +60,7 @@ namespace FTGL
         RENDER_FRONT = 0x01,
         RENDER_BACK = 0x02,
         RENDER_SIDE = 0x04,
-    } ftglRenderMode;
+    } RenderMode;
 
     typedef enum
     {
diff --git a/src/FTFont.cpp b/src/FTFont.cpp
index 5af2e19..4ecfd47 100644
--- a/src/FTFont.cpp
+++ b/src/FTFont.cpp
@@ -106,11 +106,6 @@ FTFont::~FTFont()
 }
 
 
-//
-//  FTLayoutImpl
-//
-
-
 bool FTFont::Attach(const char* fontFilePath)
 {
     if(impl->face.Attach(fontFilePath))
diff --git a/src/FTFontGlue.cpp b/src/FTFontGlue.cpp
new file mode 100644
index 0000000..489fc7b
--- /dev/null
+++ b/src/FTFontGlue.cpp
@@ -0,0 +1,242 @@
+/*
+ * FTGL - OpenGL font library
+ *
+ * Copyright (c) 2001-2004 Henry Maddocks <ftgl@opengl.geek.nz>
+ *               2008 Éric Beets <ericbeets@free.fr>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "config.h"
+
+#include "FTInternals.h"
+
+FTGL_BEGIN_C_DECLS
+
+static inline FTGLfont *createFTFont(FTGL::FontType type, const char *fontname)
+{
+    FTGLfont *ftgl = (FTGLfont*)malloc(sizeof(FTGLfont));
+    ftgl->type = type;
+    switch(type)
+    {
+        case FTGL::FONT_BITMAP:
+            ftgl->ptr = new FTGLBitmapFont(fontname);
+            break;
+        case FTGL::FONT_PIXMAP:
+            ftgl->ptr = new FTGLPixmapFont(fontname);
+            break;
+        case FTGL::FONT_OUTLINE:
+            ftgl->ptr = new FTGLOutlineFont(fontname);
+            break;
+        case FTGL::FONT_POLYGON:
+            ftgl->ptr = new FTGLPolygonFont(fontname);
+            break;
+        case FTGL::FONT_EXTRUDE:
+            ftgl->ptr = new FTGLExtrdFont(fontname);
+            break;
+        case FTGL::FONT_TEXTURE:
+            ftgl->ptr = new FTGLTextureFont(fontname);
+            break;
+    }
+
+    if(ftgl->ptr->Error())
+    {
+        delete ftgl->ptr;
+        free(ftgl);
+        return NULL;
+    }
+
+    return ftgl;
+}
+
+// FTGLBitmapFont::FTGLBitmapFont();
+FTGLfont* ftglCreateBitmapFont(const char *fontname)
+{
+    FTGLfont *ftgl = createFTFont(FTGL::FONT_BITMAP, fontname);
+    return ftgl;
+}
+
+// FTGLExtrdFont::FTGLExtrdFont();
+FTGLfont* ftglCreateExtrdFont(const char *fontname)
+{
+    FTGLfont *ftgl = createFTFont(FTGL::FONT_EXTRUDE, fontname);
+    return ftgl;
+}
+
+// FTGLOutlineFont::FTGLOutlineFont();
+FTGLfont* ftglCreateOutlineFont(const char *fontname)
+{
+    FTGLfont *ftgl = createFTFont(FTGL::FONT_OUTLINE, fontname);
+    return ftgl;
+}
+
+// FTGLPixmapFont::FTGLPixmapFont();
+FTGLfont* ftglCreatePixmapFont(const char *fontname)
+{
+    FTGLfont *ftgl = createFTFont(FTGL::FONT_PIXMAP, fontname);
+    return ftgl;
+}
+
+// FTGLPolygonFont::FTGLPolygonFont();
+FTGLfont* ftglCreatePolygonFont(const char *fontname)
+{
+    FTGLfont *ftgl = createFTFont(FTGL::FONT_POLYGON, fontname);
+    return ftgl;
+}
+
+// FTGLTextureFont::FTGLTextureFont();
+FTGLfont* ftglCreateTextureFont(const char *fontname)
+{
+    FTGLfont *ftgl = createFTFont(FTGL::FONT_TEXTURE, fontname);
+    return ftgl;
+}
+
+#define C_FUN(cret, cname, cargs, cxxerr, cxxname, cxxarg) \
+    cret cname cargs \
+    { \
+        if(!f || !f->ptr) \
+        { \
+            fprintf(stderr, "FTGL warning: NULL pointer in %s\n", #cname); \
+            cxxerr; \
+        } \
+        switch(f->type) \
+        { \
+            case FTGL::FONT_BITMAP: \
+                return dynamic_cast<FTGLBitmapFont*>(f->ptr)->cxxname cxxarg; \
+            case FTGL::FONT_EXTRUDE: \
+                return dynamic_cast<FTGLExtrdFont*>(f->ptr)->cxxname cxxarg; \
+            case FTGL::FONT_OUTLINE: \
+                return dynamic_cast<FTGLOutlineFont*>(f->ptr)->cxxname cxxarg; \
+            case FTGL::FONT_PIXMAP: \
+                return dynamic_cast<FTGLPixmapFont*>(f->ptr)->cxxname cxxarg; \
+            case FTGL::FONT_POLYGON: \
+                return dynamic_cast<FTGLPolygonFont*>(f->ptr)->cxxname cxxarg; \
+            case FTGL::FONT_TEXTURE: \
+                return dynamic_cast<FTGLTextureFont*>(f->ptr)->cxxname cxxarg; \
+        } \
+        fprintf(stderr, "FTGL warning: %s not implemented for %d\n", #cname, f->type); \
+        cxxerr; \
+    }
+
+// FTFont::~FTFont();
+void ftglDestroyFont(FTGLfont *f)
+{
+    if(!f || !f->ptr)
+    {
+        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __FUNCTION__);
+        return;
+    }
+    switch(f->type)
+    {
+        case FTGL::FONT_BITMAP:
+            delete dynamic_cast<FTGLBitmapFont*>(f->ptr); break;
+        case FTGL::FONT_EXTRUDE:
+            delete dynamic_cast<FTGLExtrdFont*>(f->ptr); break;
+        case FTGL::FONT_OUTLINE:
+            delete dynamic_cast<FTGLOutlineFont*>(f->ptr); break;
+        case FTGL::FONT_PIXMAP:
+            delete dynamic_cast<FTGLPixmapFont*>(f->ptr); break;
+        case FTGL::FONT_POLYGON:
+            delete dynamic_cast<FTGLPolygonFont*>(f->ptr); break;
+        case FTGL::FONT_TEXTURE:
+            delete dynamic_cast<FTGLTextureFont*>(f->ptr); break;
+        default:
+            fprintf(stderr, "FTGL warning: %s not implemented for %d\n",
+                            __FUNCTION__, f->type);
+            break;
+    }
+
+    f->ptr = NULL;
+}
+
+// bool FTFont::Attach(const char* fontFilePath);
+C_FUN(int, ftglAttachFile, (FTGLfont *f, const char* path),
+      return 0, Attach, (path));
+
+// bool FTFont::Attach(const unsigned char *pBufferBytes,
+//                     size_t bufferSizeInBytes);
+C_FUN(int, ftglAttachData, (FTGLfont *f, const unsigned char *p, size_t s),
+      return 0, Attach, (p, s));
+
+// bool FTFont::CharMap(FT_Encoding encoding);
+C_FUN(int, ftglCharMap, (FTGLfont *f, FT_Encoding enc),
+      return 0, CharMap, (enc));
+
+// unsigned int FTFont::CharMapCount();
+C_FUN(unsigned int, ftglCharMapCount, (FTGLfont *f),
+      return 0, CharMapCount, ());
+
+// FT_Encoding* FTFont::CharMapList();
+C_FUN(FT_Encoding *, ftglCharMapList, (FTGLfont* f),
+      return NULL, CharMapList, ());
+
+// virtual bool FTFont::FaceSize(const unsigned int size,
+//                               const unsigned int res = 72);
+C_FUN(int, ftglSetFaceSize, (FTGLfont *f, unsigned int s),
+      return 0, FaceSize, (s));
+C_FUN(int, ftglSetFaceSizeRes, (FTGLfont *f, unsigned int s, unsigned int r),
+      return 0, FaceSize, (s, r));
+
+// unsigned int FTFont::FaceSize() const;
+// XXX: need to call FaceSize() as FTFont::FaceSize() because of FTGLTexture
+C_FUN(unsigned int, ftglGetFaceSize, (FTGLfont *f),
+      return 0, FTFont::FaceSize, ());
+
+// virtual void FTFont::Depth(float depth);
+C_FUN(void, ftglSetDepth, (FTGLfont *f, float d), return, Depth, (d));
+
+// virtual void FTFont::Outset(float front, float back);
+C_FUN(void, ftglSetOutset, (FTGLfont *f, float front, float back),
+      return, FTFont::Outset, (front, back));
+
+// void FTFont::UseDisplayList(bool useList);
+C_FUN(void, ftglUseDisplayList, (FTGLfont *f, int l),
+      return, UseDisplayList, (l));
+
+// float FTFont::Ascender() const;
+C_FUN(float, ftglAscender, (FTGLfont *f), return 0.f, Ascender, ());
+
+// float FTFont::Descender() const;
+C_FUN(float, ftglDescender, (FTGLfont *f), return 0.f, Descender, ());
+
+// float FTFont::LineHeight() const;
+C_FUN(float, ftglLineHeight, (FTGLfont *f), return 0.f, LineHeight, ());
+
+// void FTFont::BBox(const char* string, float& llx, float& lly, float& llz,
+//                   float& urx, float& ury, float& urz);
+C_FUN(void, ftglBBox, (FTGLfont *f, const char* s, float c[6]),
+      return, BBox, (s, c[0], c[1], c[2], c[3], c[4], c[5]));
+
+// float FTFont::Advance(const char* string);
+C_FUN(float, ftglAdvance, (FTGLfont *f, const char* s),
+      return 0.f, Advance, (s));
+
+// virtual void FTFont::Render(const char* string);
+C_FUN(void, ftglRender, (FTGLfont *f, const char * s), return, Render, (s));
+
+// virtual void Render(const char* string, int renderMode);
+C_FUN(void, ftglRenderMode, (FTGLfont *f, const char *s, int r),
+      return, Render, (s, r));
+
+// FT_Error FTFont::Error() const;
+C_FUN(FT_Error, ftglError, (FTGLfont *f), return -1, Error, ());
+
+FTGL_END_C_DECLS
+
diff --git a/src/FTGLBitmapFont.cpp b/src/FTGLBitmapFont.cpp
index 019bf12..01208d4 100644
--- a/src/FTGLBitmapFont.cpp
+++ b/src/FTGLBitmapFont.cpp
@@ -122,13 +122,3 @@ void FTGLBitmapFontImpl::Render(const wchar_t* string)
     RenderI(string);
 }
 
-
-namespace C
-{
-    extern "C" FTGLfont* ftglCreateBitmapFont(const char *fontname)
-    {
-        FTGLfont *ftgl = createFTFont(FTGL::FONT_BITMAP, fontname);
-        return ftgl;
-    }
-}
-
diff --git a/src/FTGLExtrdFont.cpp b/src/FTGLExtrdFont.cpp
index af38f93..e2fedac 100644
--- a/src/FTGLExtrdFont.cpp
+++ b/src/FTGLExtrdFont.cpp
@@ -102,13 +102,3 @@ FTGlyph* FTGLExtrdFontImpl::MakeGlyph(unsigned int glyphIndex)
     return NULL;
 }
 
-
-namespace C
-{
-    extern "C" FTGLfont* ftglCreateExtrdFont(const char *fontname)
-    {
-        FTGLfont *ftgl = createFTFont(FTGL::FONT_EXTRUDE, fontname);
-        return ftgl;
-    }
-}
-
diff --git a/src/FTGLOutlineFont.cpp b/src/FTGLOutlineFont.cpp
index 79de09f..25b8539 100644
--- a/src/FTGLOutlineFont.cpp
+++ b/src/FTGLOutlineFont.cpp
@@ -124,13 +124,3 @@ void FTGLOutlineFontImpl::Render(const wchar_t* string)
     RenderI(string);
 }
 
-
-namespace C
-{
-    extern "C" FTGLfont* ftglCreateOutlineFont(const char *fontname)
-    {
-        FTGLfont *ftgl = createFTFont(FTGL::FONT_OUTLINE, fontname);
-        return ftgl;
-    }
-}
-
diff --git a/src/FTGLPixmapFont.cpp b/src/FTGLPixmapFont.cpp
index dd8f9f5..d1d1eb9 100644
--- a/src/FTGLPixmapFont.cpp
+++ b/src/FTGLPixmapFont.cpp
@@ -137,13 +137,3 @@ void FTGLPixmapFontImpl::Render(const wchar_t* string)
     RenderI(string);
 }
 
-
-namespace C
-{
-    extern "C" FTGLfont* ftglCreatePixmapFont(const char *fontname)
-    {
-        FTGLfont *ftgl = createFTFont(FTGL::FONT_PIXMAP, fontname);
-        return ftgl;
-    }
-}
-
diff --git a/src/FTGLPolygonFont.cpp b/src/FTGLPolygonFont.cpp
index 8075adc..cb85688 100644
--- a/src/FTGLPolygonFont.cpp
+++ b/src/FTGLPolygonFont.cpp
@@ -99,13 +99,3 @@ FTGlyph* FTGLPolygonFontImpl::MakeGlyph(unsigned int g)
     return NULL;
 }
 
-
-namespace C
-{
-    extern "C" FTGLfont* ftglCreatePolygonFont(const char *fontname)
-    {
-        FTGLfont *ftgl = createFTFont(FTGL::FONT_POLYGON, fontname);
-        return ftgl;
-    }
-}
-
diff --git a/src/FTGLTextureFont.cpp b/src/FTGLTextureFont.cpp
index 2bea85a..561bb0b 100644
--- a/src/FTGLTextureFont.cpp
+++ b/src/FTGLTextureFont.cpp
@@ -238,13 +238,3 @@ void FTGLTextureFontImpl::Render(const wchar_t* string)
     RenderI(string);
 }
 
-
-namespace C
-{
-    extern "C" FTGLfont* ftglCreateTextureFont(const char *fontname)
-    {
-        FTGLfont *ftgl = createFTFont(FTGL::FONT_TEXTURE, fontname);
-        return ftgl;
-    }
-}
-
diff --git a/src/FTGlue.cpp b/src/FTGlue.cpp
deleted file mode 100644
index 9febd34..0000000
--- a/src/FTGlue.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * FTGL - OpenGL font library
- *
- * Copyright (c) 2001-2004 Henry Maddocks <ftgl@opengl.geek.nz>
- *               2008 Éric Beets <ericbeets@free.fr>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "config.h"
-
-#include "FTInternals.h"
-
-namespace C
-{
-
-//
-//  C wrappers for FTFont
-//
-
-#define C_FUN(cret, cname, cargs, cxxerr, cxxname, cxxarg) \
-    cret cname cargs \
-    { \
-        if(!f || !f->ptr) \
-        { \
-            fprintf(stderr, "FTGL warning: NULL pointer in %s\n", #cname); \
-            cxxerr; \
-        } \
-        switch(f->type) \
-        { \
-            case FTGL::FONT_BITMAP: \
-                return dynamic_cast<FTGLBitmapFont*>(f->ptr)->cxxname cxxarg; \
-            case FTGL::FONT_EXTRUDE: \
-                return dynamic_cast<FTGLExtrdFont*>(f->ptr)->cxxname cxxarg; \
-            case FTGL::FONT_OUTLINE: \
-                return dynamic_cast<FTGLOutlineFont*>(f->ptr)->cxxname cxxarg; \
-            case FTGL::FONT_PIXMAP: \
-                return dynamic_cast<FTGLPixmapFont*>(f->ptr)->cxxname cxxarg; \
-            case FTGL::FONT_POLYGON: \
-                return dynamic_cast<FTGLPolygonFont*>(f->ptr)->cxxname cxxarg; \
-            case FTGL::FONT_TEXTURE: \
-                return dynamic_cast<FTGLTextureFont*>(f->ptr)->cxxname cxxarg; \
-        } \
-        fprintf(stderr, "FTGL warning: %s not implemented for %d\n", #cname, f->type); \
-        cxxerr; \
-    }
-
-// FTFont::~FTFont();
-void ftglDestroyFont(FTGLfont *f)
-{
-    if(!f || !f->ptr)
-    {
-        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __FUNCTION__);
-        return;
-    }
-    switch(f->type)
-    {
-        case FTGL::FONT_BITMAP:
-            delete dynamic_cast<FTGLBitmapFont*>(f->ptr); break;
-        case FTGL::FONT_EXTRUDE:
-            delete dynamic_cast<FTGLExtrdFont*>(f->ptr); break;
-        case FTGL::FONT_OUTLINE:
-            delete dynamic_cast<FTGLOutlineFont*>(f->ptr); break;
-        case FTGL::FONT_PIXMAP:
-            delete dynamic_cast<FTGLPixmapFont*>(f->ptr); break;
-        case FTGL::FONT_POLYGON:
-            delete dynamic_cast<FTGLPolygonFont*>(f->ptr); break;
-        case FTGL::FONT_TEXTURE:
-            delete dynamic_cast<FTGLTextureFont*>(f->ptr); break;
-        default:
-            fprintf(stderr, "FTGL warning: %s not implemented for %d\n",
-                            __FUNCTION__, f->type);
-            break;
-    }
-
-    f->ptr = NULL;
-}
-
-// bool FTFont::Attach(const char* fontFilePath);
-C_FUN(int, ftglAttachFile, (FTGLfont *f, const char* path),
-      return 0, Attach, (path));
-
-// bool FTFont::Attach(const unsigned char *pBufferBytes,
-//                     size_t bufferSizeInBytes);
-C_FUN(int, ftglAttachData, (FTGLfont *f, const unsigned char *p, size_t s),
-      return 0, Attach, (p, s));
-
-// bool FTFont::CharMap(FT_Encoding encoding);
-C_FUN(int, ftglCharMap, (FTGLfont *f, FT_Encoding enc),
-      return 0, CharMap, (enc));
-
-// unsigned int FTFont::CharMapCount();
-C_FUN(unsigned int, ftglCharMapCount, (FTGLfont *f),
-      return 0, CharMapCount, ());
-
-// FT_Encoding* FTFont::CharMapList();
-C_FUN(FT_Encoding *, ftglCharMapList, (FTGLfont* f),
-      return NULL, CharMapList, ());
-
-// virtual bool FTFont::FaceSize(const unsigned int size,
-//                               const unsigned int res = 72);
-C_FUN(int, ftglSetFaceSize, (FTGLfont *f, unsigned int s),
-      return 0, FaceSize, (s));
-C_FUN(int, ftglSetFaceSizeRes, (FTGLfont *f, unsigned int s, unsigned int r),
-      return 0, FaceSize, (s, r));
-
-// unsigned int FTFont::FaceSize() const;
-// XXX: need to call FaceSize() as FTFont::FaceSize() because of FTGLTexture
-C_FUN(unsigned int, ftglGetFaceSize, (FTGLfont *f),
-      return 0, FTFont::FaceSize, ());
-
-// virtual void FTFont::Depth(float depth);
-C_FUN(void, ftglSetDepth, (FTGLfont *f, float d), return, Depth, (d));
-
-// virtual void FTFont::Outset(float front, float back);
-C_FUN(void, ftglSetOutset, (FTGLfont *f, float front, float back),
-      return, FTFont::Outset, (front, back));
-
-// void FTFont::UseDisplayList(bool useList);
-C_FUN(void, ftglUseDisplayList, (FTGLfont *f, int l),
-      return, UseDisplayList, (l));
-
-// float FTFont::Ascender() const;
-C_FUN(float, ftglAscender, (FTGLfont *f), return 0.f, Ascender, ());
-
-// float FTFont::Descender() const;
-C_FUN(float, ftglDescender, (FTGLfont *f), return 0.f, Descender, ());
-
-// float FTFont::LineHeight() const;
-C_FUN(float, ftglLineHeight, (FTGLfont *f), return 0.f, LineHeight, ());
-
-// void FTFont::BBox(const char* string, float& llx, float& lly, float& llz,
-//                   float& urx, float& ury, float& urz);
-C_FUN(void, ftglBBox, (FTGLfont *f, const char* s, float c[6]),
-      return, BBox, (s, c[0], c[1], c[2], c[3], c[4], c[5]));
-
-// float FTFont::Advance(const char* string);
-C_FUN(float, ftglAdvance, (FTGLfont *f, const char* s),
-      return 0.f, Advance, (s));
-
-// virtual void FTFont::Render(const char* string);
-C_FUN(void, ftglRender, (FTGLfont *f, const char * s), return, Render, (s));
-
-// virtual void Render(const char* string, int renderMode);
-C_FUN(void, ftglRenderMode, (FTGLfont *f, const char *s, int r),
-      return, Render, (s, r));
-
-// FT_Error FTFont::Error() const;
-C_FUN(FT_Error, ftglError, (FTGLfont *f), return -1, Error, ());
-
-#undef C_FUN
-
-//
-//  C wrappers for FTLayout
-//
-
-#define C_FUN(cret, cname, cargs, cxxerr, cxxname, cxxarg) \
-    cret cname cargs \
-    { \
-        if(!f || !f->ptr) \
-        { \
-            fprintf(stderr, "FTGL warning: NULL pointer in %s\n", #cname); \
-            cxxerr; \
-        } \
-        switch(f->type) \
-        { \
-            case FTGL::LAYOUT_SIMPLE: \
-                return dynamic_cast<FTSimpleLayout*>(f->ptr)->cxxname cxxarg; \
-        } \
-        fprintf(stderr, "FTGL warning: %s not implemented for %d\n", #cname, f->type); \
-        cxxerr; \
-    }
-
-// FTLayout::~FTLayout();
-void ftglDestroyLayout(FTGLlayout *f)
-{
-    if(!f || !f->ptr)
-    {
-        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __FUNCTION__);
-        return;
-    }
-    switch(f->type)
-    {
-        case FTGL::LAYOUT_SIMPLE:
-            delete dynamic_cast<FTSimpleLayout*>(f->ptr); break;
-        default:
-            fprintf(stderr, "FTGL warning: %s not implemented for %d\n",
-                            __FUNCTION__, f->type);
-    }
-
-    f->ptr = NULL;
-}
-
-// virtual void BBox(const char* string, float& llx, float& lly, float& llz, float& urx, float& ury, float& urz)
-C_FUN(void, ftglLayoutBBox, (FTGLlayout *f, const char * s, float c[6]),
-      return, BBox, (s, c[0], c[1], c[2], c[3], c[4], c[5]));
-
-// virtual void Render(const char* string);
-C_FUN(void, ftglLayoutRender, (FTGLlayout *f, const char *s),
-      return, Render, (s));
-
-// virtual void Render(const char* string, int renderMode);
-C_FUN(void, ftglLayoutRenderMode, (FTGLlayout *f, const char *s, int r),
-      return, Render, (s, r));
-
-// void RenderSpace(const char *string, const float ExtraSpace = 0.0)
-C_FUN(void, ftglLayoutRenderSpace, (FTGLlayout *f, const char *s, float e),
-      return, RenderSpace, (s, e));
-
-// void SetFont(FTFont *fontInit)
-void ftglLayoutSetFont(FTGLlayout *f, FTGLfont *font)
-{
-    if(!f || !f->ptr)
-    {
-        //XXX fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __func__);
-        return;
-    }
-    switch(f->type)
-    {
-        case FTGL::LAYOUT_SIMPLE:
-            f->font = font;
-            return dynamic_cast<FTSimpleLayout*>(f->ptr)->SetFont(font->ptr);
-    }
-    fprintf(stderr, "FTGL warning: %s not implemented for %d\n",
-                    __FUNCTION__, f->type);
-}
-
-// FTFont *GetFont()
-FTGLfont *ftglLayoutGetFont(FTGLlayout *f)
-{
-    if(!f || !f->ptr)
-    {
-        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __FUNCTION__);
-        return NULL;
-    }
-    return f->font;
-}
-
-// void SetLineLength(const float LineLength);
-C_FUN(void, ftglLayoutSetLineLength, (FTGLlayout *f, const float length),
-      return, SetLineLength, (length));
-
-// float GetLineLength() const
-C_FUN(float, ftglLayoutGetLineLength, (FTGLlayout *f),
-      return 0.0f, GetLineLength, ());
-
-// void SetAlignment(const TextAlignment Alignment)
-C_FUN(void, ftglLayoutSetAlignment, (FTGLlayout *f, FTGL::TextAlignment a),
-      return, SetAlignment, (a));
-
-// TextAlignment GetAlignment() const
-C_FUN(FTGL::TextAlignment, ftglLayoutGetAlignement, (FTGLlayout *f),
-      return FTGL::ALIGN_LEFT, GetAlignment, ());
-
-// void SetLineSpacing(const float LineSpacing)
-C_FUN(void, ftglLayoutSetLineSpacing, (FTGLlayout *f, const float l),
-      return, SetLineSpacing, (l));
-
-// float GetLineSpacing() const
-C_FUN(float, ftglLayoutGetLineSpacing, (FTGLlayout *f),
-      return 0.0f, GetLineSpacing, ());
-
-} // namespace C
-
diff --git a/src/FTGlyphGlue.cpp b/src/FTGlyphGlue.cpp
new file mode 100644
index 0000000..b5b31ec
--- /dev/null
+++ b/src/FTGlyphGlue.cpp
@@ -0,0 +1,38 @@
+/*
+ * FTGL - OpenGL font library
+ *
+ * Copyright (c) 2001-2004 Henry Maddocks <ftgl@opengl.geek.nz>
+ *               2008 Éric Beets <ericbeets@free.fr>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "config.h"
+
+#include "FTInternals.h"
+
+FTGL_BEGIN_C_DECLS
+
+//
+//  C wrappers for FTGlyph
+//
+
+FTGL_END_C_DECLS
+
diff --git a/src/FTInternals.h b/src/FTInternals.h
index 138de30..0b58c51 100644
--- a/src/FTInternals.h
+++ b/src/FTInternals.h
@@ -88,11 +88,7 @@
     #endif
 #endif
 
-
-#ifdef __cplusplus
-extern "C" {
-namespace C {
-#endif
+FTGL_BEGIN_C_DECLS
 
 struct _FTGLfont
 {
@@ -100,42 +96,6 @@ struct _FTGLfont
     FTGL::FontType type;
 };
 
-static inline FTGLfont *createFTFont(FTGL::FontType type, const char *fontname)
-{
-    FTGLfont *ftgl = (FTGLfont*)malloc(sizeof(FTGLfont));
-    ftgl->type = type;
-    switch(type)
-    {
-        case FTGL::FONT_BITMAP:
-            ftgl->ptr = new FTGLBitmapFont(fontname);
-            break;
-        case FTGL::FONT_PIXMAP:
-            ftgl->ptr = new FTGLPixmapFont(fontname);
-            break;
-        case FTGL::FONT_OUTLINE:
-            ftgl->ptr = new FTGLOutlineFont(fontname);
-            break;
-        case FTGL::FONT_POLYGON:
-            ftgl->ptr = new FTGLPolygonFont(fontname);
-            break;
-        case FTGL::FONT_EXTRUDE:
-            ftgl->ptr = new FTGLExtrdFont(fontname);
-            break;
-        case FTGL::FONT_TEXTURE:
-            ftgl->ptr = new FTGLTextureFont(fontname);
-            break;
-    }
-
-    if(ftgl->ptr->Error())
-    {
-        delete ftgl->ptr;
-        free(ftgl);
-        return NULL;
-    }
-
-    return ftgl;
-}
-
 struct _FTGLlayout
 {
     FTLayout *ptr;
@@ -143,24 +103,7 @@ struct _FTGLlayout
     FTGL::LayoutType type;
 };
 
-static inline FTGLlayout *createFTLayout(FTGL::LayoutType type)
-{
-    FTGLlayout *layout = (FTGLlayout*)malloc(sizeof(FTGLlayout));
-    layout->font = NULL;
-    layout->type = type;
-    switch(type)
-    {
-        case FTGL::LAYOUT_SIMPLE:
-            layout->ptr = new FTSimpleLayout();
-            break;
-    }
-    return layout;
-}
-
-#ifdef __cplusplus
-}
-}
-#endif
+FTGL_END_C_DECLS
 
 #endif  //__FTINTERNALS_H__
 
diff --git a/src/FTLayoutGlue.cpp b/src/FTLayoutGlue.cpp
new file mode 100644
index 0000000..3ed890f
--- /dev/null
+++ b/src/FTLayoutGlue.cpp
@@ -0,0 +1,161 @@
+/*
+ * FTGL - OpenGL font library
+ *
+ * Copyright (c) 2001-2004 Henry Maddocks <ftgl@opengl.geek.nz>
+ *               2008 Éric Beets <ericbeets@free.fr>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "config.h"
+
+#include "FTInternals.h"
+
+FTGL_BEGIN_C_DECLS
+
+static inline FTGLlayout *createFTLayout(FTGL::LayoutType type)
+{
+    FTGLlayout *layout = (FTGLlayout*)malloc(sizeof(FTGLlayout));
+    layout->font = NULL;
+    layout->type = type;
+    switch(type)
+    {
+        case FTGL::LAYOUT_SIMPLE:
+            layout->ptr = new FTSimpleLayout();
+            break;
+    }
+    return layout;
+}
+
+// FTSimpleLayout::FTSimpleLayout();
+FTGLlayout* ftglCreateSimpleLayout()
+{
+    FTGLlayout *layout = createFTLayout(FTGL::LAYOUT_SIMPLE);
+    return layout;
+}
+
+#define C_FUN(cret, cname, cargs, cxxerr, cxxname, cxxarg) \
+    cret cname cargs \
+    { \
+        if(!f || !f->ptr) \
+        { \
+            fprintf(stderr, "FTGL warning: NULL pointer in %s\n", #cname); \
+            cxxerr; \
+        } \
+        switch(f->type) \
+        { \
+            case FTGL::LAYOUT_SIMPLE: \
+                return dynamic_cast<FTSimpleLayout*>(f->ptr)->cxxname cxxarg; \
+        } \
+        fprintf(stderr, "FTGL warning: %s not implemented for %d\n", #cname, f->type); \
+        cxxerr; \
+    }
+
+// FTLayout::~FTLayout();
+void ftglDestroyLayout(FTGLlayout *f)
+{
+    if(!f || !f->ptr)
+    {
+        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __FUNCTION__);
+        return;
+    }
+    switch(f->type)
+    {
+        case FTGL::LAYOUT_SIMPLE:
+            delete dynamic_cast<FTSimpleLayout*>(f->ptr); break;
+        default:
+            fprintf(stderr, "FTGL warning: %s not implemented for %d\n",
+                            __FUNCTION__, f->type);
+    }
+
+    f->ptr = NULL;
+}
+
+// virtual void BBox(const char* string, float& llx, float& lly, float& llz, float& urx, float& ury, float& urz)
+C_FUN(void, ftglLayoutBBox, (FTGLlayout *f, const char * s, float c[6]),
+      return, BBox, (s, c[0], c[1], c[2], c[3], c[4], c[5]));
+
+// virtual void Render(const char* string);
+C_FUN(void, ftglLayoutRender, (FTGLlayout *f, const char *s),
+      return, Render, (s));
+
+// virtual void Render(const char* string, int renderMode);
+C_FUN(void, ftglLayoutRenderMode, (FTGLlayout *f, const char *s, int r),
+      return, Render, (s, r));
+
+// void RenderSpace(const char *string, const float ExtraSpace = 0.0)
+C_FUN(void, ftglLayoutRenderSpace, (FTGLlayout *f, const char *s, float e),
+      return, RenderSpace, (s, e));
+
+// void SetFont(FTFont *fontInit)
+void ftglLayoutSetFont(FTGLlayout *f, FTGLfont *font)
+{
+    if(!f || !f->ptr)
+    {
+        //XXX fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __func__);
+        return;
+    }
+    switch(f->type)
+    {
+        case FTGL::LAYOUT_SIMPLE:
+            f->font = font;
+            return dynamic_cast<FTSimpleLayout*>(f->ptr)->SetFont(font->ptr);
+    }
+    fprintf(stderr, "FTGL warning: %s not implemented for %d\n",
+                    __FUNCTION__, f->type);
+}
+
+// FTFont *GetFont()
+FTGLfont *ftglLayoutGetFont(FTGLlayout *f)
+{
+    if(!f || !f->ptr)
+    {
+        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __FUNCTION__);
+        return NULL;
+    }
+    return f->font;
+}
+
+// void SetLineLength(const float LineLength);
+C_FUN(void, ftglLayoutSetLineLength, (FTGLlayout *f, const float length),
+      return, SetLineLength, (length));
+
+// float GetLineLength() const
+C_FUN(float, ftglLayoutGetLineLength, (FTGLlayout *f),
+      return 0.0f, GetLineLength, ());
+
+// void SetAlignment(const TextAlignment Alignment)
+C_FUN(void, ftglLayoutSetAlignment, (FTGLlayout *f, FTGL::TextAlignment a),
+      return, SetAlignment, (a));
+
+// TextAlignment GetAlignment() const
+C_FUN(FTGL::TextAlignment, ftglLayoutGetAlignement, (FTGLlayout *f),
+      return FTGL::ALIGN_LEFT, GetAlignment, ());
+
+// void SetLineSpacing(const float LineSpacing)
+C_FUN(void, ftglLayoutSetLineSpacing, (FTGLlayout *f, const float l),
+      return, SetLineSpacing, (l));
+
+// float GetLineSpacing() const
+C_FUN(float, ftglLayoutGetLineSpacing, (FTGLlayout *f),
+      return 0.0f, GetLineSpacing, ());
+
+FTGL_END_C_DECLS
+
diff --git a/src/FTSimpleLayout.cpp b/src/FTSimpleLayout.cpp
index d6b79c6..4224de4 100644
--- a/src/FTSimpleLayout.cpp
+++ b/src/FTSimpleLayout.cpp
@@ -461,12 +461,3 @@ void FTSimpleLayoutImpl::RenderSpace(const wchar_t *string, const int start,
     RenderSpaceI(string, start, end, renderMode, ExtraSpace);
 }
 
-namespace C
-{
-    extern "C" FTGLlayout* ftglCreateSimpleLayout()
-    {
-        FTGLlayout *layout = createFTLayout(FTGL::LAYOUT_SIMPLE);
-        return layout;
-    }
-}
-
diff --git a/src/Makefile.am b/src/Makefile.am
index fb1c621..0505ad5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,6 +10,7 @@ libftgl_la_SOURCES = \
 	FTExtrdGlyph.cpp FTExtrdGlyph.h \
 	FTFace.cpp FTFace.h \
 	FTFont.cpp FTFontImpl.h \
+	FTFontGlue.cpp \
 	FTGLBitmapFont.cpp FTGLBitmapFontImpl.h \
 	FTGLExtrdFont.cpp FTGLExtrdFontImpl.h \
 	FTGLOutlineFont.cpp FTGLOutlineFontImpl.h \
@@ -18,8 +19,9 @@ libftgl_la_SOURCES = \
 	FTGLTextureFont.cpp FTGLTextureFontImpl.h \
 	FTGlyph.cpp FTGlyph.h \
 	FTGlyphContainer.cpp FTGlyphContainer.h \
-	FTGlue.cpp \
+	FTGlyphGlue.cpp \
 	FTLayout.cpp FTLayoutImpl.h \
+	FTLayoutGlue.cpp \
 	FTLibrary.cpp FTLibrary.h \
 	FTList.h \
 	FTOutlineGlyph.cpp FTOutlineGlyph.h \