From: David Kastrup <dak@gnu.org>
Date: Fri, 26 Jun 2015 23:04:34 +0000 (+0200)
Subject: Issue 4464/2: include hygiene: break cycles, remove duplicate includes etc.
X-Git-Tag: release/2.19.23-1~38
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fe4893be240c78a35deff5e86af3d7d1200a478b;p=lilypond.git

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 ded0f6da41..33e587d000 100644
--- 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 8160b37c2c..88cd01f89f 100644
--- 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 6b4fba023f..8e1695bd5c 100644
--- 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 148d1a8801..cd882461f4 100644
--- 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 5512521bd5..cf35a7c1bd 100644
--- 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 bf32409104..cb145f0436 100644
--- 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 98db3b1476..b8f1663b10 100644
--- 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 9ec39db159..e21ccf479d 100644
--- 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 76919a5d9d..e6a3d41483 100644
--- 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 82a147a4b4..4b2d3f800a 100644
--- 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 714289f47f..b8dfc1f67f 100644
--- 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 467876f036..68b5578994 100644
--- 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 04d991a5d2..4d922404ce 100644
--- 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 3a3f39450c..84b6858f75 100644
--- 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 0007563ed4..3038df4331 100644
--- 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 d8fdc2e49d..e277a00534 100644
--- 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 fcdf958cef..9e3a2d38b3 100644
--- 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 ba0c8592e2..01fa9da459 100644
--- 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 dfa52f4f79..78d51a0caa 100644
--- 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 87df2cbe59..334861844c 100644
--- 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 6ea2d26889..d907acdf24 100644
--- 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 42a83fc6ce..8d8d7de150 100644
--- 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 11618d0f47..4ea42ed143 100644
--- 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 52f9d2ac53..da48e8f103 100644
--- 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 521d3ca2d9..df6ae6dd1b 100644
--- 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"