https://github.com/tux4kids/t4kcommon/commit/ef0abc11b9c7ef769c78d0aa6ea2485ef98c4dc2
diff --git src/linebreak/linebreak.c src/linebreak/linebreak.c
index f9c88a1..6b0bf66 100644
--- src/linebreak/linebreak.c
+++ src/linebreak/linebreak.c
@@ -18,10 +18,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 
 /* Modification by David Bruce <davidstuartbruce@gmail.com>
- * to allow compilation under mingw-cross-env:
+ * to allow compilation under mingw-cross-env and OS-X:
  */
 
-#if defined BUILD_MINGW32 && !defined ICONV_CONST
+#ifndef ICONV_CONST
 #define ICONV_CONST const
 #endif
 
diff --git src/t4k_common.h src/t4k_common.h
index d4676e7..ef8bbd6 100644
--- src/t4k_common.h
+++ src/t4k_common.h
@@ -239,7 +239,7 @@ MFStrategy;
 #define MAX_LINES 128     //!< Maximum lines to wrap.
 #define MAX_LINEWIDTH 256 //!< Maximum characters of each line.
 
-char wrapped_lines[MAX_LINES][MAX_LINEWIDTH]; //!< Global buffer for wrapped lines.
+static char wrapped_lines[MAX_LINES][MAX_LINEWIDTH]; //!< Global buffer for wrapped lines.
 
 //TODO separate headers for different areas a la SDL?
 
diff --git src/t4k_linewrap.c src/t4k_linewrap.c
index 5f80ad1..cfa7308 100644
--- src/t4k_linewrap.c
+++ src/t4k_linewrap.c
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdio.h>
 
 static char wrapped_lines0[MAX_LINES][MAX_LINEWIDTH];  // for internal storage
-char wrapped_lines[MAX_LINES][MAX_LINEWIDTH]; // publicly available!
+//char wrapped_lines[MAX_LINES][MAX_LINEWIDTH]; // publicly available!