diff --git a/ChangeLog b/ChangeLog
index 704e53332..01139f52d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-12-05  David Turner  <david.turner@freetype.org>
 
+	* src/psaux/psauxmod.c: fixed a broken inclusion of component
+	header files (a FT_FLAT_COMPILE test was missing)
+
 	* src/cache/ftcmanag.c (FTC_Manager_Done): fixed a bug that caused
         an occasional crash when the function was called (due to a dangling
         pointer)
diff --git a/src/psaux/psauxmod.c b/src/psaux/psauxmod.c
index 6063f0602..cad74a9b0 100644
--- a/src/psaux/psauxmod.c
+++ b/src/psaux/psauxmod.c
@@ -16,9 +16,15 @@
 /***************************************************************************/
 
 
-#include <psaux/psauxmod.h>
-#include <psaux/psobjs.h>
-#include <psaux/t1decode.h>
+#ifdef FT_FLAT_COMPILE
+#  include "psauxmod.h"
+#  include "psobjs.h"
+#  include "t1decode.h"
+#else
+#  include <psaux/psauxmod.h>
+#  include <psaux/psobjs.h>
+#  include <psaux/t1decode.h>
+#endif
 
 
   FT_CALLBACK_TABLE_DEF
diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
index 589cd68b8..9cfe8a436 100644
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -21,13 +21,9 @@
 #include <freetype/internal/ftdebug.h>
 
 #ifdef FT_FLAT_COMPILE
-
-#include "psobjs.h"
-
+#  include "psobjs.h"
 #else
-
-#include <psaux/psobjs.h>
-
+#  include <psaux/psobjs.h>
 #endif
 
 
diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
index 40e4f4e29..86a5bd031 100644
--- a/src/psaux/t1decode.c
+++ b/src/psaux/t1decode.c
@@ -23,15 +23,11 @@
 
 
 #ifdef FT_FLAT_COMPILE
-
-#include "t1decode.h"
-#include "psobjs.h"
-
+#  include "t1decode.h"
+#  include "psobjs.h"
 #else
-
-#include <psaux/t1decode.h>
-#include <psaux/psobjs.h>
-
+#  include <psaux/t1decode.h>
+#  include <psaux/psobjs.h>
 #endif