diff -Naur abi/src/af/ev/xp/ev_Toolbar_Labels.cpp abi.mod/src/af/ev/xp/ev_Toolbar_Labels.cpp
--- abi/src/af/ev/xp/ev_Toolbar_Labels.cpp	2003-02-04 06:53:13.000000000 +0000
+++ abi.mod/src/af/ev/xp/ev_Toolbar_Labels.cpp	2003-09-22 11:49:34.000000000 +0100
@@ -27,7 +27,7 @@
 #include "ut_debugmsg.h"
 #include "ut_string.h"
 #include "ev_Toolbar_Labels.h"
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 #include "ut_wctomb.h"
 #include "ut_mbtowc.h"
 #include "xap_App.h"
diff -Naur abi/src/af/util/xp/ut_contextGlyph.h abi.mod/src/af/util/xp/ut_contextGlyph.h
--- abi/src/af/util/xp/ut_contextGlyph.h	2003-06-29 12:48:01.000000000 +0100
+++ abi.mod/src/af/util/xp/ut_contextGlyph.h	2003-09-22 11:49:34.000000000 +0100
@@ -29,7 +29,7 @@
 #endif
 #include "ut_misc.h"
 
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 
 class UT_StringPtrMap;
 class XAP_App;
diff -Naur abi/src/af/util/xp/ut_string.cpp abi.mod/src/af/util/xp/ut_string.cpp
--- abi/src/af/util/xp/ut_string.cpp	2003-09-19 12:50:21.000000000 +0100
+++ abi.mod/src/af/util/xp/ut_string.cpp	2003-09-22 11:49:34.000000000 +0100
@@ -30,7 +30,7 @@
 #include "ut_string.h"
 #include "ut_debugmsg.h"
 #include "ut_growbuf.h"
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 #include "ut_mbtowc.h"
 #include "ut_wctomb.h"
 
diff -Naur abi/src/af/xap/xp/xap_Strings.cpp abi.mod/src/af/xap/xp/xap_Strings.cpp
--- abi/src/af/xap/xp/xap_Strings.cpp	2003-09-02 08:40:52.000000000 +0100
+++ abi.mod/src/af/xap/xp/xap_Strings.cpp	2003-09-22 11:49:34.000000000 +0100
@@ -37,7 +37,7 @@
 #include "xap_Strings.h"
 #include "xap_EncodingManager.h"
 
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 
 //////////////////////////////////////////////////////////////////
 // base class provides interface regardless of how we got the strings
diff -Naur abi/src/config/abi_defs.mk abi.mod/src/config/abi_defs.mk
--- abi/src/config/abi_defs.mk	2003-09-15 09:34:16.000000000 +0100
+++ abi.mod/src/config/abi_defs.mk	2003-09-22 11:52:50.000000000 +0100
@@ -805,7 +805,7 @@
 #	EXTRA_LIBS += $(LIBDIR)/fribidi.lib
 	EXTRA_LIBS += $(LIBDIR)/libfribidi_s.lib
 	CFLAGS += -DFRIBIDI_EXPORTS	# symbols match
-	CFLAGS += -I$(ABI_XX_ROOT)/..	# so <fribidi/fribidi.h> works
+	CFLAGS += -I$(ABI_XX_ROOT)/../fribidi	# so <fribidi.h> works
 else
 ifeq ($(OS_NAME),QNX)
 	EXTRA_LIBS += -Bstatic -lfribidi -Bdynamic
@@ -814,6 +814,6 @@
 endif
 endif
 ifeq ($(OS_NAME), MINGW32)
-	CFLAGS += -I$(ABI_ROOT)/..	# so <fribidi/fribidi.h> works
+	CFLAGS += -I$(ABI_ROOT)/../fribidi	# so <fribidi.h> works
 endif
 
diff -Naur abi/src/text/fmt/xp/fl_BlockLayout.h abi.mod/src/text/fmt/xp/fl_BlockLayout.h
--- abi/src/text/fmt/xp/fl_BlockLayout.h	2003-09-20 12:00:38.000000000 +0100
+++ abi.mod/src/text/fmt/xp/fl_BlockLayout.h	2003-09-22 11:49:34.000000000 +0100
@@ -38,7 +38,7 @@
 #include "fg_Graphic.h"
 #include "fl_AutoLists.h"
 #include "pp_Property.h"
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 #include "fl_ContainerLayout.h"
 #include "fl_SectionLayout.h"
 #include "fb_LineBreaker.h"
diff -Naur abi/src/text/fmt/xp/fp_ContainerObject.h abi.mod/src/text/fmt/xp/fp_ContainerObject.h
--- abi/src/text/fmt/xp/fp_ContainerObject.h	2003-09-20 12:00:41.000000000 +0100
+++ abi.mod/src/text/fmt/xp/fp_ContainerObject.h	2003-09-22 11:49:34.000000000 +0100
@@ -55,7 +55,7 @@
 #include "gr_Graphics.h"
 #include "ut_vector.h"
 #include "pt_Types.h"
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 
 typedef struct _fp_Requisition	  fp_Requisition;
 typedef struct _fp_Allocation    fp_Allocation;
diff -Naur abi/src/text/fmt/xp/fp_DirectionMarkerRun.cpp abi.mod/src/text/fmt/xp/fp_DirectionMarkerRun.cpp
--- abi/src/text/fmt/xp/fp_DirectionMarkerRun.cpp	2003-09-20 12:00:41.000000000 +0100
+++ abi.mod/src/text/fmt/xp/fp_DirectionMarkerRun.cpp	2003-09-22 11:49:34.000000000 +0100
@@ -18,7 +18,7 @@
  */
 
 #include "fp_DirectionMarkerRun.h"
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 #include "fl_BlockLayout.h"
 #include "fv_View.h"
 #include "fp_TextRun.h"
diff -Naur abi/src/text/fmt/xp/fp_Run.h abi.mod/src/text/fmt/xp/fp_Run.h
--- abi/src/text/fmt/xp/fp_Run.h	2003-09-22 11:12:36.000000000 +0100
+++ abi.mod/src/text/fmt/xp/fp_Run.h	2003-09-22 11:49:34.000000000 +0100
@@ -35,7 +35,7 @@
 #include "ut_assert.h"
 #include "ap_Strings.h"
 #include "fl_BlockLayout.h"
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 #include "pp_Revision.h"
 #include "ut_string_class.h"
 
diff -Naur abi/src/text/fmt/xp/fp_TextRun.cpp abi.mod/src/text/fmt/xp/fp_TextRun.cpp
--- abi/src/text/fmt/xp/fp_TextRun.cpp	2003-09-22 11:12:38.000000000 +0100
+++ abi.mod/src/text/fmt/xp/fp_TextRun.cpp	2003-09-22 11:49:34.000000000 +0100
@@ -45,7 +45,7 @@
 
 #include "ut_OverstrikingChars.h"
 #include "ut_Language.h"
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 #include "ut_contextGlyph.h"
 #include "ap_Prefs.h"
 
diff -Naur abi/src/text/ptbl/xp/pd_Document.h abi.mod/src/text/ptbl/xp/pd_Document.h
--- abi/src/text/ptbl/xp/pd_Document.h	2003-08-04 08:13:48.000000000 +0100
+++ abi.mod/src/text/ptbl/xp/pd_Document.h	2003-09-22 11:49:34.000000000 +0100
@@ -39,7 +39,7 @@
 #include "fp_PageSize.h"
 #include "ut_string_class.h"
 #include "ut_misc.h"
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 
 class UT_ByteBuf;
 class UT_GrowBuf;
diff -Naur abi/src/wp/ap/xp/ap_Dialog_ListRevisions.cpp abi.mod/src/wp/ap/xp/ap_Dialog_ListRevisions.cpp
--- abi/src/wp/ap/xp/ap_Dialog_ListRevisions.cpp	2003-09-02 08:42:01.000000000 +0100
+++ abi.mod/src/wp/ap/xp/ap_Dialog_ListRevisions.cpp	2003-09-22 11:49:34.000000000 +0100
@@ -26,7 +26,7 @@
 #include "ap_Dialog_ListRevisions.h"
 #include "ap_Strings.h"
 
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 
 AP_Dialog_ListRevisions::AP_Dialog_ListRevisions(XAP_DialogFactory * pDlgFactory,
 					   XAP_Dialog_Id id)
diff -Naur abi/src/wp/ap/xp/ap_Dialog_Lists.cpp abi.mod/src/wp/ap/xp/ap_Dialog_Lists.cpp
--- abi/src/wp/ap/xp/ap_Dialog_Lists.cpp	2003-09-04 08:48:56.000000000 +0100
+++ abi.mod/src/wp/ap/xp/ap_Dialog_Lists.cpp	2003-09-22 11:49:34.000000000 +0100
@@ -39,7 +39,7 @@
 #include "fl_BlockLayout.h"
 #include "ap_Preview_Paragraph.h"
 #include "xad_Document.h"
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 
 AP_Dialog_Lists::AP_Dialog_Lists(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id)
 :	XAP_Dialog_Modeless(pDlgFactory, id, "interface/dialoglists"),
diff -Naur abi/src/wp/ap/xp/ap_Dialog_MarkRevisions.cpp abi.mod/src/wp/ap/xp/ap_Dialog_MarkRevisions.cpp
--- abi/src/wp/ap/xp/ap_Dialog_MarkRevisions.cpp	2003-09-02 08:42:01.000000000 +0100
+++ abi.mod/src/wp/ap/xp/ap_Dialog_MarkRevisions.cpp	2003-09-22 11:49:34.000000000 +0100
@@ -26,7 +26,7 @@
 #include "ap_Dialog_MarkRevisions.h"
 #include "ap_Strings.h"
 
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 
 AP_Dialog_MarkRevisions::AP_Dialog_MarkRevisions(XAP_DialogFactory * pDlgFactory,
 					   XAP_Dialog_Id id)
diff -Naur abi/src/wp/ap/xp/ap_Preview_Paragraph.cpp abi.mod/src/wp/ap/xp/ap_Preview_Paragraph.cpp
--- abi/src/wp/ap/xp/ap_Preview_Paragraph.cpp	2003-02-16 03:54:02.000000000 +0000
+++ abi.mod/src/wp/ap/xp/ap_Preview_Paragraph.cpp	2003-09-22 11:49:34.000000000 +0100
@@ -32,7 +32,7 @@
 #include "ap_Strings.h"
 #include "ap_Dialog_Lists.h"
 
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 
 /************************************************************************/
 
diff -Naur abi/src/wp/ap/xp/ap_Preview_Paragraph.h abi.mod/src/wp/ap/xp/ap_Preview_Paragraph.h
--- abi/src/wp/ap/xp/ap_Preview_Paragraph.h	2002-08-03 12:45:15.000000000 +0100
+++ abi.mod/src/wp/ap/xp/ap_Preview_Paragraph.h	2003-09-22 11:49:34.000000000 +0100
@@ -27,7 +27,7 @@
 
 #include "xap_Preview.h"
 #include "ap_Dialog_Paragraph.h"
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 
 // fwd decl.
 class AP_Dialog_Lists;
diff -Naur abi/src/wp/ap/xp/ap_Strings.cpp abi.mod/src/wp/ap/xp/ap_Strings.cpp
--- abi/src/wp/ap/xp/ap_Strings.cpp	2003-08-26 11:26:31.000000000 +0100
+++ abi.mod/src/wp/ap/xp/ap_Strings.cpp	2003-09-22 11:49:34.000000000 +0100
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 
 #include "ut_assert.h"
 #include "ut_debugmsg.h"
diff -Naur abi/src/wp/impexp/xp/ie_exp_RTF.h abi.mod/src/wp/impexp/xp/ie_exp_RTF.h
--- abi/src/wp/impexp/xp/ie_exp_RTF.h	2003-09-15 09:35:40.000000000 +0100
+++ abi.mod/src/wp/impexp/xp/ie_exp_RTF.h	2003-09-22 11:49:34.000000000 +0100
@@ -29,7 +29,7 @@
 #include "pl_Listener.h"
 #include "fl_AutoLists.h"
 #include "fl_AutoNum.h"
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 
 class PD_Document;
 class PD_Style;
diff -Naur abi/src/wp/impexp/xp/ie_exp_RTF_listenerWriteDoc.cpp abi.mod/src/wp/impexp/xp/ie_exp_RTF_listenerWriteDoc.cpp
--- abi/src/wp/impexp/xp/ie_exp_RTF_listenerWriteDoc.cpp	2003-09-15 09:35:40.000000000 +0100
+++ abi.mod/src/wp/impexp/xp/ie_exp_RTF_listenerWriteDoc.cpp	2003-09-22 11:49:34.000000000 +0100
@@ -54,7 +54,7 @@
 
 #include "xap_EncodingManager.h"
 #include "ut_string_class.h"
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 
 void s_RTF_ListenerWriteDoc::_closeSection(void)
 {
diff -Naur abi/src/wp/impexp/xp/ie_exp_Text.cpp abi.mod/src/wp/impexp/xp/ie_exp_Text.cpp
--- abi/src/wp/impexp/xp/ie_exp_Text.cpp	2003-08-06 08:49:55.000000000 +0100
+++ abi.mod/src/wp/impexp/xp/ie_exp_Text.cpp	2003-09-22 11:49:34.000000000 +0100
@@ -43,7 +43,7 @@
 #ifdef WIN32
   #include "ut_Win32OS.h"
 #endif
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 
 
 /*****************************************************************/
diff -Naur abi/src/wp/impexp/xp/ie_imp_MsWord_97.cpp abi.mod/src/wp/impexp/xp/ie_imp_MsWord_97.cpp
--- abi/src/wp/impexp/xp/ie_imp_MsWord_97.cpp	2003-09-02 08:42:10.000000000 +0100
+++ abi.mod/src/wp/impexp/xp/ie_imp_MsWord_97.cpp	2003-09-22 11:49:34.000000000 +0100
@@ -74,7 +74,7 @@
 // undef this to disable support for older images (<= Word95)
 #define SUPPORTS_OLD_IMAGES 1
 
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 
 //#define BIDI_DEBUG
 //
diff -Naur abi/src/wp/impexp/xp/ie_imp_RTF.h abi.mod/src/wp/impexp/xp/ie_imp_RTF.h
--- abi/src/wp/impexp/xp/ie_imp_RTF.h	2003-09-18 09:26:24.000000000 +0100
+++ abi.mod/src/wp/impexp/xp/ie_imp_RTF.h	2003-09-22 11:49:34.000000000 +0100
@@ -35,7 +35,7 @@
 #include "fl_AutoLists.h"
 #include "fl_AutoNum.h"
 #include "fl_BlockLayout.h"
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 #include  "ie_Table.h"
 
 class IE_Imp_RTF;
diff -Naur abi/src/wp/impexp/xp/ie_imp_Text.cpp abi.mod/src/wp/impexp/xp/ie_imp_Text.cpp
--- abi/src/wp/impexp/xp/ie_imp_Text.cpp	2003-09-22 11:15:45.000000000 +0100
+++ abi.mod/src/wp/impexp/xp/ie_imp_Text.cpp	2003-09-22 11:49:34.000000000 +0100
@@ -37,7 +37,7 @@
 #include "xap_DialogFactory.h"
 #include "xap_Dlg_Encoding.h"
 #include "ap_Prefs.h"
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 
 #include "pt_PieceTable.h"
 #include "pf_Frag_Strux.h"