Commit 68b7e8c1263a576fad0737096022141eb5ee2722

henry 2001-12-10T21:53:19

Tidied up includes

diff --git a/include/FTBitmapGlyph.h b/include/FTBitmapGlyph.h
index 2e44198..924f0b3 100755
--- a/include/FTBitmapGlyph.h
+++ b/include/FTBitmapGlyph.h
@@ -1,12 +1,12 @@
 #ifndef		__FTBitmapGlyph__
 #define		__FTBitmapGlyph__
 
-#include "FTGL.h"
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 
+#include "FTGL.h"
 #include	"FTGlyph.h"
 
 
diff --git a/include/FTCharmap.h b/include/FTCharmap.h
index 816704b..b39368b 100644
--- a/include/FTCharmap.h
+++ b/include/FTCharmap.h
@@ -1,15 +1,13 @@
 #ifndef		__FTCharmap__
 #define		__FTCharmap__
 
-#include "FTGL.h"
-
 #include <map>
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 
-//#include "FTGL.h"
+#include "FTGL.h"
 
 using namespace std;
 
diff --git a/include/FTGlyph.h b/include/FTGlyph.h
index ddaf125..5b52b7b 100755
--- a/include/FTGlyph.h
+++ b/include/FTGlyph.h
@@ -1,12 +1,12 @@
 #ifndef		__FTGlyph__
 #define		__FTGlyph__
 
-#include "FTGL.h"
-
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 
+#include "FTGL.h"
+
 
 class FTGL_EXPORT FTBBox
 {
diff --git a/include/FTGlyphContainer.h b/include/FTGlyphContainer.h
index 5ce5d48..09e8af2 100755
--- a/include/FTGlyphContainer.h
+++ b/include/FTGlyphContainer.h
@@ -8,11 +8,9 @@
 #include FT_GLYPH_H
 
 #include "FTGL.h"
-
-#include "FTGlyph.h"
+#include "FTGlyph.h" // for FTBBox
 
 class FTFace;
-//class FTGlyph;
 
 using namespace std;
 
diff --git a/include/FTPixmapGlyph.h b/include/FTPixmapGlyph.h
index 7b3e315..6bd55e2 100755
--- a/include/FTPixmapGlyph.h
+++ b/include/FTPixmapGlyph.h
@@ -1,12 +1,12 @@
 #ifndef		__FTPixmapGlyph__
 #define		__FTPixmapGlyph__
 
-#include "FTGL.h"
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 
+#include "FTGL.h"
 #include	"FTGlyph.h"
 
 
diff --git a/include/FTSize.h b/include/FTSize.h
index e586092..85d77ed 100755
--- a/include/FTSize.h
+++ b/include/FTSize.h
@@ -1,11 +1,12 @@
 #ifndef		__FTSize__
 #define		__FTSize__
 
-#include "FTGL.h"
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
+#include "FTGL.h"
+
 
 
 /**
diff --git a/include/FTTextureGlyph.h b/include/FTTextureGlyph.h
index f0f4862..1b3893b 100755
--- a/include/FTTextureGlyph.h
+++ b/include/FTTextureGlyph.h
@@ -1,12 +1,12 @@
 #ifndef		__FTTextureGlyph__
 #define		__FTTextureGlyph__
 
-#include "FTGL.h"
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 
+#include "FTGL.h"
 #include "FTGlyph.h"