diff -ur TeXmacs-1.0.6.9-src/src/makefile.in TeXmacs-1.0.6.9-src.corr/src/makefile.in
--- TeXmacs-1.0.6.9-src/src/makefile.in	2007-02-11 16:39:53.000000000 +0100
+++ TeXmacs-1.0.6.9-src.corr/src/makefile.in	2007-04-09 09:59:55.000000000 +0200
@@ -120,7 +120,7 @@
 deps_incl = $(call incl_flags,System System/Boot System/Classes System/Files System/Link System/Misc Classes/Abstract Classes/Atomic Classes/Compound Classes/Mathematics Data/Drd Data/String Data/Tree Data/Convert Resource Plugins Window Style/Memorizer Typeset Edit Texmacs Guile)
 
 deps_flags = $(deps_incl)\
- $(CPPFLAGS) $(CXXIMLIB2) $(CXXFREETYPE) $(CXXICONV) $(CXXGUILE) \
+ $(CPPFLAGS) $(CXXFREETYPE) $(CXXIMLIB2) $(CXXICONV) $(CXXGUILE) \
  -I$(tmsrc)/include $(CXXXWINDOW)
 # we should use -I- to separate local includes from system includes, but
 # headers of guile 1.6.0 use includes in quotes with names relative to the
@@ -174,11 +174,13 @@
 %.o: %.cpp # Disable implicit compilation rule
 
 cxx_flags    = $(strip $(CXX) $(1) -c $< -o $@)
-cxx_incl     = $(call cxx_flags,$(1) $(CXXIMLIB2) $(CXXFREETYPE) $(CXXICONV) \
+cxx_incl     = $(call cxx_flags,$(1) $(CXXFREETYPE) $(CXXIMLIB2) $(CXXICONV) \
   $(CXXGUILE) $(CPPFLAGS) $(CXXFLAGS)) 
+cxxx_incl    = $(call cxx_flags,$(1) $(CXXFREETYPE) $(CXXIMLIB2) $(CXXICONV) \
+  $(CXXGUILE) $(CPPFLAGS) $(CXXFLAGS) $(CXXXWINDOW))
 
 $(system_obj): Objects/%.o: %.cpp
-	$(call cxx_incl,$(system_incl) -I$(tmsrc)/include)
+	$(call cxxx_incl,$(system_incl) -I$(tmsrc)/include)
 $(classes_obj): Objects/%.o: %.cpp
 	$(call cxx_incl,$(classes_incl))
 $(data_obj): Objects/%.o: %.cpp
@@ -190,7 +192,7 @@
 $(resource_obj): Objects/%.o: %.cpp
 	$(call cxx_incl,$(resource_incl))
 $(plugins_obj): Objects/%.o: %.cpp
-	$(call cxx_incl,$(plugins_incl) $(CXXXWINDOW))
+	$(call cxxx_incl,$(plugins_incl))
 $(texmacs_obj): Objects/%.o: %.cpp
 	$(call cxx_incl,$(texmacs_incl))
 $(typeset_obj): Objects/%.o: %.cpp
@@ -200,7 +202,7 @@
 $(window_obj): Objects/%.o: %.cpp
 	$(call cxx_incl,$(window_incl))
 $(x_window_obj): Objects/%.o: %.cpp
-	$(call cxx_incl,$(window_incl) $(CXXXWINDOW))
+	$(call cxxx_incl,$(window_incl))
 
 ###############################################################################
 # Make editor
@@ -257,8 +259,8 @@
 TEXMACS_objects := $(strip $(call uses,system classes data resource plugins\
  window style typeset edit glue texmacs))
 
-link_options:=-L$(tmsrc)/lib -lm $(LDPATH) $(LDXWINDOW) \
-  $(LDGUILE) $(LDIMLIB2) $(LDFREETYPE) $(LDICONV) $(LDDL)
+link_options:=-L$(tmsrc)/lib -lm $(LDPATH) $(LDFREETYPE) $(LDXWINDOW) \
+  $(LDGUILE) $(LDIMLIB2) $(LDICONV) $(LDDL)
 
 $(tmsrc)/bin/texmacs.bin: Objects/texmacs-$(link).bin
 	$(CP) $^ $@