diff --git a/ChangeLog b/ChangeLog
index a3e006bee..3dfbd61aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-09-25  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	[autofit] Fix for multi build.
+
+	* src/autofit/afmodule.h: Include FT_INTERNAL_OBJECTS_H
+	to use FT_DECLARE_MODULE() macro in multi build.
+
+	* src/autofit/aflatin.c: Include <ft2build.h> to handle
+	FT_ADVANCES_H correctly in multi build.
+
 2009-09-24  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
 	[cache] Check the face filled by FTC_Manager_LookupFace().
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index bcb5601d2..394fb9789 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -16,6 +16,7 @@
 /***************************************************************************/
 
 
+#include <ft2build.h>
 #include FT_ADVANCES_H
 
 #include "aflatin.h"
diff --git a/src/autofit/afmodule.h b/src/autofit/afmodule.h
index 1e66176f0..d9792399b 100644
--- a/src/autofit/afmodule.h
+++ b/src/autofit/afmodule.h
@@ -20,6 +20,7 @@
 #define __AFMODULE_H__
 
 #include <ft2build.h>
+#include FT_INTERNAL_OBJECTS_H
 #include FT_MODULE_H