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

4 files changed, 2 insertions, 4 deletions

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[])
 {