--- ./common/unicode/uconfig.h	2016-03-19 21:18:39.000000000 -0700
+++ ./common/unicode/uconfig.h	2016-03-29 15:23:56.000000000 -0700
@@ -87,7 +87,7 @@
  * @internal
  */
 #ifndef U_DISABLE_RENAMING
-#define U_DISABLE_RENAMING 0
+#define U_DISABLE_RENAMING 1
 #endif
 
 /**
@@ -413,7 +413,7 @@
  * @stable ICU 3.2
  */
 #ifndef UCONFIG_NO_SERVICE
-#   define UCONFIG_NO_SERVICE 0
+#   define UCONFIG_NO_SERVICE 1
 #endif
 
 /**
--- ./common/unicode/utypes.h	2016-04-20 14:47:56.000000000 -0700
+++ ./common/unicode/utypes.h	2016-04-20 14:52:41.000000000 -0700
@@ -61,7 +61,7 @@
  */
 #ifdef __cplusplus
 #   ifndef U_SHOW_CPLUSPLUS_API
-#       define U_SHOW_CPLUSPLUS_API 1
+#       define U_SHOW_CPLUSPLUS_API 0
 #   endif
 #else
 #   undef U_SHOW_CPLUSPLUS_API