diff --git a/ChangeLog b/ChangeLog
index 432123f1f..c5faae66e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-13  Werner Lemberg  <wl@gnu.org>
+
+	* builds/unix/ftsystem.c: Fixed typos.  Fixed inclusion of wrong
+	ftconfig.h file.
+
 2000-12-12  Werner Lemberg  <wl@gnu.org>
 
 	* include/freetype/config/ft2build.h (FT2_ROOT, FT2_CONFIG_ROOT):
diff --git a/builds/unix/ftsystem.c b/builds/unix/ftsystem.c
index 39e687aad..da36b2b2f 100644
--- a/builds/unix/ftsystem.c
+++ b/builds/unix/ftsystem.c
@@ -17,12 +17,13 @@
 
 
 #include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
+/* we use our special ftconfig.h file, not the standard one */
+#include <ftconfig.h>
 #include FT_INTERNAL_DEBUG_H
 #include FT_SYSTEM_H
 #include FT_ERRORS_H
-#include FT_TYPES_h
-#include FT_INTERNAL_FTOBJS_H
+#include FT_TYPES_H
+#include FT_INTERNAL_OBJECTS_H
 
   /* memory-mapping includes and definitions */
 #ifdef HAVE_UNISTD_H
@@ -55,6 +56,7 @@
 #endif /* NEED_DECLARATION_MUNMAP */
 
 
+#include <sys/types.h>
 #include <sys/stat.h>
 
 #ifdef HAVE_FCNTL_H