diff --git a/ChangeLog b/ChangeLog
index 5c8f45146..377c9b580 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-01  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/freetype.h: Check that ft2build.h has been
+	loaded first.
+
 2003-10-31  Detlef Würkner  <TetiSoft@apg.lahn.de>
 
 	* src/base/fttype1.c (FT_Get_PS_Font_Info, FT_Has_PS_Glyph_Names):
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index fee70b378..f240751d2 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -16,6 +16,15 @@
 /***************************************************************************/
 
 
+#ifndef __FT2_BUILD_GENERIC_H__
+#error "`ft2build.h' hasn't been included yet!"
+#error "Please always use macros to include FreeType header files."
+#error "Example:"
+#error "  #include <ft2build.h>"
+#error "  #include FT_FREETYPE_H"
+#endif
+
+
 #ifndef __FREETYPE_H__
 #define __FREETYPE_H__