diff --git a/3party/fribidi/config_win32.h b/3party/fribidi/config_win32.h
index 09bbc425f0..edf56a0f99 100644
--- a/3party/fribidi/config_win32.h
+++ b/3party/fribidi/config_win32.h
@@ -11,7 +11,7 @@
 #define HAVE_DLFCN_H 1
 
 /* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
+//#define HAVE_INTTYPES_H 1
 
 /* Define to 1 if you have the `memmove' function. */
 #define HAVE_MEMMOVE 1
@@ -23,7 +23,7 @@
 #define HAVE_MEMSET 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
+//#define HAVE_STDINT_H 1
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
@@ -35,7 +35,7 @@
 #define HAVE_STRINGIZE 1
 
 /* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
+//#define HAVE_STRINGS_H 1
 
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
@@ -55,8 +55,7 @@
 /* Define to 1 if you have the <wchar.h> header file. */
 #define HAVE_WCHAR_H 1
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory in which libtool stores uninstalled libraries. */
 #define LT_OBJDIR ".libs/"
 
 /* Name of package */
diff --git a/3party/fribidi/lib/common.h b/3party/fribidi/lib/common.h
index 46390d77be..4ba5aad720 100644
--- a/3party/fribidi/lib/common.h
+++ b/3party/fribidi/lib/common.h
@@ -46,9 +46,9 @@
 # define FRIBIDI_PRIVATESPACE(SYMBOL) FRIBIDI_PRIVATESPACE0(_,FRIBIDI_NAMESPACE(_##SYMBOL##__internal__))
 #endif /* !FRIBIDI_PRIVATESPACE */
 
-#if (defined(WIN32)) || (defined(_WIN32_WCE))
-# define FRIBIDI_ENTRY __declspec(dllexport)
-#endif /* WIN32 */
+//#if (defined(WIN32)) || (defined(_WIN32_WCE))
+//# define FRIBIDI_ENTRY __declspec(dllexport)
+//#endif /* WIN32 */
 
 #if FRIBIDI_USE_GLIB+0
 # ifndef SIZEOF_LONG
diff --git a/3party/fribidi/lib/fribidi-common.h b/3party/fribidi/lib/fribidi-common.h
index 47249137e9..2872989e6c 100644
--- a/3party/fribidi/lib/fribidi-common.h
+++ b/3party/fribidi/lib/fribidi-common.h
@@ -52,13 +52,14 @@
 #endif /* !FRIBIDI_NAMESPACE */
 
 /* FRIBIDI_ENTRY is a macro used to declare library entry points. */
-#ifndef FRIBIDI_ENTRY
-# if (defined(WIN32)) || (defined(_WIN32_WCE))
-#  define FRIBIDI_ENTRY __declspec(dllimport)
-# else /* !WIN32 */
-#  define FRIBIDI_ENTRY		/* empty */
-# endif	/* !WIN32 */
-#endif /* !FRIBIDI_ENTRY */
+#define FRIBIDI_ENTRY		/* empty */
+//#ifndef FRIBIDI_ENTRY
+//# if (defined(WIN32)) || (defined(_WIN32_WCE))
+//#  define FRIBIDI_ENTRY __declspec(dllimport)
+//# else /* !WIN32 */
+//#  define FRIBIDI_ENTRY		/* empty */
+//# endif	/* !WIN32 */
+//#endif /* !FRIBIDI_ENTRY */
 
 #if FRIBIDI_USE_GLIB+0
 # ifndef __FRIBIDI_DOC
diff --git a/3party/fribidi/lib/fribidi-deprecated.h b/3party/fribidi/lib/fribidi-deprecated.h
index 651df06a9f..810e6c8712 100644
--- a/3party/fribidi/lib/fribidi-deprecated.h
+++ b/3party/fribidi/lib/fribidi-deprecated.h
@@ -197,7 +197,7 @@ fribidi_remove_bidi_marks (
  */
      FRIBIDI_ENTRY FriBidiLevel fribidi_log2vis (
   const FriBidiChar *str,	/* input logical string */
-  const FriBidiStrIndex len,	/* input string length */
+  FriBidiStrIndex len,	/* input string length */
   FriBidiParType *pbase_dir,	/* requested and resolved paragraph
 				 * base direction */
   FriBidiChar *visual_str,	/* output visual string */