diff --git a/ChangeLog b/ChangeLog
index ea166ad01..4c4f66c85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-03  Adam Fedor  <fedor@gnu.org>
+
+	* Source/cifframe.h: Move ffi.h include to fix compile problem on
+	MinGW (Fixes #8267).
+
 2004-06-03 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSZone.m: Fixed error in malloc of non-freeable zones
diff --git a/Source/cifframe.h b/Source/cifframe.h
index dfeab8df3..d0f22f8f1 100644
--- a/Source/cifframe.h
+++ b/Source/cifframe.h
@@ -25,9 +25,9 @@
 #ifndef cifframe_h_INCLUDE
 #define cifframe_h_INCLUDE
 
-#include <ffi.h>
 #include "Foundation/NSMethodSignature.h"
 #include "GNUstepBase/DistributedObjects.h"
+#include <ffi.h>
 
 typedef struct _cifframe_t {
   ffi_cif cif;