* configure.in: Test for and accept lmodern if EC fonts not found.

[lilypond.git] / lily / lily-guile.cc

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 92c3bca31b5025522b7db3115e95065565bdc94d..d7c8c39cb3ac9cd297665e990c771bab1bfe098d 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -7,15 +7,16 @@
                  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "lily-guile.hh"
+
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>   /* isinf */
+#include <cstring> /* strdup, strchr */
+#include <cctype>
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <libintl.h>           // gettext on macos x
-#include <math.h>   /* isinf */
-#include <string.h> /* strdup, strchr */
-#include <ctype.h>
 
-#include "lily-proto.hh"
 #include "version.hh"
 
 /* MacOS S fix:
@@ -26,15 +27,12 @@
 inline int my_isinf (Real r) { return isinf (r); }
 inline int my_isnan (Real r) { return isnan (r); }
 
-
 #include "libc-extension.hh"
-#include "lily-guile.hh"
 #include "main.hh"
 #include "file-path.hh"
 #include "warn.hh"
 #include "direction.hh"
 #include "offset.hh"
-#include "interval.hh"
 #include "pitch.hh"
 #include "dimensions.hh"
 #include "source-file.hh"