5 files changed, 15 insertions, 9 deletions
diff --git a/pdf/splash/Makefile.am b/pdf/splash/Makefile.am
index b115112..180a470 100644
--- a/pdf/splash/Makefile.am
+++ b/pdf/splash/Makefile.am
@@ -1,7 +1,9 @@
-INCLUDES =			\
-	-I$(top_srcdir)		\
-	-I$(top_srcdir)/goo	\
-	-I$(top_srcdir)/fofi
+INCLUDES =				\
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/pdf		\
+	-I$(top_srcdir)/pdf/goo		\
+	-I$(top_srcdir)/pdf/fofi	\
+	$(FREETYPE_CFLAGS)
 
 noinst_LIBRARIES = libsplash.a
 
diff --git a/pdf/splash/SplashFTFont.cc b/pdf/splash/SplashFTFont.cc
index a7d0396..8234014 100644
--- a/pdf/splash/SplashFTFont.cc
+++ b/pdf/splash/SplashFTFont.cc
@@ -12,8 +12,6 @@
 #pragma implementation
 #endif
 
-#include "freetype/ftoutln.h"
-#include "freetype/internal/ftobjs.h" // needed for FT_New_Size decl
 #include "gmem.h"
 #include "SplashMath.h"
 #include "SplashGlyphBitmap.h"
@@ -22,6 +20,9 @@
 #include "SplashFTFontFile.h"
 #include "SplashFTFont.h"
 
+#include FT_OUTLINE_H
+#include FT_INTERNAL_OBJECTS_H // needed for FT_New_Size decl
+
 //------------------------------------------------------------------------
 
 static int glyphPathMoveTo(FT_Vector *pt, void *path);
diff --git a/pdf/splash/SplashFTFont.h b/pdf/splash/SplashFTFont.h
index 7628a2b..efd0eda 100644
--- a/pdf/splash/SplashFTFont.h
+++ b/pdf/splash/SplashFTFont.h
@@ -15,7 +15,8 @@
 #pragma interface
 #endif
 
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 #include "SplashFont.h"
 
 class SplashFTFontFile;
diff --git a/pdf/splash/SplashFTFontEngine.h b/pdf/splash/SplashFTFontEngine.h
index 0497a46..c87108d 100644
--- a/pdf/splash/SplashFTFontEngine.h
+++ b/pdf/splash/SplashFTFontEngine.h
@@ -15,7 +15,8 @@
 #pragma interface
 #endif
 
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 #include "gtypes.h"
 
 class SplashFontFile;
diff --git a/pdf/splash/SplashFTFontFile.h b/pdf/splash/SplashFTFontFile.h
index 522d055..76f1f81 100644
--- a/pdf/splash/SplashFTFontFile.h
+++ b/pdf/splash/SplashFTFontFile.h
@@ -15,7 +15,8 @@
 #pragma interface
 #endif
 
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 #include "SplashFontFile.h"
 
 class SplashFontFileID;