diff --git a/libs/fst/00_UPDATE.sh b/libs/fst/00_UPDATE.sh
index 684e16a1d..db97fd8bb 100755
--- a/libs/fst/00_UPDATE.sh
+++ b/libs/fst/00_UPDATE.sh
@@ -11,3 +11,6 @@ for src in *.c; do
     mv -- "$src" "${src%.c}.cc"
 done
 mv config.h.bak config.h
+
+sed -i -e 's,<config.h>,"config.h",' *.cc *.h
+sed -i -e 's,"fastlz.c","fastlz.cc",' *.cc *.h
diff --git a/libs/fst/fastlz.cc b/libs/fst/fastlz.cc
index b52a799b9..3272ca7a8 100644
--- a/libs/fst/fastlz.cc
+++ b/libs/fst/fastlz.cc
@@ -108,7 +108,7 @@ int fastlz_decompress(const void* input, int length, void* output, int maxout);
 #define FASTLZ_DECOMPRESSOR fastlz1_decompress
 static FASTLZ_INLINE int FASTLZ_COMPRESSOR(const void* input, int length, void* output);
 static FASTLZ_INLINE int FASTLZ_DECOMPRESSOR(const void* input, int length, void* output, int maxout);
-#include "fastlz.c"
+#include "fastlz.cc"
 
 #undef FASTLZ_LEVEL
 #define FASTLZ_LEVEL 2
@@ -123,7 +123,7 @@ static FASTLZ_INLINE int FASTLZ_DECOMPRESSOR(const void* input, int length, void
 #define FASTLZ_DECOMPRESSOR fastlz2_decompress
 static FASTLZ_INLINE int FASTLZ_COMPRESSOR(const void* input, int length, void* output);
 static FASTLZ_INLINE int FASTLZ_DECOMPRESSOR(const void* input, int length, void* output, int maxout);
-#include "fastlz.c"
+#include "fastlz.cc"
 
 int fastlz_compress(const void* input, int length, void* output)
 {
diff --git a/libs/fst/fstapi.cc b/libs/fst/fstapi.cc
index 7bc7fd821..b77745900 100644
--- a/libs/fst/fstapi.cc
+++ b/libs/fst/fstapi.cc
@@ -39,7 +39,7 @@
  */
 
 #ifndef FST_CONFIG_INCLUDE
-# define FST_CONFIG_INCLUDE <config.h>
+# define FST_CONFIG_INCLUDE "config.h"
 #endif
 #include FST_CONFIG_INCLUDE