--- /dev/null
+--- lilypond-2.18.0.orig/lily/midi-stream.cc
++++ lilypond-2.18.0/lily/midi-stream.cc
+@@ -18,7 +18,7 @@
+ */
+
+ #include "midi-stream.hh"
+-
++#include <cstring>
+ #include <cerrno>
+ using namespace std;
+
+--- lilypond-2.18.0.orig/lily/piano-pedal-engraver.cc
++++ lilypond-2.18.0/lily/piano-pedal-engraver.cc
+@@ -38,6 +38,7 @@
+ #include "item.hh"
+
+ #include "translator.icc"
++#include <cstring>
+
+ #include <string.h>
+
+--- lilypond-2.18.0.orig/lily/prob.cc
++++ lilypond-2.18.0/lily/prob.cc
+@@ -22,7 +22,7 @@
+ #include "item.hh"
+ #include "input.hh"
+ #include "profile.hh"
+-
++#include <cstring>
+ #include "ly-smobs.icc"
+
+ IMPLEMENT_SMOBS (Prob);
+--- lilypond-2.18.0.orig/lily/relocate.cc
++++ lilypond-2.18.0/lily/relocate.cc
+@@ -23,8 +23,10 @@
+
+ /* TODO: autoconf support */
+
++#include <ctype.h>
+ #include <sys/types.h>
+ #include <dirent.h>
++#include <cstring>
+
+ #if HAVE_GETTEXT
+ #include <libintl.h>
+--- lilypond-2.18.0.orig/lily/source-file.cc
++++ lilypond-2.18.0/lily/source-file.cc
+@@ -24,7 +24,7 @@
+ #endif /* GCC_MAJOR < 4 */
+
+ #include "source-file.hh"
+-
++#include <cstring>
+ #include "config.hh"
+
+ #include <cstdio>
+--- lilypond-2.18.0.orig/lily/translator.cc
++++ lilypond-2.18.0/lily/translator.cc
+@@ -18,7 +18,7 @@
+ */
+
+ #include "translator.hh"
+-
++#include <cstring>
+ #include "context-def.hh"
+ #include "dispatcher.hh"
+ #include "global-context.hh"