diff --git a/ChangeLog b/ChangeLog
index 34f8f5888..86139e5a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-02  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/cache/ftcglyph.h: Don't include stddef.h.
+
+	* include/freetype/freetype.h: Fix check for ft2build.h.
+
 2003-11-01  Werner Lemberg  <wl@gnu.org>
 
 	* include/freetype/freetype.h: Check that ft2build.h has been
diff --git a/include/freetype/cache/ftcglyph.h b/include/freetype/cache/ftcglyph.h
index 8a2f0f3a7..ee72c3331 100644
--- a/include/freetype/cache/ftcglyph.h
+++ b/include/freetype/cache/ftcglyph.h
@@ -50,8 +50,6 @@
 #include FT_CACHE_H
 #include FT_CACHE_MANAGER_H
 
-#include <stddef.h>
-
 
 FT_BEGIN_HEADER
 
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index f240751d2..e10ad9a2d 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -16,7 +16,7 @@
 /***************************************************************************/
 
 
-#ifndef __FT2_BUILD_GENERIC_H__
+#ifndef FT_FREETYPE_H
 #error "`ft2build.h' hasn't been included yet!"
 #error "Please always use macros to include FreeType header files."
 #error "Example:"