--- ttmkfdir-3.0.9/util.h.ark	2004-08-25 12:21:55.000000000 +0000
+++ ttmkfdir-3.0.9/util.h	2004-08-25 12:22:02.000000000 +0000
@@ -17,6 +17,6 @@
 	Singleton (void) {};
 	~Singleton (void) {};
     };
-}; 
+} 
 
 #endif // TTMKFDIRUTIL_H__
--- ttmkfdir-3.0.9/ttf.h.ark	2004-08-25 12:22:10.000000000 +0000
+++ ttmkfdir-3.0.9/ttf.h	2004-08-25 12:28:11.000000000 +0000
@@ -3,12 +3,13 @@
 #define TTF_H__
 
 #include <string>
-#include "freetype/freetype.h"
-#include "freetype/tttables.h"
-#include "freetype/ftsnames.h"
-#include "freetype/ttnameid.h"
-#include "freetype/fterrors.h"
-#include "freetype/ftmodule.h"
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_TRUETYPE_TABLES_H
+#include FT_SFNT_NAMES_H
+#include FT_TRUETYPE_IDS_H
+#include FT_ERRORS_H
+#include FT_MODULE_H
 
 #include "util.h"
 #include "encoding.h"
@@ -49,7 +50,7 @@
 	TT_Postscript	    *post;
 	std::string	    FileName;
     };
-};
+}
 
 #endif /* TTF_H__ */
 
--- ttmkfdir-3.0.9/encoding.h.ark	2004-08-25 12:24:41.000000000 +0000
+++ ttmkfdir-3.0.9/encoding.h	2004-08-25 12:25:06.000000000 +0000
@@ -6,7 +6,8 @@
 #include <map>
 #include <string>
 
-#include "freetype/freetype.h"
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 #include "util.h"
 
--- ttmkfdir-3.0.9/encoding.cpp.ark	2004-08-25 12:28:23.000000000 +0000
+++ ttmkfdir-3.0.9/encoding.cpp	2004-08-25 12:28:37.000000000 +0000
@@ -4,7 +4,8 @@
 #include <cstring>
 #include <unistd.h>
 #include <zlib.h>
-#include "freetype/freetype.h"
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 #include "ttmkfdir.h"
 #include "encoding.h"
--- ttmkfdir-3.0.9/builtin.cpp.ark	2004-08-25 12:28:51.000000000 +0000
+++ ttmkfdir-3.0.9/builtin.cpp	2004-08-25 12:28:54.000000000 +0000
@@ -600,7 +600,7 @@
 	0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff
     };
 
-};
+}
 
 Encoding::BuiltinEncoding_t Encoding::builtin_encodings[] = {
     {256,191,32,{TT_PLATFORM_MICROSOFT,TT_MS_ID_UNICODE_CS,iso8859_1},{"iso8859-1",}},