From 739f71cd1c08d3297ec6189fdd98e0ecced6cd83 Mon Sep 17 00:00:00 2001
From: Hleb Valoshka <375gnu@gmail.com>
Date: Wed, 18 Dec 2019 21:56:34 +0300
Subject: [PATCH] Cleanup includes a little bit

---
 src/celengine/console.cpp       |  6 ++++++
 src/celengine/console.h         |  9 ++-------
 src/celengine/glmarker.cpp      |  2 ++
 src/celengine/overlay.cpp       |  8 +++++++-
 src/celengine/overlay.h         | 10 ++--------
 src/celengine/render.cpp        | 13 ++++++++++++-
 src/celengine/render.h          | 21 +++++++++------------
 src/celestia/celestiacore.cpp   |  5 +++++
 src/celscript/lua/celx_misc.cpp |  5 +++++
 9 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/src/celengine/console.cpp b/src/celengine/console.cpp
index a32a004e..79127b9d 100644
--- a/src/celengine/console.cpp
+++ b/src/celengine/console.cpp
@@ -11,11 +11,17 @@
 #include <cstdarg>
 #include <cassert>
 #include <algorithm>
+#include <iostream>
 #include <celutil/utf8.h>
 #include <celmath/geomutil.h>
 #include <GL/glew.h>
 #include "vecgl.h"
 #include "console.h"
+#if NO_TTF
+#include <celtxf/texturefont.h>
+#else
+#include <celttf/truetypefont.h>
+#endif
 
 using namespace std;
 using namespace celmath;
diff --git a/src/celengine/console.h b/src/celengine/console.h
index d6c7219c..d0e10222 100644
--- a/src/celengine/console.h
+++ b/src/celengine/console.h
@@ -11,15 +11,10 @@
 #define _CELENGINE_CONSOLE_H_
 
 #include <string>
-#include <iostream>
-#if NO_TTF
-#include <celtxf/texturefont.h>
-#else
-#include <celttf/truetypefont.h>
-#endif
-
+#include <iosfwd>
 
 class Console;
+class TextureFont;
 
 // Custom streambuf class to support C++ operator style output.  The
 // output is completely unbuffered.
diff --git a/src/celengine/glmarker.cpp b/src/celengine/glmarker.cpp
index 4a20ce75..bdb160eb 100644
--- a/src/celengine/glmarker.cpp
+++ b/src/celengine/glmarker.cpp
@@ -8,11 +8,13 @@
 // as published by the Free Software Foundation; either version 2
 // of the License, or (at your option) any later version.
 
+#include <celmath/frustum.h>
 #include <celmath/mathlib.h>
 #include <celutil/util.h>
 #include <GL/glew.h>
 #include <vector>
 #include "render.h"
+#include "vertexobject.h"
 #include "marker.h"
 
 
diff --git a/src/celengine/overlay.cpp b/src/celengine/overlay.cpp
index 6110bb7a..1d4f0439 100644
--- a/src/celengine/overlay.cpp
+++ b/src/celengine/overlay.cpp
@@ -9,16 +9,22 @@
 
 #include <cstring>
 #include <cstdarg>
-#include <celutil/utf8.h>
+#include <iostream>
 #include <GL/glew.h>
 #include <Eigen/Core>
 #include <celutil/debug.h>
+#include <celutil/utf8.h>
 #include <celmath/geomutil.h>
 #include "vecgl.h"
 #include "overlay.h"
 #include "rectangle.h"
 #include "render.h"
 #include "texture.h"
+#if NO_TTF
+#include <celtxf/texturefont.h>
+#else
+#include <celttf/truetypefont.h>
+#endif
 
 using namespace std;
 using namespace Eigen;
diff --git a/src/celengine/overlay.h b/src/celengine/overlay.h
index 280747b6..199fbc26 100644
--- a/src/celengine/overlay.h
+++ b/src/celengine/overlay.h
@@ -10,21 +10,15 @@
 #ifndef _OVERLAY_H_
 #define _OVERLAY_H_
 
-#include <algorithm>
 #include <array>
-#include <iostream>
+#include <iosfwd>
 #include <string>
 #include <celutil/color.h>
-#if NO_TTF
-#include <celtxf/texturefont.h>
-#else
-#include <celttf/truetypefont.h>
-#endif
-
 
 class Overlay;
 class Renderer;
 class Rect;
+class TextureFont;
 
 // Custom streambuf class to support C++ operator style output.  The
 // output is completely unbuffered so that it can coexist with printf
diff --git a/src/celengine/render.cpp b/src/celengine/render.cpp
index 64eb1587..798fd6cd 100644
--- a/src/celengine/render.cpp
+++ b/src/celengine/render.cpp
@@ -64,14 +64,22 @@ std::ofstream hdrlog;
 #include "orbitsampler.h"
 #include "asterismrenderer.h"
 #include "boundariesrenderer.h"
-#include <celutil/debug.h>
+#include "rendcontext.h"
+#include "vertexobject.h"
+#include <celengine/observer.h>
 #include <celmath/frustum.h>
 #include <celmath/distance.h>
 #include <celmath/intersect.h>
 #include <celmath/geomutil.h>
+#include <celutil/debug.h>
 #include <celutil/utf8.h>
 #include <celutil/util.h>
 #include <celutil/timer.h>
+#if NO_TTF
+#include <celtxf/texturefont.h>
+#else
+#include <celttf/truetypefont.h>
+#endif
 #include <GL/glew.h>
 #ifdef VIDEO_SYNC
 #ifdef _WIN32
@@ -88,6 +96,9 @@ std::ofstream hdrlog;
 #include <sstream>
 #include <iomanip>
 #include <numeric>
+#ifdef USE_GLCONTEXT
+#include "glcontext.h"
+#endif
 
 using namespace cmod;
 using namespace Eigen;
diff --git a/src/celengine/render.h b/src/celengine/render.h
index 3c9574fe..9609f5de 100644
--- a/src/celengine/render.h
+++ b/src/celengine/render.h
@@ -15,24 +15,15 @@
 #include <list>
 #include <string>
 #include <Eigen/Core>
-#include <celmath/frustum.h>
 #include <celengine/universe.h>
-#include <celengine/observer.h>
 #include <celengine/selection.h>
-#ifdef USE_GLCONTEXT
-#include <celengine/glcontext.h>
-#endif
 #include <celengine/starcolors.h>
 #include <celengine/rendcontext.h>
 #include <celengine/renderlistentry.h>
-#include <celengine/vertexobject.h>
-#if NO_TTF
-#include <celtxf/texturefont.h>
-#else
-#include <celttf/truetypefont.h>
+
+#ifdef USE_GLCONTEXT
+class GLContext;
 #endif
-
-
 class RendererWatcher;
 class FrameTree;
 class ReferenceMark;
@@ -41,6 +32,12 @@ class Rect;
 class PointStarVertexBuffer;
 class AsterismRenderer;
 class BoundariesRenderer;
+class Observer;
+class TextureFont;
+namespace celmath
+{
+class Frustum;
+};
 
 struct LightSource
 {
diff --git a/src/celestia/celestiacore.cpp b/src/celestia/celestiacore.cpp
index 672d78d4..0fd5315f 100644
--- a/src/celestia/celestiacore.cpp
+++ b/src/celestia/celestiacore.cpp
@@ -58,6 +58,11 @@
 #ifdef CELX
 #include <celephem/scriptobject.h>
 #endif
+#if NO_TTF
+#include <celtxf/texturefont.h>
+#else
+#include <celttf/truetypefont.h>
+#endif
 
 #include "imagecapture.h"
 
diff --git a/src/celscript/lua/celx_misc.cpp b/src/celscript/lua/celx_misc.cpp
index cfae3828..e6ca02cf 100644
--- a/src/celscript/lua/celx_misc.cpp
+++ b/src/celscript/lua/celx_misc.cpp
@@ -13,6 +13,11 @@
 #include <celscript/legacy/cmdparser.h>
 #include <celscript/legacy/execution.h>
 #include <celestia/celestiacore.h>
+#if NO_TTF
+#include <celtxf/texturefont.h>
+#else
+#include <celttf/truetypefont.h>
+#endif
 
 using namespace celestia::scripts;