Merge with master

[lilypond.git] / lily / include / input.hh

diff --git a/lily/include/input.hh b/lily/include/input.hh
index 625910ea74e3a4e42f4e983b753be5fa5c69f582..d3cad3577871e376de45359377c04b21d4e0daff 100644 (file)
--- a/lily/include/input.hh
+++ b/lily/include/input.hh
@@ -3,14 +3,13 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef INPUT_HH
 #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);