diff --git a/ChangeLog b/ChangeLog
index d277fb018..ec43cca94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-08-28  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Fix `make multi' compilation.
+
+	* src/autofit/afblue.cin, src/autofit/afblue.c: Don't include
+	`afblue.h' but `aftypes.h'.
+	* src/autofit/afcjk.c: Don't include `aftypes.h' but `afglobal.h'.
+
 2013-08-28  Werner Lemberg  <wl@gnu.org>
 
 	[autofit] Fix C++ compilation.
diff --git a/src/autofit/afblue.c b/src/autofit/afblue.c
index c7a9e6a8a..0947d2af9 100644
--- a/src/autofit/afblue.c
+++ b/src/autofit/afblue.c
@@ -19,7 +19,7 @@
 /***************************************************************************/
 
 
-#include "afblue.h"
+#include "aftypes.h"
 
 
   FT_LOCAL_ARRAY_DEF( char )
diff --git a/src/autofit/afblue.cin b/src/autofit/afblue.cin
index ad47f980b..c693d89f7 100644
--- a/src/autofit/afblue.cin
+++ b/src/autofit/afblue.cin
@@ -16,7 +16,7 @@
 /***************************************************************************/
 
 
-#include "afblue.h"
+#include "aftypes.h"
 
 
   FT_LOCAL_ARRAY_DEF( char )
diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c
index 85450ab2c..d34a7362b 100644
--- a/src/autofit/afcjk.c
+++ b/src/autofit/afcjk.c
@@ -26,7 +26,7 @@
 #include FT_ADVANCES_H
 #include FT_INTERNAL_DEBUG_H
 
-#include "aftypes.h"
+#include "afglobal.h"
 #include "aflatin.h"