trim duplicate headers.

diff --git a/flower/file-path.cc b/flower/file-path.cc
index 63ecdb833ab46a451f98f493e25b8e6bfe080b56..31e7e993efe105fe8c35266e12a07f1c1bcbbfe9 100644 (file)
--- a/flower/file-path.cc
+++ b/flower/file-path.cc
@@ -9,8 +9,6 @@
 
 #include "file-path.hh"
 
-#include "std-string.hh"
-
 #include <cstdio>
 #include <cerrno>
 

diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc
index 17c1eafb7d9bd191cb056947b156d53debe2da25..bb51a018631f15362d34c6bd497ba2f5a032d976 100644 (file)
--- a/flower/getopt-long.cc
+++ b/flower/getopt-long.cc
@@ -12,7 +12,6 @@
 
 #include "config.hh"
 #include "international.hh"
-#include "std-string.hh"
 
 #if !HAVE_GETTEXT
 inline char *

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index 7b7d4f54e5b98c74310e569986c187ab6481e17c..c485f32016a7e72304eb13016827ae5cb396c997 100644 (file)
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -9,8 +9,6 @@
 
 #include <math.h>
 
-#include "std-string.hh"
-
 #include "flower-proto.hh"
 #include "drul-array.hh"
 

diff --git a/flower/include/string-convert.hh b/flower/include/string-convert.hh
index 64e23e0f8baab623ea05c46497d59a77cf69d128..1277890929f73176253a00fedddc70cf9d09eb86 100644 (file)
--- a/flower/include/string-convert.hh
+++ b/flower/include/string-convert.hh
@@ -9,7 +9,6 @@
 #include <cstdarg>
 using namespace std;
 
-#include "std-string.hh"
 #include "flower-proto.hh"
 
 /** The functor string_convert handles all conversions to/from string

diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc
index a96f0e2542afdde9c4ad0cb894e99fb12d35675a..4161e8df3bb7abec73327b0aea23d3869015f342 100644 (file)
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -15,7 +15,6 @@
 #include "music.hh"
 #include "note-collision.hh"
 #include "note-column.hh"
-#include "pitch.hh"
 #include "pointer-group-interface.hh"
 #include "skyline.hh"
 #include "stream-event.hh"

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index ade8303e0d75a5cdc639799fa58bcee6d617b541..a935bfc05a98081c34e72db0e62375555e4d2ddc 100644 (file)
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -9,6 +9,7 @@
 #include "context.hh"
 #include "direction.hh"
 #include "international.hh"
+#include "music.hh"
 #include "music-wrapper-iterator.hh"
 
 class Auto_change_iterator : public Music_wrapper_iterator

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 1ed274ec76ab00136a91d7d8d20fd11941484fdf..2ede25493acad7693f5b8dc8c19cd446d7a87b10 100644 (file)
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -11,14 +11,11 @@
 #include "align-interface.hh"
 #include "directional-element-interface.hh"
 #include "pointer-group-interface.hh"
-#include "grob.hh"
 #include "grob-array.hh"
 #include "hara-kiri-group-spanner.hh"
 #include "international.hh"
-#include "item.hh"
 #include "paper-column.hh"
 #include "paper-score.hh"
-#include "std-vector.hh"
 #include "system.hh"
 #include "warn.hh"
 

diff --git a/lily/beam-concave.cc b/lily/beam-concave.cc
index 47ee57bbf512f81dddd178b619857cc8ec553e8f..ee351d0a26739d2fba275b4615cd108b3bfad33b 100644 (file)
--- a/lily/beam-concave.cc
+++ b/lily/beam-concave.cc
@@ -3,9 +3,9 @@
 */
 
 #include "pointer-group-interface.hh"
-#include "std-vector.hh"
 #include "stem.hh"
 #include "beam.hh"
+#include "grob.hh"
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.hh"
 

diff --git a/lily/book.cc b/lily/book.cc
index f307bcf3c31c830a1523f29788c828c71ef6bece..44f7ee4ef933f7f206c151c1b4738c72aece689c 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -13,12 +13,10 @@ using namespace std;
 
 #include "lilypond-key.hh"
 #include "main.hh"
-#include "music-output.hh"
 #include "music.hh"
 #include "output-def.hh"
 #include "paper-book.hh"
 #include "score.hh"
-#include "stencil.hh"
 #include "text-interface.hh"
 #include "warn.hh"
 #include "performance.hh"

diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc
index 20ae27b01ffc6fa3e1630da61542de2698068e68..4885c6ed7255607900aa70de689cb84b65c360c1 100644 (file)
--- a/lily/break-substitution.cc
+++ b/lily/break-substitution.cc
@@ -10,9 +10,9 @@
 #include <cstdlib>
 using namespace std;
 
-#include "grob-array.hh"
 #include "item.hh"
 #include "system.hh"
+#include "grob-array.hh"
 
 static SCM break_criterion;
 void

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index 36b6502fc10cb60c525ae166e4578d6f33792678..d0acbcea05e6f29a8bcb95c7b2a682b5d12ad3c4 100644 (file)
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -20,6 +20,7 @@
 #include "direction.hh"
 #include "text-interface.hh"
 #include "font-interface.hh"
+#include "grob.hh"
 
 /*
   TODO: thickness should be a grob property (unit: linethickness)

diff --git a/lily/clef.cc b/lily/clef.cc
index 769c90195b4581b5b194426bbcc6b2e710ecb516..36427055f525f4522af68132732fba502de4edc5 100644 (file)
--- a/lily/clef.cc
+++ b/lily/clef.cc
@@ -11,7 +11,6 @@
 #include "font-interface.hh"
 #include "international.hh"
 #include "item.hh"
-#include "std-string.hh"
 #include "stencil.hh"
 
 MAKE_SCHEME_CALLBACK (Clef, calc_glyph_name, 1);

diff --git a/lily/context-property.cc b/lily/context-property.cc
index 851bbe0a413a94f3c1fd6590293f1b974f3b79e4..9496518a235dc46d5a2a64a309927248bc4dbe41 100644 (file)
--- a/lily/context-property.cc
+++ b/lily/context-property.cc
@@ -12,7 +12,6 @@
 #include "international.hh"
 #include "item.hh"
 #include "main.hh"
-#include "paper-column.hh"
 #include "simple-closure.hh"
 #include "spanner.hh"
 #include "warn.hh"

diff --git a/lily/context-specced-music-iterator.cc b/lily/context-specced-music-iterator.cc
index 86342a5eb422722976d8155ae43d0ffb5af758e9..59b3ba907c9c58bf4e09968d7fa7aa420567feaf 100644 (file)
--- a/lily/context-specced-music-iterator.cc
+++ b/lily/context-specced-music-iterator.cc
@@ -9,6 +9,8 @@
 
 #include "music-wrapper-iterator.hh"
 #include "context.hh"
+#include "music.hh"
+
 
 class Context_specced_music_iterator : public Music_wrapper_iterator
 {

diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc
index ebf4ad93e2f3a2ba04a78f61f2a262e3b182e93c..1a98ab2a43d9b186b7363ce0676a61c7b8af3f8b 100644 (file)
--- a/lily/dimension-cache.cc
+++ b/lily/dimension-cache.cc
@@ -8,6 +8,7 @@
 
 
 #include "dimension-cache.hh"
+
 #include "warn.hh"
 #include "grob.hh"
 

diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc
index 4c46118b1f05493c7ac94bce637106598a147d69..d8285449773f23fb74edc846d4b35f93cc171827 100644 (file)
--- a/lily/directional-element-interface.cc
+++ b/lily/directional-element-interface.cc
@@ -8,6 +8,7 @@
 
 #include "directional-element-interface.hh"
 #include "warn.hh"
+#include "grob.hh"
 
 Direction
 get_grob_direction (Grob *me)

diff --git a/lily/dispatcher.cc b/lily/dispatcher.cc
index fb3df2a40fd30cc98e20537599696cac3373d6f1..6107594900b678e8a63d2c140ebfe1b3c3176300 100644 (file)
--- a/lily/dispatcher.cc
+++ b/lily/dispatcher.cc
@@ -10,7 +10,6 @@
 #include "input.hh"
 #include "international.hh"
 #include "ly-smobs.icc"
-#include "stream-event.hh"
 #include "warn.hh"
 
 IMPLEMENT_SMOBS (Dispatcher);

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index 33af9f381b4e72c145e904a4d45e088c7eeaac38..a07dfcde116c132bd7aa1e64958ca22896da9dd2 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -21,6 +21,7 @@ using namespace std;
 #include "side-position-interface.hh"
 #include "axis-group-interface.hh"
 #include "stem.hh"
+#include "grob.hh"
 #include "pointer-group-interface.hh"
 
 /*

diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
index 19ba7bbf90d2ca01548443a7af8649ce53480a1b..7aa463b5767f6af2aad4193fccc26a356dcef13c 100644 (file)
--- a/lily/drum-note-performer.cc
+++ b/lily/drum-note-performer.cc
@@ -10,7 +10,6 @@
 #include "audio-item.hh"
 #include "audio-column.hh"
 #include "global-context.hh"
-#include "pitch.hh"
 #include "stream-event.hh"
 #include "translator.icc"
 #include "warn.hh"

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index fc87783bba6053b33df8303dca36ef07a33075e9..5c3d0feecdf2627da0f4ffca841dc5ef864298a9 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -23,7 +23,6 @@
 #include "staff-symbol-referencer.hh"
 #include "stream-event.hh"
 #include "warn.hh"
-#include "item.hh"
 #include "spanner.hh"
 
 #include "translator.icc"

diff --git a/lily/easy-notation.cc b/lily/easy-notation.cc
index 2fb0d7223474f364a377a1746c54bb8790f5537c..c6ecb0e20f4539a48301f0e959ac96f2240374c4 100644 (file)
--- a/lily/easy-notation.cc
+++ b/lily/easy-notation.cc
@@ -15,7 +15,6 @@ using namespace std;
 #include "grob.hh"
 #include "music.hh"
 #include "output-def.hh"
-#include "pitch.hh"
 #include "staff-symbol-referencer.hh"
 #include "stem.hh"
 #include "stream-event.hh"

diff --git a/lily/engraver-group.cc b/lily/engraver-group.cc
index 525c1fa85765cba6fe01008d52eb76c04c15f4c0..4c5a5864c3badc0553ed13588a35b64a3fd93b85 100644 (file)
--- a/lily/engraver-group.cc
+++ b/lily/engraver-group.cc
@@ -11,7 +11,6 @@
 #include "engraver-group.hh"
 #include "grob.hh"
 #include "paper-score.hh"
-#include "stream-event.hh"
 #include "translator-dispatch-list.hh"
 #include "warn.hh"
 

diff --git a/lily/engraver.cc b/lily/engraver.cc
index b61850eb2fe467a15c0295e8178b349ed2b78c52..c8eb805638d4619ba378968f103c815842f162b4 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -10,7 +10,6 @@
 
 #include "context.hh"
 #include "international.hh"
-#include "item.hh"
 #include "lilypond-key.hh"
 #include "music.hh"
 #include "paper-column.hh"

diff --git a/lily/event-chord-iterator.cc b/lily/event-chord-iterator.cc
index 89a0f383a99020427b918e09f8675663b9f7f087..ea1a105ea4c7083ffbad7b52b5415361704c4892 100644 (file)
--- a/lily/event-chord-iterator.cc
+++ b/lily/event-chord-iterator.cc
@@ -14,8 +14,6 @@
 #include "input.hh"
 #include "international.hh"
 #include "music.hh"
-#include "pitch.hh"
-#include "stream-event.hh"
 #include "warn.hh"
 
 Event_chord_iterator::Event_chord_iterator ()

diff --git a/lily/event-iterator.cc b/lily/event-iterator.cc
index 8e6d6df26ddf2ac638d59dcac5fc1d7ecdbed9f5..9f3b353c50c1e29bad3fb7de53e667affb77a848 100644 (file)
--- a/lily/event-iterator.cc
+++ b/lily/event-iterator.cc
@@ -13,7 +13,6 @@
 #include "input.hh"
 #include "international.hh"
 #include "music.hh"
-#include "pitch.hh"
 #include "warn.hh"
 
 Event_iterator::Event_iterator ()

diff --git a/lily/figured-bass-continuation.cc b/lily/figured-bass-continuation.cc
index 2830b10295267c50714fb633cba4b6305f2bd77f..0020b11e7ffeabe83e840cd7115a2201afb849e0 100644 (file)
--- a/lily/figured-bass-continuation.cc
+++ b/lily/figured-bass-continuation.cc
@@ -8,7 +8,6 @@
 */
 
 #include "line-interface.hh"
-#include "lily-guile.hh"
 #include "spanner.hh"
 #include "output-def.hh"
 #include "item.hh"

diff --git a/lily/font-metric-scheme.cc b/lily/font-metric-scheme.cc
index 64d6f5c40026b76613d83a8dd02505243d73f036..d04d1eab8ad8c7213a1cdb3468b2f5310a357bda 100644 (file)
--- a/lily/font-metric-scheme.cc
+++ b/lily/font-metric-scheme.cc
@@ -6,9 +6,10 @@
   (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "font-metric.hh"
+
 #include "warn.hh"
 #include "stencil.hh"
-#include "font-metric.hh"
 #include "modified-font-metric.hh"
 
 LY_DEFINE (ly_font_get_glyph, "ly:font-get-glyph",

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 7cfb8d749ccd1628d958f9ba039102c3d58c8bbf..03625cc946b6bd9c405bb157611c82d2a0fbbf41 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -18,7 +18,6 @@ using namespace std;
 #include "modified-font-metric.hh"
 #include "open-type-font.hh"
 #include "stencil.hh"
-#include "virtual-methods.hh"
 #include "warn.hh"
 
 #include "ly-smobs.icc"

diff --git a/lily/forbid-break-engraver.cc b/lily/forbid-break-engraver.cc
index 64dedf735815329db94c45e35dadf6cc19a415e7..c44bbb6012f300f058754c84e8ad50729f72c525 100644 (file)
--- a/lily/forbid-break-engraver.cc
+++ b/lily/forbid-break-engraver.cc
@@ -10,7 +10,6 @@
 #include "engraver.hh"
 #include "grob.hh"
 #include "input.hh"
-#include "moment.hh"
 #include "pitch.hh"
 #include "rhythmic-head.hh"
 

diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index 0fcb16bb1dfbdfaa678f49ee959b63e53753426b..142e7c2befa8179363c96a2ff10ea261faf655c1 100644 (file)
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -16,7 +16,6 @@ using namespace std;
 #include "international.hh"
 #include "libc-extension.hh"
 #include "lily-guile.hh"
-#include "std-string.hh"
 #include "misc.hh"
 #include "warn.hh"
 #include "version.hh"

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 858922562f0509a7c325d0406b49164c28a9b8ba..6e0e1c4379af9b971a00944e2e964414b850742a 100644 (file)
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -18,7 +18,6 @@ using namespace std;
 #include "music-iterator.hh"
 #include "music.hh"
 #include "output-def.hh"
-#include "stream-event.hh"
 #include "warn.hh"
 
 Global_context::Global_context (Output_def *o, Object_key *key)

diff --git a/lily/grace-music.cc b/lily/grace-music.cc
index bf3e304f16a51c2b757d6e7b80c0684149f539a2..51ea066f1a46756a0a1cacbed782b8d08c033860 100644 (file)
--- a/lily/grace-music.cc
+++ b/lily/grace-music.cc
@@ -8,7 +8,6 @@
 
 #include "music.hh"
 #include "music-wrapper.hh"
-#include "moment.hh"
 
 class Grace_music
 {

diff --git a/lily/grid-line-interface.cc b/lily/grid-line-interface.cc
index f5e98ffabe6c96ea86c586bac024f1a19948e822..f24f96829f8445c6c470439d0880afc8854b58e4 100644 (file)
--- a/lily/grid-line-interface.cc
+++ b/lily/grid-line-interface.cc
@@ -12,7 +12,6 @@
 #include "pointer-group-interface.hh"
 #include "lookup.hh"
 #include "output-def.hh"
-#include "stencil.hh"
 
 MAKE_SCHEME_CALLBACK (Grid_line_interface, print, 1);
 SCM

diff --git a/lily/grob-info.cc b/lily/grob-info.cc
index 23ff736d9536c0ab62a7b40c1a5023662052dddf..62af8f32562a8864ceb500b69838111eb1dac592 100644 (file)
--- a/lily/grob-info.cc
+++ b/lily/grob-info.cc
@@ -8,7 +8,6 @@
 
 #include "context.hh"
 #include "grob-info.hh"
-#include "grob.hh"
 #include "item.hh"
 #include "music.hh"
 #include "spanner.hh"

diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index afae13dbecaa922aba2f9c338c5e50f00a1fff9a..c47937db0f2737ef292f8a5ffba97583a4b5c73e 100644 (file)
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -11,7 +11,6 @@
 #include "grob.hh"
 #include "international.hh"
 #include "protected-scm.hh"
-#include "std-string.hh"
 #include "string-convert.hh"
 #include "warn.hh"
 #include "misc.hh"

diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc
index b31447ffac38b547a9f232baeee325875bac496b..be431b7e10cd62192c3c39ba7ad0b77fd5258c57 100644 (file)
--- a/lily/grob-scheme.cc
+++ b/lily/grob-scheme.cc
@@ -7,15 +7,13 @@
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "grob.hh"
-
 #include "warn.hh"             // error()
 #include "item.hh"
 #include "output-def.hh"
 #include "system.hh"
 #include "font-interface.hh"
 #include "paper-score.hh"
-
+#include "grob-array.hh"
 
 LY_DEFINE (ly_grob_property_data, "ly:grob-property-data",
           2, 0, 0, (SCM grob, SCM sym),

diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index 0dec921395bc21315cee013708805429b32b5e5e..90a06f145a9a0b0e7a05d0facf124d689792c2aa 100644 (file)
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -14,7 +14,6 @@
 #include "axis-group-interface.hh"
 #include "spanner.hh"
 #include "warn.hh"
-#include "item.hh"
 
 MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, y_extent, 1);
 SCM

diff --git a/lily/include/accidental-interface.hh b/lily/include/accidental-interface.hh
index 62eeb1b5adbaf426345c6654f798490faa90ca6d..8fd57a5fd91f6a7b9eab3390c9a0811c80f2aa67 100644 (file)
--- a/lily/include/accidental-interface.hh
+++ b/lily/include/accidental-interface.hh
@@ -12,7 +12,6 @@
 #include "std-vector.hh"
 
 #include "box.hh"
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "grob-interface.hh"
 

diff --git a/lily/include/accidental-placement.hh b/lily/include/accidental-placement.hh
index ed2703af87651b42894764305e7d6cff3e3effbf..c34fc0b76615ca275e21bd36a18abf2f52ebb5ae 100644 (file)
--- a/lily/include/accidental-placement.hh
+++ b/lily/include/accidental-placement.hh
@@ -10,7 +10,7 @@
 #define ACCIDENTAL_PLACEMENT_HH
 
 #include "grob-interface.hh"
-#include "grob.hh"
+#include "lily-proto.hh"
 
 class Accidental_placement
 {

diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh
index 5363ead48d924d1f1b14642d040b7356c5d69dca..54005bd986ef9216cafbdd9a8f2b613073a0a53a 100644 (file)
--- a/lily/include/align-interface.hh
+++ b/lily/include/align-interface.hh
@@ -10,7 +10,6 @@
 #define ALIGN_INTERFACE_HH
 
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "std-vector.hh"
 #include "grob-interface.hh"
 

diff --git a/lily/include/ambitus.hh b/lily/include/ambitus.hh
index 7bd37ecc29fc16608c9bd72f52349eef8bbf7e53..d687e20be4cc8d2a451222926bc53446279be857 100644 (file)
--- a/lily/include/ambitus.hh
+++ b/lily/include/ambitus.hh
@@ -9,7 +9,6 @@
 #ifndef AMBITUS_HH
 #define AMBITUS_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "grob-interface.hh"
 

diff --git a/lily/include/arpeggio.hh b/lily/include/arpeggio.hh
index ce69cddc17650ae0885f5645e1f39b6801772ab7..4d740dbc15bc2b2b8c0a77f45db5f674e1ca6ca0 100644 (file)
--- a/lily/include/arpeggio.hh
+++ b/lily/include/arpeggio.hh
@@ -9,7 +9,6 @@
 #ifndef ARPEGGIO_HH
 #define ARPEGGIO_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "grob-interface.hh"
 

diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh
index e03d7326adceadb2fc10f565c78bab86d142394e..b38537c661adb815447b0ad0912f46a73922e5e9 100644 (file)
--- a/lily/include/axis-group-interface.hh
+++ b/lily/include/axis-group-interface.hh
@@ -11,7 +11,6 @@
 
 #include "std-vector.hh"
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "grob-interface.hh"
 
 struct Axis_group_interface

diff --git a/lily/include/bar-line.hh b/lily/include/bar-line.hh
index d06c8314ea8f10e4858e112fca6e3ab68072dcdd..d7b51cbad9dce03bc7edcad611840e4b3a11e83e 100644 (file)
--- a/lily/include/bar-line.hh
+++ b/lily/include/bar-line.hh
@@ -7,7 +7,6 @@
 #ifndef BAR_HH
 #define BAR_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "grob-interface.hh"
 

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index eb74b7ac6d1e9d8f61762a8f96bd7a7d68c6979e..ee737a1beb3c97a05ad8a624729ea5686a783f10 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -7,7 +7,6 @@
 #ifndef BAR_HH
 #define BAR_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "grob-interface.hh"
 

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index ae138911ee8b27988fbbc82a78b51fc71b71f72d..9126bfbfec8e8051772978a29fe9d0a77255db6b 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -13,7 +13,6 @@
 #include "grob-interface.hh"
 #include "std-vector.hh"
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "stem-info.hh"
 
 /*

diff --git a/lily/include/book.hh b/lily/include/book.hh
index 5bdb47359cfae830f25a77f00f601c0f4f33854b..03553138d5e993a968d567dfc49c0dc8685d1c8b 100644 (file)
--- a/lily/include/book.hh
+++ b/lily/include/book.hh
@@ -9,11 +9,11 @@
 #ifndef BOOK_HH
 #define BOOK_HH
 
-#include "input.hh"
 #include "lily-proto.hh"
 #include "std-vector.hh"
 #include "object-key.hh"
 #include "std-string.hh"
+#include "virtual-methods.hh"
 
 class Book
 {

diff --git a/lily/include/breathing-sign.hh b/lily/include/breathing-sign.hh
index 237fd158be1522e43151784f4dd9ae4ee99177c8..69d46e67a2a65ec6953d6432e996aaf4d4369275 100644 (file)
--- a/lily/include/breathing-sign.hh
+++ b/lily/include/breathing-sign.hh
@@ -10,7 +10,7 @@
 #define BREATHING_SIGN_HH
 
 #include "grob-interface.hh"
-#include "lily-guile.hh"
+#include "lily-proto.hh"
 
 class Grob;
 

diff --git a/lily/include/clef.hh b/lily/include/clef.hh
index aaa74356854db15700608354a2b6e729a3d17fe6..6595fc468707432e152b3c695fbbf6845d77fa32 100644 (file)
--- a/lily/include/clef.hh
+++ b/lily/include/clef.hh
@@ -9,7 +9,6 @@
 #ifndef CLEF_HH
 #define CLEF_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "grob-interface.hh"
 

diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh
index 5884ff128e077fa991598dec158e03c97a856d0a..ac7b776208f0e45772b1aa57c8ac258201c01137 100644 (file)
--- a/lily/include/context-def.hh
+++ b/lily/include/context-def.hh
@@ -13,6 +13,8 @@
 #include "lily-proto.hh"
 #include "smobs.hh"
 #include "input.hh"
+#include "virtual-methods.hh"
+
 
 /*
   The definition of a interpretation context as given in the

diff --git a/lily/include/context.hh b/lily/include/context.hh
index 74058ad7982ec54df166c5f26e90d91c0f0b2fc9..8eba283027a8811e6bfa04b7396fe5b11c749d81 100644 (file)
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -10,7 +10,6 @@
 #define CONTEXT_HH
 
 #include "context-key-manager.hh"
-#include "lily-proto.hh"
 #include "listener.hh"
 #include "moment.hh"
 #include "std-vector.hh"

diff --git a/lily/include/custos.hh b/lily/include/custos.hh
index 45914f77abf5708e67ef94154172663d96eae742..d1a26ab4a4f60b89cf6f191ce61701f2aeb95d46 100644 (file)
--- a/lily/include/custos.hh
+++ b/lily/include/custos.hh
@@ -9,7 +9,6 @@
 #ifndef CUSTOS_HH
 #define CUSTOS_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "grob-interface.hh"
 

diff --git a/lily/include/directional-element-interface.hh b/lily/include/directional-element-interface.hh
index 9fff2486ad4ae6cd2ee08dda555670cd64155d5f..7da0eae62372abdd70593caa374ae5620fd437a0 100644 (file)
--- a/lily/include/directional-element-interface.hh
+++ b/lily/include/directional-element-interface.hh
@@ -9,7 +9,8 @@
 #ifndef DIRECTIONAL_ELEMENT_HH
 #define DIRECTIONAL_ELEMENT_HH
 
-#include "grob.hh"
+#include "lily-proto.hh"
+#include "direction.hh"
 
 // what is the advantage not having these two as STATICs of GROB -- jcn
 void set_grob_direction (Grob *, Direction);

diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh
index 8362e84613307d369eb2a588d2d581b0c660f390..503b1425ae158fe1060998acd493aa53ea891e2e 100644 (file)
--- a/lily/include/dot-column.hh
+++ b/lily/include/dot-column.hh
@@ -9,7 +9,7 @@
 #ifndef DOT_COLUMN_HH
 #define DOT_COLUMN_HH
 
-#include "lily-guile.hh"
+#include "lily-proto.hh"
 #include "grob-interface.hh"
 
 

diff --git a/lily/include/dots.hh b/lily/include/dots.hh
index 8f83f3a0574a618f2692e7e759c88b74b3db063c..df1d37289b131071289307697006df5788879c8e 100644 (file)
--- a/lily/include/dots.hh
+++ b/lily/include/dots.hh
@@ -10,7 +10,6 @@
 #define DOTS_HH
 
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "grob-interface.hh"
 
 class Dots

diff --git a/lily/include/grid-line-interface.hh b/lily/include/grid-line-interface.hh
index 1ff2de217fc9aa58566a5c83da136235b17fe87a..abb02c948860a74771040762f4855073ee97c177 100644 (file)
--- a/lily/include/grid-line-interface.hh
+++ b/lily/include/grid-line-interface.hh
@@ -10,7 +10,6 @@
 #define GRID_LINE_INTERFACE_HH
 
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "grob-interface.hh"
 
 

diff --git a/lily/include/hairpin.hh b/lily/include/hairpin.hh
index b76b4373a3970f624cffafb816cb7371a174909f..0d7c92ff23d6f9c5f3af55ec81825679fd27516c 100644 (file)
--- a/lily/include/hairpin.hh
+++ b/lily/include/hairpin.hh
@@ -8,13 +8,10 @@
 
 #ifndef HAIRPIN_HH
 #define HAIRPIN_HH
-#include "grob-interface.hh"
 
-#include "lily-guile.hh"
+#include "grob-interface.hh"
 #include "lily-proto.hh"
-/**
-   The hairpin symbol.
-*/
+
 struct Hairpin
 {
 public:

diff --git a/lily/include/hara-kiri-group-spanner.hh b/lily/include/hara-kiri-group-spanner.hh
index 93986178b691cc2d2c1b7704bdcf88b15f695574..42692c73969f7d1a847408ae69c5219a7997d3ca 100644 (file)
--- a/lily/include/hara-kiri-group-spanner.hh
+++ b/lily/include/hara-kiri-group-spanner.hh
@@ -9,7 +9,6 @@
 #ifndef HARA_KIRI_VERTICAL_GROUP_SPANNER_HH
 #define HARA_KIRI_VERTICAL_GROUP_SPANNER_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "grob-interface.hh"
 

diff --git a/lily/include/horizontal-bracket.hh b/lily/include/horizontal-bracket.hh
index dea58a3cccfc375d5eebe9632da1933e77d51350..d8cbef6c067ab225af1ee61a1141251e43d8868e 100644 (file)
--- a/lily/include/horizontal-bracket.hh
+++ b/lily/include/horizontal-bracket.hh
@@ -9,7 +9,6 @@
 #ifndef HORIZONTAL_BRACKET_HH
 #define HORIZONTAL_BRACKET_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "std-vector.hh"
 #include "grob-interface.hh"

diff --git a/lily/include/input.hh b/lily/include/input.hh
index 625910ea74e3a4e42f4e983b753be5fa5c69f582..15f54aef223f4c411acc65955eba61a86da78d23 100644 (file)
--- a/lily/include/input.hh
+++ b/lily/include/input.hh
@@ -10,7 +10,6 @@
 #define INPUT_HH
 
 #include "flower-proto.hh"
-#include "std-string.hh"
 
 /**
    Base class for anything that records its poisition in the parse file.
@@ -53,8 +52,6 @@ public:
 };
 
 
-
-#include "input.hh"
 #include "smobs.hh"
 
 SCM make_input (Input spot);

diff --git a/lily/include/item.hh b/lily/include/item.hh
index d1d7a2f7d9c1423751c4cfd6317a3600e3137a39..cb8c61523e6396440dd071b9a437c2113a8d1302 100644 (file)
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -8,8 +8,6 @@
 #ifndef ITEM_HH
 #define ITEM_HH
 
-#include "grob-interface.hh"
-#include "box.hh"
 #include "grob.hh"
 
 /**

diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh
index d4557e368826cfb7a195070c89303b794cf9e755..b07734769a1b747a29cf55ceb1cb2ded2d50cb06 100644 (file)
--- a/lily/include/lily-parser.hh
+++ b/lily/include/lily-parser.hh
@@ -11,7 +11,6 @@
 
 #include "duration.hh"
 #include "input.hh"
-#include "std-vector.hh"
 #include "pitch.hh"
 
 /**

diff --git a/lily/include/line-spanner.hh b/lily/include/line-spanner.hh
index 4c7e4471d6b6d157fcce6d9f78bf608899b67949..de1170b6b095c287ad2a248d3140b5688d8b0e95 100644 (file)
--- a/lily/include/line-spanner.hh
+++ b/lily/include/line-spanner.hh
@@ -9,12 +9,9 @@
 #ifndef LINE_SPANNER_HH
 #define LINE_SPANNER_HH
 
-#include "lily-guile.hh"
+#include "lily-proto.hh"
 #include "grob-interface.hh"
 
-class Grob;
-class Stencil;
-
 class Line_spanner
 {
 public:

diff --git a/lily/include/melody-spanner.hh b/lily/include/melody-spanner.hh
index a02fc1f576fd49ec53289ff5366f5377016a07ce..0b67613cfad609bec7996e706c27b0f071f7e090 100644 (file)
--- a/lily/include/melody-spanner.hh
+++ b/lily/include/melody-spanner.hh
@@ -10,7 +10,6 @@
 #ifndef MELODY_SPANNER_HH
 #define MELODY_SPANNER_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "grob-interface.hh"
 

diff --git a/lily/include/mensural-ligature.hh b/lily/include/mensural-ligature.hh
index e887e07a9a3016bce05fe6bb599463a26c6d80a4..afb04a2ef20519bd9702c632d4b4b97ea0e37372 100644 (file)
--- a/lily/include/mensural-ligature.hh
+++ b/lily/include/mensural-ligature.hh
@@ -11,7 +11,6 @@
 #define MENSURAL_LIGATURE_HH
 
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "grob-interface.hh"
 
 

diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh
index 2b29582869f869457f9f54325c50b551a4f03890..dd0d4054ae1c4ca0c5d2e545f888133a821ec2f2 100644 (file)
--- a/lily/include/multi-measure-rest.hh
+++ b/lily/include/multi-measure-rest.hh
@@ -10,7 +10,6 @@
 #define MULTI_MEASURE_REST_HH
 
 #include "grob-interface.hh"
-#include "lily-guile.hh"
 #include "rod.hh"
 
 class Multi_measure_rest

diff --git a/lily/include/music-sequence.hh b/lily/include/music-sequence.hh
index 9287bc6e2b8efa0e3b1481bdf955a3112c5d6a0e..dc1046aaa86278f1ab5a63fb9be7af5ed6c1638b 100644 (file)
--- a/lily/include/music-sequence.hh
+++ b/lily/include/music-sequence.hh
@@ -9,7 +9,9 @@
 #ifndef MUSIC_SEQUENCE_HH
 #define MUSIC_SEQUENCE_HH
 
-#include "music.hh"
+#include "pitch.hh"
+#include "moment.hh"
+#include "lily-guile.hh"
 
 struct Music_sequence
 {

diff --git a/lily/include/music-wrapper-iterator.hh b/lily/include/music-wrapper-iterator.hh
index d249428654fe09715b15cf77b6fb2d941b340c5a..ca118be037ad06b68f085625076514dff35e8b11 100644 (file)
--- a/lily/include/music-wrapper-iterator.hh
+++ b/lily/include/music-wrapper-iterator.hh
@@ -9,7 +9,6 @@
 #ifndef MUSIC_WRAPPER_ITERATOR_HH
 #define MUSIC_WRAPPER_ITERATOR_HH
 
-#include "music.hh"
 #include "music-iterator.hh"
 
 /**

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 223764bb14d897eeb25bbf466033d56e0bdb9c50..f7e4407f3ba186ec45e1b58c1823791f040ffacf 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -9,7 +9,6 @@
 #ifndef MUSIC_HH
 #define MUSIC_HH
 
-#include "virtual-methods.hh"
 #include "smobs.hh"
 #include "moment.hh"
 #include "pitch.hh"

diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh
index 20de1ca362b4ec5bd3849b80fbdf099067e36d0e..7500ea45e980c646f54fdaa3a5cebebcce714c59 100644 (file)
--- a/lily/include/note-collision.hh
+++ b/lily/include/note-collision.hh
@@ -9,10 +9,9 @@
 #ifndef COLLISION_HH
 #define COLLISION_HH
 
-#include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "std-vector.hh"
 #include "grob-interface.hh"
+#include "lily-proto.hh"
 
 
 /**

diff --git a/lily/include/output-def.hh b/lily/include/output-def.hh
index 8670be67fba5fe09765384f336e1b288e00f94fa..6a6165037efea772f25f0e869bc3734caf393976 100644 (file)
--- a/lily/include/output-def.hh
+++ b/lily/include/output-def.hh
@@ -9,7 +9,6 @@
 #ifndef MUSIC_OUTPUT_DEF_HH
 #define MUSIC_OUTPUT_DEF_HH
 
-#include "std-string.hh"
 #include "lily-proto.hh"
 #include "virtual-methods.hh"
 #include "smobs.hh"

diff --git a/lily/include/page-breaking.hh b/lily/include/page-breaking.hh
index 548100ca8b14ca7ef40e08a9ce4da3e2e166bad9..7c2a99e3819203c760f4f91876c557dda3f78f18 100644 (file)
--- a/lily/include/page-breaking.hh
+++ b/lily/include/page-breaking.hh
@@ -11,7 +11,6 @@
 #define PAGE_BREAKING_HH
 
 #include "constrained-breaking.hh"
-#include "lily-guile.hh"
 
 /* Either a paper-score, markup or header.
  */

diff --git a/lily/include/page-turn-page-breaking.hh b/lily/include/page-turn-page-breaking.hh
index 6fb78bc67d1ae17173432db8a438a24ee25fb3b7..a109f1ff8f59cd93770a081320519851579dac96 100644 (file)
--- a/lily/include/page-turn-page-breaking.hh
+++ b/lily/include/page-turn-page-breaking.hh
@@ -11,9 +11,7 @@
 #ifndef PAGE_TURN_PAGE_BREAKING_HH
 #define PAGE_TURN_PAGE_BREAKING_HH
 
-#include "constrained-breaking.hh"
 #include "page-breaking.hh"
-#include "lily-guile.hh"
 
 /*
   A dynamic programming solution to breaking pages

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index 5449ec0a422cb400b0f9d8d1747060643b48c513..76b4d6c8eb684d0f1f7c6fb32e6c17c8b12f59ff 100644 (file)
--- a/lily/include/pango-font.hh
+++ b/lily/include/pango-font.hh
@@ -15,9 +15,8 @@
 
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
-#include "font-metric.hh"
 
-#include "open-type-font.hh"
+#include "font-metric.hh"
 
 class Pango_font : public Font_metric
 {

diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index c182d6aa6c6887fde16665b0804b4e8349a0e8e6..542bd86e2b1760f2bff808f5fc169ee3e6355761 100644 (file)
--- a/lily/include/paper-column.hh
+++ b/lily/include/paper-column.hh
@@ -11,7 +11,6 @@
 
 #include "item.hh"
 #include "rod.hh"
-#include "lily-proto.hh"
 
 class Paper_column : public Item
 {

diff --git a/lily/include/prob.hh b/lily/include/prob.hh
index 40d5f5e25089ecadfabd41b95c172c640e32aeb3..6c6f59be7c691eee8545d5d997adb9760933cb23 100644 (file)
--- a/lily/include/prob.hh
+++ b/lily/include/prob.hh
@@ -10,6 +10,8 @@
 #define PROPERTY_OBJECT_HH
 
 #include "stencil.hh"
+#include "virtual-methods.hh"
+
 
 /*
   A formatted "system" (A block of titling also is a Property_object)

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index c90883c2e29ba37b44636b6e74752193207998b9..5f2e165765aeb1eec429d7069b3b0b4040f38bc5 100644 (file)
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -11,7 +11,6 @@
 
 #include "grob-interface.hh"
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 
 class Rest_collision
 {

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index 4d8be0e01c3497bf5073082bc48cf3ac3b9752f5..20107120b7c411bef2f4fa8bbbb4441cf04140db 100644 (file)
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -9,7 +9,6 @@
 #ifndef REST_HH
 #define REST_HH
 
-#include "lily-guile.hh"
 #include "grob-interface.hh"
 
 class Grob;

diff --git a/lily/include/rhythmic-head.hh b/lily/include/rhythmic-head.hh
index f59e758a4b638e15c7fa2bb3ffa2d412ae2fc563..2fae285707052631190c135e129533fb757aa6e7 100644 (file)
--- a/lily/include/rhythmic-head.hh
+++ b/lily/include/rhythmic-head.hh
@@ -10,7 +10,6 @@
 #define RHYTHMIC_HEAD_HH
 
 #include "grob-interface.hh"
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 
 class Rhythmic_head

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 039e1d236a300b299c3ac4011d647def43fd453b..71b2037efb6e8035fee2a906baf9b957ea26be2c 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -15,7 +15,6 @@
 #include "std-vector.hh"
 #include "smobs.hh"
 #include "virtual-methods.hh"
-#include "std-string.hh"
 
 class Score
 {

diff --git a/lily/include/script-column.hh b/lily/include/script-column.hh
index d3ac2e49ff38b7800a0ee8fdf512dff8e62d3652..e36eb952bfb86543fe696abafb51e92bc95405f3 100644 (file)
--- a/lily/include/script-column.hh
+++ b/lily/include/script-column.hh
@@ -9,7 +9,6 @@
 #ifndef Script_COLUMN_HH
 #define Script_COLUMN_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "grob-interface.hh"
 #include "std-vector.hh"

diff --git a/lily/include/script-interface.hh b/lily/include/script-interface.hh
index 3b8d714eeb9a1621cc43ad3d016bd4a1785e35b1..6acbadc35b4339502e7255f6cf768fba738a62c4 100644 (file)
--- a/lily/include/script-interface.hh
+++ b/lily/include/script-interface.hh
@@ -9,7 +9,6 @@
 #ifndef SCRIPT_INTERFACE_HH
 #define SCRIPT_INTERFACE_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "grob-interface.hh"
 

diff --git a/lily/include/semi-tie-column.hh b/lily/include/semi-tie-column.hh
index d27ad3c5a47e8bee69c24549837c6fa4ce4ec577..1671f7fc5f77cd847b559f0589d6b35ef757eaae 100644 (file)
--- a/lily/include/semi-tie-column.hh
+++ b/lily/include/semi-tie-column.hh
@@ -12,7 +12,6 @@
 
 #include "grob-interface.hh"
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 
 struct Semi_tie_column
 {

diff --git a/lily/include/semi-tie.hh b/lily/include/semi-tie.hh
index 0d5bb85f75882a339557d4b6c3019c799d6d4abe..83688ab01295a40401ecb1b4bfb74f707870dc13 100644 (file)
--- a/lily/include/semi-tie.hh
+++ b/lily/include/semi-tie.hh
@@ -12,7 +12,7 @@
 
 
 #include "grob-interface.hh"
-#include "lily-guile.hh"
+#include "lily-proto.hh"
 
 struct Semi_tie
 {

diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh
index c8440c7f9409dfa88ccc758cdbe49713b04763f4..1edda9b1bf6421e63e3a36e07ae6b2fc86329327 100644 (file)
--- a/lily/include/skyline.hh
+++ b/lily/include/skyline.hh
@@ -10,6 +10,7 @@
 #define SKYLINE_HH
 
 #include <list>
+
 #include "axis.hh"
 #include "box.hh"
 #include "interval.hh"

diff --git a/lily/include/slur-configuration.hh b/lily/include/slur-configuration.hh
index fa61e42b145a08571929c3b5382659e320eb98dc..1db127238ac82aa1a1d09eeb595cec6f7732fb4b 100644 (file)
--- a/lily/include/slur-configuration.hh
+++ b/lily/include/slur-configuration.hh
@@ -10,8 +10,8 @@
 #define SLUR_CONFIGURATION_HH
 
 #include "bezier.hh"
+#include "lily-proto.hh"
 #include "std-vector.hh"
-#include "main.hh"
 
 
 enum Configuration_tag

diff --git a/lily/include/slur-scoring.hh b/lily/include/slur-scoring.hh
index 3e5b9d86b4fae42d53685177020cb980e23c4abd..c02fac2005363a066bc59a04b323c1dac97451f1 100644 (file)
--- a/lily/include/slur-scoring.hh
+++ b/lily/include/slur-scoring.hh
@@ -10,7 +10,6 @@
 #define SLUR_SCORING_HH
 
 #include "box.hh"
-#include "lily-proto.hh"
 #include "std-vector.hh"
 #include "lily-guile.hh"
 #include "slur-score-parameters.hh"

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index f31aba7bb2d2d7e3f9f10b9ea241030243fa7e56..0ec721d4d26f54c945367ede09bc4e2e6a7bd43e 100644 (file)
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -9,9 +9,7 @@
 #ifndef SLUR_HH
 #define SLUR_HH
 
-#include "grob-info.hh"
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "std-vector.hh"
 #include "grob-interface.hh"
 
@@ -21,7 +19,7 @@ public:
   static void add_column (Grob *me, Grob *col);
   static void add_extra_encompass (Grob *me, Grob *col);
   static void replace_breakable_encompass_objects (Grob *me);
-  static void auxiliary_acknowledge_extra_object (Grob_info, vector<Grob*>&, vector<Grob*>&);
+  static void auxiliary_acknowledge_extra_object (Grob_info const &, vector<Grob*>&, vector<Grob*>&);
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));

diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh
index a2dcdb613d31dd442cb3ce15464aeb4b91c688a0..da37b4f9e8004798ccc5fcfa9460146c25310fe3 100644 (file)
--- a/lily/include/smobs.hh
+++ b/lily/include/smobs.hh
@@ -10,7 +10,6 @@
 #define SMOBS_HH
 
 #include "lily-guile.hh"
-#include "virtual-methods.hh"
 #include "warn.hh"
 
 /*

diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh
index 88120da55c1d2d94269dfb6439ab20273f2ef20d..71ae366a8552500a6a044b629fea43e8217176b0 100644 (file)
--- a/lily/include/source-file.hh
+++ b/lily/include/source-file.hh
@@ -9,7 +9,6 @@
 #ifndef SOURCE_FILE_HH
 #define SOURCE_FILE_HH
 
-#include "flower-proto.hh"
 #include "std-vector.hh"
 #include "lily-proto.hh"
 #include "smobs.hh"

diff --git a/lily/include/spaceable-grob.hh b/lily/include/spaceable-grob.hh
index 573be0337f24fcf544ff2e8d63a6cd83ed434c5c..cb1217bf6f02d317820e845f27e5f96323a5e777 100644 (file)
--- a/lily/include/spaceable-grob.hh
+++ b/lily/include/spaceable-grob.hh
@@ -9,7 +9,6 @@
 #ifndef SPACEABLE_GROB_HH
 #define SPACEABLE_GROB_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "grob-interface.hh"
 

diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh
index 719d8d1fb329f0a555e1cc98cc31594fcccfa16b..b1d760c4413ef1a04857baf5f58720aa733edea9 100644 (file)
--- a/lily/include/spacing-spanner.hh
+++ b/lily/include/spacing-spanner.hh
@@ -10,7 +10,6 @@
 #define SPACING_SPANNER_HH
 
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "rational.hh"
 #include "std-vector.hh"
 #include "grob-interface.hh"

diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index a328101ade112051e82749bf4a3a73fee1a177ac..449f8bca3d91ec0d54e5c9f4587c2143e32445e1 100644 (file)
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -9,7 +9,6 @@
 #ifndef SPAN_BAR_HH
 #define SPAN_BAR_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "grob-interface.hh"
 

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index abc6d23adceddca17d5c8edf68090a11c062c726..b90d1995168aa92158b6300969299e4f0eb28571 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -9,8 +9,6 @@
 
 #include "grob.hh"
 #include "rod.hh"
-#include "grob-interface.hh"
-#include "lily-proto.hh"
 
 /** A symbol which is attached between two columns. A spanner is a
     symbol which spans across several columns, so its final appearance

diff --git a/lily/include/staff-symbol.hh b/lily/include/staff-symbol.hh
index 599c1cbf60bf77866838ddcb80033ca904fc4941..af532014d9bf1226d3a0caf1e76da7e6d3a65bf7 100644 (file)
--- a/lily/include/staff-symbol.hh
+++ b/lily/include/staff-symbol.hh
@@ -9,7 +9,6 @@
 #ifndef STAFF_SYMBOL_HH
 #define STAFF_SYMBOL_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "grob-interface.hh"
 

diff --git a/lily/include/stem-info.hh b/lily/include/stem-info.hh
index c83c1c68a2c7840e18ce360b8de16e704d0237dd..2551c1b094ed759af948ab186e47d35ba362e60a 100644 (file)
--- a/lily/include/stem-info.hh
+++ b/lily/include/stem-info.hh
@@ -10,6 +10,7 @@
 #define STEM_INFO_HH
 
 #include "real.hh"
+#include "direction.hh"
 
 /*
   Parameters for a stem, (multiply with stemdirection, to get real values

diff --git a/lily/include/stem-tremolo.hh b/lily/include/stem-tremolo.hh
index d05e5fc410b0c41ece4d88272e87e1d8bf3051cb..75946a34ee1fb3d2633ddc6ab8ac74eefb095c1c 100644 (file)
--- a/lily/include/stem-tremolo.hh
+++ b/lily/include/stem-tremolo.hh
@@ -10,7 +10,6 @@
 #define ABBREV_HH
 
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "grob-interface.hh"
 
 class Stem_tremolo

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index 402ab5a14b0f9268302e95a09d3632e2244710a6..8808d16665576eec2b82a9786684e911945cd78e 100644 (file)
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -9,7 +9,6 @@
 
 #include "std-vector.hh"
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "stem-info.hh"
 #include "grob-interface.hh"
 

diff --git a/lily/include/system-start-delimiter.hh b/lily/include/system-start-delimiter.hh
index 4304837649272d8595c43c33c67f1d311f4dff14..f04cde76f64f63c584eaa581e69bb0322f8dbf91 100644 (file)
--- a/lily/include/system-start-delimiter.hh
+++ b/lily/include/system-start-delimiter.hh
@@ -9,7 +9,6 @@
 #ifndef SYSTEM_START_DELIMITER_HH
 #define SYSTEM_START_DELIMITER_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "grob-interface.hh"
 

diff --git a/lily/include/system.hh b/lily/include/system.hh
index 9866a1966778125ce25edb882491732159e372f2..e1a91bf4fa24fe5c8bc41690c1ff4ff13fa1abb9 100644 (file)
--- a/lily/include/system.hh
+++ b/lily/include/system.hh
@@ -10,9 +10,7 @@
 
 #include "column-x-positions.hh"
 #include "spanner.hh"
-#include "grob-array.hh"
 #include "skyline.hh"
-#include "grob-interface.hh"
 
 /*
   If you keep following offset reference points, you will always end

diff --git a/lily/include/text-spanner.hh b/lily/include/text-spanner.hh
index 28fc7c680a91aeb64345d6d25091e41ae7ad3acd..06034b1870f91d51e6711fcf4d5ebf0cb914a181 100644 (file)
--- a/lily/include/text-spanner.hh
+++ b/lily/include/text-spanner.hh
@@ -9,7 +9,6 @@
 #ifndef TEXT_SPANNER_HH
 #define TEXT_SPANNER_HH
 
-#include "lily-guile.hh"
 #include "grob-interface.hh"
 #include "lily-proto.hh"
 

diff --git a/lily/include/tie-column.hh b/lily/include/tie-column.hh
index 3826b207cea03bf2540b0a88c203d3912f0edd4e..77d6d68a7809e86874dc02c92a889377f1d6abc6 100644 (file)
--- a/lily/include/tie-column.hh
+++ b/lily/include/tie-column.hh
@@ -9,9 +9,8 @@
 #ifndef TIE_COLUMN_HH
 #define TIE_COLUMN_HH
 
-#include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "grob-interface.hh"
+#include "lily-proto.hh"
 
 class Tie_column
 {

diff --git a/lily/include/tie-configuration.hh b/lily/include/tie-configuration.hh
index cd3bfe399882c875400d70fb9a7f2758f132af9d..95fd15b01c883ad139798cd3e9944316d8da2fd8 100644 (file)
--- a/lily/include/tie-configuration.hh
+++ b/lily/include/tie-configuration.hh
@@ -10,12 +10,10 @@
 #ifndef TIE_CONFIGURATION_HH
 #define TIE_CONFIGURATION_HH
 
-#include "main.hh"
-#include "lily-proto.hh"
 #include "direction.hh"
 #include "interval.hh"
-#include "compare.hh"
 #include "std-vector.hh"
+#include "main.hh" // DEBUG_SLUR_SCORING
 
 class Tie_configuration
 {

diff --git a/lily/include/tie-formatting-problem.hh b/lily/include/tie-formatting-problem.hh
index 7d48995d60798b7decd017e0064773aad912c9e2..2b1e2b6230533cc8e8f99b6855a5eb3b09ee0c2a 100644 (file)
--- a/lily/include/tie-formatting-problem.hh
+++ b/lily/include/tie-formatting-problem.hh
@@ -11,9 +11,7 @@
 #define TIE_FORMATTING_PROBLEM_HH
 
 #include "drul-array.hh"
-#include "std-vector.hh"
 #include "skyline.hh"
-#include "lily-proto.hh"
 #include "tie-configuration.hh"
 #include "tie-details.hh"
 #include "tuple.hh"

diff --git a/lily/include/tie.hh b/lily/include/tie.hh
index 9764908fe82fc2999a44695283eff9cd6063462a..35d3d9596cb54767190fa8c4ec2ef7e85c530836 100644 (file)
--- a/lily/include/tie.hh
+++ b/lily/include/tie.hh
@@ -9,7 +9,6 @@
 #ifndef TIE_HH
 #define TIE_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "skyline.hh"
 #include "grob-interface.hh"

diff --git a/lily/include/timing-translator.hh b/lily/include/timing-translator.hh
index ef13b682ccda6a2fdb4d1e42d5bde78539a6e015..3ed20422b7a1869c4daad72625bebe8a2b224551 100644 (file)
--- a/lily/include/timing-translator.hh
+++ b/lily/include/timing-translator.hh
@@ -12,8 +12,6 @@
 #include "moment.hh"
 #include "translator.hh"
 
-#include "std-vector.hh"
-
 class Timing_translator : public Translator
 {
 public:

diff --git a/lily/include/translator-dispatch-list.hh b/lily/include/translator-dispatch-list.hh
index e385dee0c05265cd0d282aa4d3b8f40e43e00ef0..3a543052353f431373b205ca841fcf39169cd54f 100644 (file)
--- a/lily/include/translator-dispatch-list.hh
+++ b/lily/include/translator-dispatch-list.hh
@@ -10,7 +10,6 @@
 #define TRANSLATOR_DISPATCH_LIST_HH
 
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "std-vector.hh"
 #include "smobs.hh"
 

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index 577c1db93f8a016b608dd1241f6b952f221c6a68..72481b5da394298f9adc8544d2bab2b67f810699 100644 (file)
--- a/lily/include/translator-group.hh
+++ b/lily/include/translator-group.hh
@@ -11,7 +11,6 @@
 
 #include "listener.hh"
 #include "translator.hh"
-#include "std-vector.hh"
 
 typedef void (Translator:: *Translator_method) (void);
 typedef void (Translator_group:: *Translator_group_method) (void);

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index cf1439e673f0325bbf9e43a246f39268ef65bb94..eee42e5b7d87a0bef620663df1c1ddabf165207a 100644 (file)
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -10,10 +10,9 @@
 #define TRANSLATOR_HH
 
 #include "global-ctor.hh"
-#include "std-string.hh"
 #include "lily-proto.hh"
 #include "virtual-methods.hh"
-#include "input.hh"
+#include "input.hh"            // for error reporting
 #include "smobs.hh"
 #include "std-vector.hh"
 #include "protected-scm.hh"

diff --git a/lily/include/tuplet-bracket.hh b/lily/include/tuplet-bracket.hh
index 221be2b6d33933c5cbc3cb15bdce0d3795e23c90..b60c417c19f953cad1aed2b7c65b7691b77148cc 100644 (file)
--- a/lily/include/tuplet-bracket.hh
+++ b/lily/include/tuplet-bracket.hh
@@ -7,7 +7,6 @@
 #ifndef Tuplet_bracket_HH
 #define Tuplet_bracket_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "std-vector.hh"
 #include "grob-interface.hh"

diff --git a/lily/include/vaticana-ligature.hh b/lily/include/vaticana-ligature.hh
index c9e53803e4a627679026ee8bd4339d8cf3c14f40..f20fccf28fa17e44a7c8e10a0c0c28d13e1ccdf0 100644 (file)
--- a/lily/include/vaticana-ligature.hh
+++ b/lily/include/vaticana-ligature.hh
@@ -9,7 +9,6 @@
 #ifndef VATICANA_LIGATURE_HH
 #define VATICANA_LIGATURE_HH
 
-#include "stencil.hh"
 #include "grob-interface.hh"
 #include "lily-proto.hh"
 

diff --git a/lily/include/volta-bracket.hh b/lily/include/volta-bracket.hh
index 955876f6f6943312a8017b3042196b03e27a6ec4..687439cc7f8078e8bf7aa0a6e8cdb7a5f7b7741b 100644 (file)
--- a/lily/include/volta-bracket.hh
+++ b/lily/include/volta-bracket.hh
@@ -8,7 +8,6 @@
 #define VOLTA_SPANNER_HH
 
 #include "spanner.hh"
-#include "grob-interface.hh"
 #include "lily-proto.hh"
 
 class Volta_bracket_interface

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 9290ef93e523bf984170e95d43839281d823ec01..a256b8beb19b4e48cc44778e4f780a55613c0c3a 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -7,7 +7,6 @@
 */
 
 #include "engraver.hh"
-#include "spanner.hh"
 #include "pointer-group-interface.hh"
 #include "side-position-interface.hh"
 #include "axis-group-interface.hh"

diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc
index 4a62aa7e4da1c8f2dd14476d72d8ef009888968b..ea0fa43d4ef35a018a95dab11c0f0ee1bf8f8e1c 100644 (file)
--- a/lily/ledger-line-spanner.cc
+++ b/lily/ledger-line-spanner.cc
@@ -9,7 +9,6 @@
 #include <map>
 using namespace std;
 
-#include "item.hh"
 #include "note-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "staff-symbol.hh"

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index e1a0e9bffdc059fde75766d07b559dff3393bd2e..4c23b2ad409c9bf4de6bffb8879bd9b47919a61f 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -16,8 +16,6 @@
 
 using namespace std;
 
-#include "config.hh"
-
 #include "dimensions.hh"
 #include "direction.hh"
 #include "file-path.hh"

diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc
index a1cdfa3c035f9b5d7d26db9f3d81f7928f9930bd..8bc3d5e9943b05735d6d72d1de1322010ebde5ad 100644 (file)
--- a/lily/lily-parser-scheme.cc
+++ b/lily/lily-parser-scheme.cc
@@ -11,7 +11,6 @@
 #include "file-name-map.hh"
 #include "file-name.hh"
 #include "file-path.hh"
-#include "input.hh"
 #include "international.hh"
 #include "lily-lexer.hh"
 #include "lily-parser.hh"

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index dafed1d3c8756e74ac9f61faaeab022eba64464e..6011ede3f24c29f3363d847bd683b2aa3295be6e 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -6,7 +6,6 @@
   (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "context.hh"
 #include "dispatcher.hh"
 #include "global-context.hh"
 #include "grob.hh"

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index 931ef3b04144fd56d660d964172dbd6c15328245..d3f2eafe853c04265f6f11ae99f3516568446f70 100644 (file)
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -7,8 +7,6 @@
 */
 
 #include "music.hh"
-#include "pitch.hh"
-#include "moment.hh"
 
 struct Lyric_combine_music
 {

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index b7d9bb6e108b3e352912f33b6e003b16d101331a..d30a53d6681b05ddb67bcf772f1ef3d6135c61b0 100644 (file)
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -12,7 +12,6 @@
 #include "item.hh"
 #include "warn.hh"
 #include "lookup.hh"
-#include "paper-column.hh"
 #include "output-def.hh"
 #include "note-head.hh"
 #include "pointer-group-interface.hh"

diff --git a/lily/main.cc b/lily/main.cc
index 0e8a1e580dd3aecfaf48ad99a9e14ffd366f0818..9a21728eb308e2c370d1cbda54ae3c67128f007f 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -34,7 +34,6 @@ using namespace std;
 #include "getopt-long.hh"
 #include "global-ctor.hh"
 #include "international.hh"
-#include "lily-guile.hh"
 #include "lily-version.hh"
 #include "misc.hh"
 #include "output-def.hh"

diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc
index 52eee67268a60e6253b0e95db5e2b36a4bc0bcd1..e0fb13044d14d239858aa83ccd0fb0e4aa9dae84 100644 (file)
--- a/lily/modified-font-metric.cc
+++ b/lily/modified-font-metric.cc
@@ -13,7 +13,6 @@ using namespace std;
 #include "text-metrics.hh"
 #include "warn.hh"
 #include "stencil.hh"
-#include "lookup.hh"
 #include "main.hh"
 
 Modified_font_metric::Modified_font_metric (Font_metric *fm,

diff --git a/lily/module-scheme.cc b/lily/module-scheme.cc
index 0d64fa52905df0dba49710285737942302aa8078..f930a2856ed3980b8a040177853bbf18412da7da 100644 (file)
--- a/lily/module-scheme.cc
+++ b/lily/module-scheme.cc
@@ -6,12 +6,12 @@
   (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "lily-guile.hh"
+#include "ly-module.hh"
+
 #include "warn.hh"
 #include "main.hh"
 #include "std-string.hh"
 
-#include "ly-module.hh"
 
 /*
   If a variable in changed in SRC, we DEST doesn't see the

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 036a0c324945341182b4c4a04b2a6043e17b8b8d..3a97459f89565449b8c405b094b711eb6188224b 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -7,12 +7,11 @@
 */
 
 
-#include "music-iterator.hh"
-
 #include <cstdio>
 using namespace std;
 
 #include "warn.hh"
+#include "music.hh"
 #include "context.hh"
 #include "event-iterator.hh"
 #include "input.hh"

diff --git a/lily/music-output.cc b/lily/music-output.cc
index 184849b18af7e1a478a11d0294b104bd06be93cd..096dd330079e5b15c99ec57811f4cfe69eb1f469 100644 (file)
--- a/lily/music-output.cc
+++ b/lily/music-output.cc
@@ -9,7 +9,6 @@
 #include "music-output.hh"
 
 #include "ly-smobs.icc"
-#include "virtual-methods.hh"
 
 Music_output::Music_output ()
 {

diff --git a/lily/music-scheme.cc b/lily/music-scheme.cc
index b18aae42da06a64807208f0a9c3ea616de7ae153..365c3f434474166b64fa6b5df2b9dc03005ecfb5 100644 (file)
--- a/lily/music-scheme.cc
+++ b/lily/music-scheme.cc
@@ -10,7 +10,6 @@
 
 #include "duration.hh"
 #include "warn.hh"
-#include "pitch.hh"
 
 LY_DEFINE (ly_music_length, "ly:music-length",
           1, 0, 0, (SCM mus),

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 8a2915ad10c8d2c4bbbb54124b3f4d08f42708bb..30ca686e79d1071f092f88673acc8978ec2dc4e1 100644 (file)
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -6,11 +6,12 @@
   (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "music-sequence.hh"
+
 #include "warn.hh"
 #include "program-option.hh"
-#include "pitch.hh"
+#include "music.hh"
 #include "input.hh"
-#include "music-sequence.hh"
 
 void
 transpose_music_list (SCM lst, Pitch rq)

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index c50a64c7c10f97082658bdaff72fada615b789b1..e89896ce663652bca52800985e9ecdf487eeedc4 100644 (file)
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -8,6 +8,7 @@
 
 #include "music-wrapper-iterator.hh"
 #include "music-wrapper.hh"
+#include "music.hh"
 
 Music_wrapper_iterator::Music_wrapper_iterator ()
 {

diff --git a/lily/music.cc b/lily/music.cc
index 1253e728603178c3d308e170597458adb87c2968..fb272aae0372af067db72aeef159af97d50271dd 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -16,7 +16,6 @@
 #include "ly-smobs.icc"
 #include "main.hh"
 #include "music-sequence.hh"
-#include "pitch.hh"
 #include "score.hh"
 #include "warn.hh"
 

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 7628a8fc57e597d9e57ccf6efec0f414a482cb52..12064f705b6abfa932090f694e19f072d2f1763a 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -18,6 +18,7 @@ using namespace std;
 #include "font-interface.hh"
 #include "international.hh"
 #include "warn.hh"
+#include "grob.hh"
 
 static Stencil
 internal_print (Grob *me, string *font_char)

diff --git a/lily/output-def-scheme.cc b/lily/output-def-scheme.cc
index 6c257fd092880f5c764bddfb803109e24a5fc3cd..95fd4a578245d6e9cd4a66b7a9994fcf6a38bcd1 100644 (file)
--- a/lily/output-def-scheme.cc
+++ b/lily/output-def-scheme.cc
@@ -6,10 +6,10 @@
   (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "font-metric.hh"
+#include "output-def.hh"
+
 #include "pango-font.hh"
 #include "modified-font-metric.hh"
-#include "output-def.hh"
 #include "ly-module.hh"
 #include "context-def.hh"
 #include "lily-parser.hh"

diff --git a/lily/page-turn-engraver.cc b/lily/page-turn-engraver.cc
index c2817479d3d9c586c6793cffdbb4364bb8ad079e..4064efa37e2fd9f12921dfc8c5cab56df2f219c0 100644 (file)
--- a/lily/page-turn-engraver.cc
+++ b/lily/page-turn-engraver.cc
@@ -12,7 +12,6 @@
 #include "duration.hh"
 #include "grob.hh"
 #include "international.hh"
-#include "moment.hh"
 #include "paper-column.hh"
 #include "stream-event.hh"
 #include "warn.hh"

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index e075029154b68ed7cb7638f8ddced5106957a11b..ca08a4b0d23c8fc42357d77d38a3b57456d9406d 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -10,13 +10,18 @@
 #include <pango/pangoft2.h>
 #include <freetype/ftxf86.h>
 
+#include <map>
+
 /* Ugh.  */
+
 #include "pango-font.hh"
 
+#include "open-type-font.hh"   // Index_to_charcode_map
+
 #include "dimensions.hh"
 #include "file-name.hh"
 #include "international.hh"
-#include "lookup.hh"
+#include "lookup.hh"           // debugging
 #include "main.hh"
 #include "string-convert.hh"
 #include "warn.hh"

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index fb0ab67c81d796588428f8a25b36ab2204b389ba..bef70f72a76e747ad47aef8ea160ae5686f9894a 100644 (file)
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -11,7 +11,6 @@
 #include "international.hh"
 #include "axis-group-interface.hh"
 #include "context.hh"
-#include "item.hh"
 #include "note-spacing.hh"
 #include "paper-column.hh"
 #include "pointer-group-interface.hh"

diff --git a/lily/parenthesis-engraver.cc b/lily/parenthesis-engraver.cc
index 54e016f4d983a220fc106e451841ab1322bf8229..cef5c55493f7aea82249700ba065d64988b36ee3 100644 (file)
--- a/lily/parenthesis-engraver.cc
+++ b/lily/parenthesis-engraver.cc
@@ -9,7 +9,6 @@
 
 #include "engraver.hh"
 
-#include "grob.hh"
 #include "item.hh"
 #include "pointer-group-interface.hh"
 #include "simple-closure.hh"

diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc
index 03da0d4f5714fcd67dbc9257cccdef9b81c02f2a..6dbff411800836318edaabb2d4b7b9dce69f3d73 100644 (file)
--- a/lily/part-combine-iterator.cc
+++ b/lily/part-combine-iterator.cc
@@ -9,7 +9,6 @@
 #include "context.hh"
 #include "dispatcher.hh"
 #include "lily-guile.hh"
-#include "listener.hh"
 #include "music.hh"
 #include "music-iterator.hh"
 #include "music-sequence.hh"

diff --git a/lily/percent-repeat-iterator.cc b/lily/percent-repeat-iterator.cc
index 495f30f33cff535e088a5b4d0ccc65a399d4009c..077d51907d4878d50d5ac95839ce68e11e781268 100644 (file)
--- a/lily/percent-repeat-iterator.cc
+++ b/lily/percent-repeat-iterator.cc
@@ -8,7 +8,6 @@
 */
 
 #include "input.hh"
-#include "music.hh"
 #include "repeated-music.hh"
 #include "sequential-iterator.hh"
 

diff --git a/lily/pointer-group-interface.cc b/lily/pointer-group-interface.cc
index 2d58941b726405ec292f489a9bdecac6c4da1c69..36eac12bca69bbd2f50b87310bd9e94b5e374adf 100644 (file)
--- a/lily/pointer-group-interface.cc
+++ b/lily/pointer-group-interface.cc
@@ -8,8 +8,6 @@
 
 #include "pointer-group-interface.hh"
 
-#include "lily-proto.hh"
-#include "item.hh"
 #include "grob-array.hh"
 #include "grob.hh"
 

diff --git a/lily/quote-iterator.cc b/lily/quote-iterator.cc
index dead1d503e25466cf3e6dbe541f74662a11e244f..849472c329a34a52ca1e594740231e6281cb34a9 100644 (file)
--- a/lily/quote-iterator.cc
+++ b/lily/quote-iterator.cc
@@ -15,7 +15,6 @@
 #include "lily-guile.hh"
 #include "music-sequence.hh"
 #include "music.hh"
-#include "stream-event.hh"
 #include "warn.hh"
 
 class Quote_iterator : public Music_wrapper_iterator

diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc
index 651702ce995df26143a19b054b0d8ac4b934151d..388e2f2d0fcd31ff1d6b69d8082f6fa560b426e5 100644 (file)
--- a/lily/relative-octave-check.cc
+++ b/lily/relative-octave-check.cc
@@ -9,7 +9,6 @@
 #include "input.hh"
 #include "international.hh"
 #include "music.hh"
-#include "pitch.hh"
 
 class Relative_octave_check
 {

diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc
index d8dadb981b2d5586757fc277e04172352dfbed6e..f940a8b68bb0040f55ab7b3d4633d207cab00c73 100644 (file)
--- a/lily/relative-octave-music.cc
+++ b/lily/relative-octave-music.cc
@@ -7,7 +7,6 @@
 */
 
 #include "music.hh"
-#include "pitch.hh"
 #include "warn.hh"
 #include "program-option.hh"
 

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 899d22a5c725d65092c1277ca8b83d44a5bda602..3e823288378faa780767edfbebe2ababb19326f5 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -21,6 +21,7 @@ using namespace std;
 #include "rhythmic-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "stem.hh"
+#include "grob.hh"
 #include "warn.hh"
 
 MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback, 1);

diff --git a/lily/rest.cc b/lily/rest.cc
index 139386416d4d29387fbd90da7a3534bbb6109995..e3543e4cb9545f2bef8eee0b2ce1b8b48fcf5afa 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -16,6 +16,7 @@
 #include "paper-score.hh"
 #include "staff-symbol-referencer.hh"
 #include "stencil.hh"
+#include "grob.hh"
 
 // -> offset callback
 MAKE_SCHEME_CALLBACK (Rest, y_offset_callback, 1);

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index 1f8832831f1435a5af1145801302a4773aac8e89..91cca081e727f21c6611a460d329e4c79973ceae 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -20,7 +20,6 @@
 #include "paper-column-engraver.hh"
 #include "paper-column.hh"
 #include "paper-score.hh"
-#include "stream-event.hh"
 #include "system.hh"
 #include "warn.hh"
 

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 34c5a1c78d8f26dea0af75a425f6ae3f09b4706b..73f79add862ba55bdd66b589d80eede1d5238532 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -11,12 +11,10 @@
 #include "audio-column.hh"
 #include "audio-item.hh"
 #include "context-def.hh"
-#include "context.hh"
 #include "dispatcher.hh"
 #include "global-context.hh"
 #include "performance.hh"
 #include "midi-stream.hh"
-#include "moment.hh"
 #include "output-def.hh"
 #include "string-convert.hh"
 #include "warn.hh"

diff --git a/lily/script-column.cc b/lily/script-column.cc
index 511efa7dce9138c51d6c8f20c654dbc60ae77823..726b32727623e1bd4193b66d713dcf39c47f906b 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -13,6 +13,7 @@
 #include "directional-element-interface.hh"
 #include "side-position-interface.hh"
 #include "warn.hh"
+#include "grob.hh"
 #include "pointer-group-interface.hh"
 
 #include <map>

diff --git a/lily/semi-tie-column.cc b/lily/semi-tie-column.cc
index 57b81e5d44f803f9519e22d731154d5806972c78..7a02ac578b6b3ba14e57fd6c203f5f1378cd9b09 100644 (file)
--- a/lily/semi-tie-column.cc
+++ b/lily/semi-tie-column.cc
@@ -17,7 +17,6 @@
 #include "staff-symbol-referencer.hh"
 #include "item.hh"
 #include "tie-formatting-problem.hh"
-#include "tie-configuration.hh"
 #include "tie-column-format.hh"
 
 

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index 825d88e908125bc370c8dd70c8b757a774e88b8d..96751edf2c5658ad321254e7a774d798332a1c6d 100644 (file)
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -22,6 +22,7 @@ using namespace std;
 #include "staff-symbol.hh"
 #include "string-convert.hh"
 #include "misc.hh"
+#include "grob.hh"
 
 void
 Side_position_interface::add_support (Grob *me, Grob *e)

diff --git a/lily/simple-closure.cc b/lily/simple-closure.cc
index 139478983a89f000258fa09b499634b739ef2247..cea6584972fb5f91822c2de048ae56813d45945a 100644 (file)
--- a/lily/simple-closure.cc
+++ b/lily/simple-closure.cc
@@ -9,7 +9,6 @@
 #include "simple-closure.hh"
 
 #include "grob.hh"
-#include "lily-guile.hh"
 
 static scm_t_bits simple_closure_tag;
 

diff --git a/lily/skyline.cc b/lily/skyline.cc
index e52a6277d50adfeeb44b6f9369944f8c4a900909..cd2cf25337bacd907fe896c5ca42ba394c882a35 100644 (file)
--- a/lily/skyline.cc
+++ b/lily/skyline.cc
@@ -346,6 +346,9 @@ Skyline::set_minimum_height (Real h)
   merge (s);
 }
 
+/*
+  fixme: move this out of skyline.
+*/
 Stencil
 Skyline::stencil ()
 {

diff --git a/lily/slur.cc b/lily/slur.cc
index 093807b78ff2452969c4892e609344a8bc55d150..88697c2bb12b5900ce9e8a34f2644a875a138674 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -8,7 +8,7 @@
 */
 
 #include "slur.hh"
-
+#include "grob-info.hh"
 #include "grob-array.hh"
 #include "beam.hh"
 #include "bezier.hh"
@@ -320,7 +320,7 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm)
  * Used by Slur_engraver:: and Phrasing_slur_engraver::
  */
 void
-Slur::auxiliary_acknowledge_extra_object (Grob_info info,
+Slur::auxiliary_acknowledge_extra_object (Grob_info const &info,
                                          vector<Grob*> &slurs,
                                          vector<Grob*> &end_slurs)
 {

diff --git a/lily/spacing-determine-loose-columns.cc b/lily/spacing-determine-loose-columns.cc
index 51bbf247874bde620727e55c418ccd108fc2b52f..37fe47f8d5bb30945830d3435cd9b0faa9bd1620 100644 (file)
--- a/lily/spacing-determine-loose-columns.cc
+++ b/lily/spacing-determine-loose-columns.cc
@@ -16,6 +16,7 @@
 #include "spacing-spanner.hh"
 #include "note-spacing.hh"
 #include "moment.hh"
+#include "grob-array.hh"
 #include "break-align-interface.hh"
 #include "warn.hh"
 

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 1e49d0b0c9005c79f7fe40fc6ae107982e4f1f39..0f020202419c494b6bf2db2a639f65c7173d28d2 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -6,9 +6,6 @@
   (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "spanner.hh"
-
-
 #include "pointer-group-interface.hh"
 #include "libc-extension.hh"
 #include "paper-column.hh"

diff --git a/lily/tie-configuration.cc b/lily/tie-configuration.cc
index 2e15eb72ebe6d21fbfa9fd3459c5cb7a53f02ee9..9192b3795e707a76094a003f0ea554d0a07d5ab6 100644 (file)
--- a/lily/tie-configuration.cc
+++ b/lily/tie-configuration.cc
@@ -8,6 +8,7 @@
 */
 
 #include "tie-configuration.hh"
+
 #include "warn.hh"
 #include "tie-formatting-problem.hh"
 #include "bezier.hh"

diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc
index 0e29d3ca50a1f028c7c1f87270e333bf31538208..9f05c5b8073bdc2c5edd204acf5c4d3bf6a35b0c 100644 (file)
--- a/lily/tie-formatting-problem.cc
+++ b/lily/tie-formatting-problem.cc
@@ -12,7 +12,6 @@
 #include "paper-column.hh"
 #include "bezier.hh" 
 #include "directional-element-interface.hh"
-#include "item.hh"
 #include "libc-extension.hh"
 #include "misc.hh"
 #include "note-head.hh"

diff --git a/lily/translator-dispatch-list.cc b/lily/translator-dispatch-list.cc
index 28ea71afa248746eab08669ed95763185f67a340..bd2709198829649721773fda326f52ba573ed291 100644 (file)
--- a/lily/translator-dispatch-list.cc
+++ b/lily/translator-dispatch-list.cc
@@ -7,8 +7,6 @@
 */
 
 #include "translator-dispatch-list.hh"
-
-#include "grob-info.hh"
 #include "engraver.hh"
 
 #include "ly-smobs.icc"

diff --git a/lily/translator-group-ctors.cc b/lily/translator-group-ctors.cc
index 6684842876e80169acc77e9bc19c5e107732535c..83feef1634468e1b33cd052d88e53fd532418606 100644 (file)
--- a/lily/translator-group-ctors.cc
+++ b/lily/translator-group-ctors.cc
@@ -8,8 +8,6 @@
 
 #include "score-engraver.hh"
 #include "score-performer.hh"
-#include "engraver-group.hh"
-#include "performer-group.hh"
 #include "warn.hh"
 
 /*

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 4ef8c49d6bb0755664f018397ad82491f3d7c8bd..b25d6154e5e0e23574c22a832eba9e1defacecfb 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -19,7 +19,6 @@
 #include "output-def.hh"
 #include "performer-group.hh"
 #include "scm-hash.hh"
-#include "stream-event.hh"
 #include "warn.hh"
 
 Translator_group *

diff --git a/lily/ttf.cc b/lily/ttf.cc
index 8dfa7308f7e8f9a37439949e94172273623bf3a7..2e5eb8865d14a6223f787afda487d1745d49eab3 100644 (file)
--- a/lily/ttf.cc
+++ b/lily/ttf.cc
@@ -10,7 +10,6 @@
 
 #include <freetype/tttables.h>
 
-#include "lily-proto.hh"
 #include "memory-stream.hh"
 #include "warn.hh"
 #include "lily-guile.hh"