From dda1e93db8cd47717869292203cd9ea12b96291f Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Sat, 20 Oct 2012 08:34:57 +0200
Subject: [PATCH] [autofit] Fix `make multi CC=c++'.

* src/autofit/aflatin.c, src/autofit/aflatin2.c: Include
`afglobal.h'.
* src/autofit/afloader.c: Fix order of header files.
* src/autofit/afmodule.c: Include `afglobal.h' and `aferrors.h'.
---
 ChangeLog              | 9 +++++++++
 src/autofit/aflatin.c  | 1 +
 src/autofit/aflatin2.c | 1 +
 src/autofit/afloader.c | 2 +-
 src/autofit/afmodule.c | 2 ++
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 682b7c7e7..a6aeca3d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-10-20  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Fix `make multi CC=c++'.
+
+	* src/autofit/aflatin.c, src/autofit/aflatin2.c: Include
+	`afglobal.h'.
+	* src/autofit/afloader.c: Fix order of header files.
+	* src/autofit/afmodule.c: Include `afglobal.h' and `aferrors.h'.
+
 2012-10-19  Werner Lemberg  <wl@gnu.org>
 
 	[cff] Fix more value errors and improve tracing.
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index 869a3d850..a5c1e7d4f 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -20,6 +20,7 @@
 #include FT_ADVANCES_H
 #include FT_INTERNAL_DEBUG_H
 
+#include "afglobal.h"
 #include "aflatin.h"
 #include "aferrors.h"
 
diff --git a/src/autofit/aflatin2.c b/src/autofit/aflatin2.c
index 78ac920b5..b173cb71d 100644
--- a/src/autofit/aflatin2.c
+++ b/src/autofit/aflatin2.c
@@ -18,6 +18,7 @@
 
 #include FT_ADVANCES_H
 
+#include "afglobal.h"
 #include "aflatin.h"
 #include "aflatin2.h"
 #include "aferrors.h"
diff --git a/src/autofit/afloader.c b/src/autofit/afloader.c
index 29a2aed48..f280beda2 100644
--- a/src/autofit/afloader.c
+++ b/src/autofit/afloader.c
@@ -16,9 +16,9 @@
 /***************************************************************************/
 
 
+#include "afglobal.h"
 #include "afloader.h"
 #include "afhints.h"
-#include "afglobal.h"
 #include "aferrors.h"
 #include "afmodule.h"
 
diff --git a/src/autofit/afmodule.c b/src/autofit/afmodule.c
index ea5611546..f46cff9ec 100644
--- a/src/autofit/afmodule.c
+++ b/src/autofit/afmodule.c
@@ -16,8 +16,10 @@
 /***************************************************************************/
 
 
+#include "afglobal.h"
 #include "afmodule.h"
 #include "afloader.h"
+#include "aferrors.h"
 #include "afpic.h"
 
 #ifdef FT_DEBUG_AUTOFIT