2 files changed, 4 insertions, 2 deletions

diff --git a/src/FbTk/FbString.cc b/src/FbTk/FbString.cc
index 5577f32..2bc7516 100644
--- a/src/FbTk/FbString.cc
+++ b/src/FbTk/FbString.cc
@@ -55,7 +55,7 @@ typedef int iconv_t;
 #endif // HAVE_ICONV
 
 #ifdef HAVE_FRIBIDI
-  #include <fribidi/fribidi.h>
+  #include <fribidi.h>
 #endif
 
 #ifdef DEBUG
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index 3c34b22..983f923 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -3,7 +3,7 @@ noinst_LIBRARIES = libFbTk.a
 AM_CPPFLAGS=-include $(top_builddir)/config.h
 
 if XFT
-xft_SOURCE= XftFontImp.hh XftFontImp.cc
+xft_SOURCE = XftFontImp.hh XftFontImp.cc
 endif
 if MULTIBYTE
 xmb_SOURCE= XmbFontImp.hh XmbFontImp.cc
@@ -15,6 +15,8 @@ if IMLIB2
 imlib2_SOURCE= ImageImlib2.hh ImageImlib2.cc
 endif
 
+libFbTk_a_CPPFLAGS = $(FREETYPE2_CFLAGS) $(FRIBIDI_CFLAGS) $(AM_CPPFLAGS)
+
 libFbTk_a_SOURCES = App.hh App.cc \
         Color.cc Color.hh Command.hh \
         ColorLUT.cc ColorLUT.hh \