Use a `define-builtin-markup-command' macro for builtin markups, which

[lilypond.git] / lily / relative-octave-check.cc

diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc
index 9fe109b0841c7bae7d099c3935683cbe552c9f7e..388e2f2d0fcd31ff1d6b69d8082f6fa560b426e5 100644 (file)
--- a/lily/relative-octave-check.cc
+++ b/lily/relative-octave-check.cc
@@ -6,9 +6,9 @@
   (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "music.hh"
 #include "input.hh"
-#include "pitch.hh"
+#include "international.hh"
+#include "music.hh"
 
 class Relative_octave_check
 {
@@ -35,7 +35,7 @@ Relative_octave_check::relative_callback (SCM music, SCM last_pitch)
 
       if (result != *check_p)
        {
-         String s = _ ("Failed octave check, got: ");
+         string s = _ ("Failed octave check, got: ");
          s += result.to_string ();
 
          m->origin ()->warning (s);