Issue 4464/2: include hygiene: break cycles, remove duplicate includes etc.

diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh
index ded0f6da411451a2b1ccb1d62cd4de49912ac3ca..33e587d0004e24442fd7e84f928f12c0a46853cb 100644 (file)
--- a/flower/include/flower-proto.hh
+++ b/flower/include/flower-proto.hh
@@ -26,8 +26,6 @@ typedef unsigned char Byte;
 typedef long long I64;
 class String_convert;
 
-#include "std-string.hh"
-
 #include "real.hh"
 using namespace std;
 

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index 8160b37c2ca4b943cca8cbd4805642e3e0ca462a..88cd01f89f8342a2d478ce39a6f2b6b4d8812d90 100644 (file)
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -23,6 +23,7 @@
 #include <math.h>
 
 #include "flower-proto.hh"
+#include "std-string.hh"
 #include "drul-array.hh"
 
 /* A T interval.  This represents the closed interval [left,right].

diff --git a/flower/include/string-convert.hh b/flower/include/string-convert.hh
index 6b4fba023f4f1ebb23efec44ecf006d471b2c9db..8e1695bd5ceb9d6154fe3d3a5edc5f22e5595a6f 100644 (file)
--- a/flower/include/string-convert.hh
+++ b/flower/include/string-convert.hh
@@ -10,6 +10,7 @@
 using namespace std;
 
 #include "flower-proto.hh"
+#include "std-string.hh"
 
 /** The functor string_convert handles all conversions to/from string
     (some time, anyway).  The class is quite empty from data view.  */

diff --git a/flower/include/yaffut.hh b/flower/include/yaffut.hh
index 148d1a88015709ada81ae69babb4affc223e760c..cd882461f4fdcfd1b829c651763de6bf36bb22a3 100644 (file)
--- a/flower/include/yaffut.hh
+++ b/flower/include/yaffut.hh
@@ -395,9 +395,7 @@ void assert_throw (void (*pf) (), const char *at = "")
 
 #ifdef YAFFUT_MAIN
 
-#include <iostream>
 #include <sys/types.h>
-#include <unistd.h>
 
 int main (int argc, const char *argv[])
 {

diff --git a/lily/book-scheme.cc b/lily/book-scheme.cc
index 5512521bd55bf817f667eaddc87de986072315bc..cf35a7c1bdf0adcdc87a0eac3a68545c401c9b78 100644 (file)
--- a/lily/book-scheme.cc
+++ b/lily/book-scheme.cc
@@ -22,7 +22,6 @@
 #include "output-def.hh"
 #include "score.hh"
 #include "paper-book.hh"
-#include "ly-module.hh"
 
 LY_DEFINE (ly_make_book, "ly:make-book",
            2, 0, 1, (SCM paper, SCM header, SCM scores),

diff --git a/lily/book.cc b/lily/book.cc
index bf324091041b73cc21650863fb18857036cb429b..cb145f0436d12f36ab1617bde76d274ac524eade 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -32,7 +32,7 @@ using namespace std;
 #include "performance.hh"
 #include "paper-score.hh"
 #include "page-marker.hh"
-
+#include "ly-module.hh"
 
 Book::Book ()
 {

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index 98db3b1476ff602668f4df05b2add7af317355c4..b8f1663b1080cf9faeeb9cf7fb51f9f8b4842117 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -17,8 +17,6 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "dot-column.hh"
-
 #include <cstdio>
 #include <cmath>
 #include <map>

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 9ec39db159640e7c822c6473bb3eccf425b0114d..e21ccf479d32e5f337cd37abd6a6fd0ed1771a47 100644 (file)
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -13,8 +13,6 @@
 #include "spanner.hh"
 #include "international.hh"
 #include "item.hh"
-#include "misc.hh"
-#include "item.hh"
 #include "program-option.hh"
 #include "profile.hh"
 #include "simple-closure.hh"

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 76919a5d9d9f5ff96d43d5d367ec5cd5516f04d1..e6a3d41483da9310e505ab3c55b0e65fcb379c51 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -37,7 +37,6 @@
 #include "guile-compatibility.hh"
 #include "interval.hh"
 #include "lily-guile-macros.hh"
-#include "ly-module.hh"
 #include "std-vector.hh"
 
 /** Conversion functions follow the GUILE naming convention, i.e.
@@ -203,8 +202,6 @@ inline SCM ly_car (SCM x) { return SCM_CAR (x); }
 inline SCM ly_cdr (SCM x) { return SCM_CDR (x); }
 inline bool ly_is_pair (SCM x) { return SCM_I_CONSP (x); }
 
-#include "std-vector.hh"
-
 template<class T>
 SCM
 ly_cxx_vector_to_list (vector<T> const &src)
@@ -219,4 +216,10 @@ ly_cxx_vector_to_list (vector<T> const &src)
 SCM ly_offsets2scm (vector<Offset> os);
 vector<Offset> ly_scm2offsets (SCM s);
 
+/* For backward compatability with Guile 1.8 */
+#if !HAVE_GUILE_HASH_FUNC
+typedef SCM (*scm_t_hash_fold_fn) (GUILE_ELLIPSIS);
+typedef SCM (*scm_t_hash_handle_fn) (GUILE_ELLIPSIS);
+#endif
+
 #endif /* LILY_GUILE_HH */

diff --git a/lily/include/ly-module.hh b/lily/include/ly-module.hh
index 82a147a4b4fa90e92587c512f62fa8d64a9b77b6..4b2d3f800a141bca4d2a9c35da0a4b454969227b 100644 (file)
--- a/lily/include/ly-module.hh
+++ b/lily/include/ly-module.hh
@@ -31,11 +31,5 @@ SCM ly_module_symbols (SCM mod);
 void ly_reexport_module (SCM mod);
 SCM ly_use_module (SCM mod, SCM used);
 
-/* For backward compatability with Guile 1.8 */
-#if !HAVE_GUILE_HASH_FUNC
-typedef SCM (*scm_t_hash_fold_fn) (GUILE_ELLIPSIS);
-typedef SCM (*scm_t_hash_handle_fn) (GUILE_ELLIPSIS);
-#endif
-
 #endif /* LY_MODULE_HH */
 

diff --git a/lily/include/smobs.tcc b/lily/include/smobs.tcc
index 714289f47fcd8e83fa858f9b70e538188653e6db..b8dfc1f67fdb6027b897fa78b2dbb19964eb3312 100644 (file)
--- a/lily/include/smobs.tcc
+++ b/lily/include/smobs.tcc
@@ -24,8 +24,6 @@
 // included from smobs.hh, but other template expansion systems might
 // make it feasible to compile this only a single time.
 
-#include "lily-guile-macros.hh"
-#include "smobs.hh"
 #include <typeinfo>
 
 template <class Super>

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index 467876f036c4cbf12c2d112815bf4f8f96854663..68b5578994b654e5bc12f95e505ae9af7ba142d0 100644 (file)
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -35,6 +35,7 @@ using namespace std;
 #include "warn.hh"
 #include "program-option.hh"
 #include "lily-parser.hh"
+#include "ly-module.hh"
 
 static Keyword_ent the_key_tab[]
 =

diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc
index 04d991a5d29cfe816e1085193b29644b25b7ec0b..4d922404ce6c4ce999486f0bd9c3f1a39ceba637 100644 (file)
--- a/lily/lily-parser-scheme.cc
+++ b/lily/lily-parser-scheme.cc
@@ -26,7 +26,6 @@
 #include "file-path.hh"
 #include "international.hh"
 #include "lily-lexer.hh"
-#include "ly-module.hh"
 #include "main.hh"
 #include "program-option.hh"
 #include "sources.hh"

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index 3a3f39450c84951ed494376fbdaca901daee7da2..84b6858f75008485dda482b353724c286f2f92ce 100644 (file)
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -18,9 +18,9 @@
 */
 
 #include "lily-guile.hh"
+#include "ly-module.hh"
 #include "warn.hh"
 #include "main.hh"
-#include "std-string.hh"
 #include "protected-scm.hh"
 
 SCM

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index 0007563ed42618fdde566f978e100f0670cdcf7e..3038df4331645f30dcb000be55cf3deb0830171d 100644 (file)
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -27,7 +27,6 @@ using namespace std;
 #include FT_TRUETYPE_TABLES_H
 
 #include "dimensions.hh"
-#include "freetype.hh"
 #include "international.hh"
 #include "modified-font-metric.hh"
 #include "warn.hh"

diff --git a/lily/output-def.cc b/lily/output-def.cc
index d8fdc2e49d499cb592fbc6987af14d18bc0a9511..e277a00534513f8cddb7460da4b6afc86bd954bc 100644 (file)
--- a/lily/output-def.cc
+++ b/lily/output-def.cc
@@ -17,13 +17,12 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "output-def.hh"
-
 #include "context-def.hh"
 #include "file-path.hh"
 #include "global-context.hh"
 #include "international.hh"
 #include "interval.hh"
+#include "ly-module.hh"
 #include "main.hh"
 #include "output-def.hh"
 #include "scm-hash.hh"

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index fcdf958cef2ff3c5c1737c33765aa2de1e60d574..9e3a2d38b30b53086c1067759a6e15c75680c315 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -35,6 +35,7 @@
 #include "file-name.hh"
 #include "international.hh"
 #include "lookup.hh"            // debugging
+#include "ly-module.hh"
 #include "main.hh"
 #include "string-convert.hh"
 #include "warn.hh"

diff --git a/lily/paper-book-scheme.cc b/lily/paper-book-scheme.cc
index ba0c8592e22dff7d01780f061d17474121b2be88..01fa9da459b2f24a7b59d0cfe7fd52844c03b133 100644 (file)
--- a/lily/paper-book-scheme.cc
+++ b/lily/paper-book-scheme.cc
@@ -18,7 +18,6 @@
 */
 
 #include "paper-book.hh"
-#include "ly-module.hh"
 #include "output-def.hh"
 
 LY_DEFINE (ly_paper_book_pages, "ly:paper-book-pages",

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index dfa52f4f79f121bbd9f5df5243c904d860adf774..78d51a0caacc78f5ab6fc4861452db73a50ab118 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -30,7 +30,7 @@
 #include "warn.hh"
 #include "program-option.hh"
 #include "page-marker.hh"
-
+#include "ly-module.hh"
 
 Paper_book::Paper_book ()
 {

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index 87df2cbe59e761a5e570e57a6b01855d8011b200..334861844c900076ffaf540f9cb02d53813bf3fa 100644 (file)
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -18,7 +18,6 @@
 */
 
 #include "paper-column-engraver.hh"
-#include "system.hh"
 #include "international.hh"
 #include "accidental-placement.hh"
 #include "accidental-interface.hh"

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 6ea2d268895dcb558f6136ca1d9f1709a92996f2..d907acdf24f914e9b435aca0c92b44a46c149d96 100644 (file)
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -25,7 +25,6 @@
 #include "font-interface.hh"
 #include "grob-array.hh"
 #include "lookup.hh"
-#include "lookup.hh"
 #include "moment.hh"
 #include "output-def.hh"
 #include "paper-score.hh"

diff --git a/lily/parser.yy b/lily/parser.yy
index 42a83fc6ced9677708f591590aefd56ef7adda97..8d8d7de15035b2c5c4e49a169c14818739798523 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -129,6 +129,7 @@ using namespace std;
 #include "lily-guile.hh"
 #include "lily-lexer.hh"
 #include "lily-parser.hh"
+#include "ly-module.hh"
 #include "main.hh"
 #include "misc.hh"
 #include "music.hh"

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 11618d0f47fc7abac90185498552dd3596817258..4ea42ed14315fcf4b72a860cf4de9efc2cc1c4f1 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -30,7 +30,6 @@
 #include "string-convert.hh"
 #include "warn.hh"
 #include "audio-staff.hh"
-#include "audio-item.hh"
 
 ADD_TRANSLATOR_GROUP (Score_performer,
                       /* doc */

diff --git a/lily/score.cc b/lily/score.cc
index 52f9d2ac539d49c442d4cb4f95beb49de1917cfd..da48e8f1031c3a5230f2c073b9bd2b0ff4166442 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -28,9 +28,9 @@ using namespace std;
 #include "global-context.hh"
 #include "international.hh"
 #include "lily-parser.hh"
+#include "ly-module.hh"
 #include "main.hh"
 #include "music.hh"
-#include "music.hh"
 #include "output-def.hh"
 #include "paper-book.hh"
 #include "paper-score.hh"

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 521d3ca2d9fd2aac5905724a8e0ba4ef74180d2d..df6ae6dd1bb70521736f5dd5f56e68f5ed219660 100644 (file)
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -116,8 +116,6 @@ Time_signature_engraver::stop_translation_timestep ()
   time_cause_ = SCM_EOL;
 }
 
-#include "translator.icc"
-
 ADD_TRANSLATOR (Time_signature_engraver,
                 /* doc */
                 "Create a @ref{TimeSignature} whenever"