Code cleanup

src/map/albersequal.cpp

@@ -41,6 +41,7 @@ Defense.
 
 */
 
+#include "ellipsoid.h"
 #include "albersequal.h"
 
 

src/map/albersequal.h

@@ -1,9 +1,10 @@
 #ifndef ALBERSEQUAL_H
 #define ALBERSEQUAL_H
 
-#include "ellipsoid.h"
 #include "ct.h"
 
+class Ellipsoid;
+
 class AlbersEqual : public CT
 {
 public:

src/map/lambertazimuthal.cpp

@@ -1,3 +1,5 @@
+#include <cmath>
+#include "ellipsoid.h"
 #include "lambertazimuthal.h"
 
 #define sin2(x) (sin(x) * sin(x))

src/map/lambertazimuthal.h

@@ -1,9 +1,10 @@
 #ifndef LAMBERTAZIMUTHAL_H
 #define LAMBERTAZIMUTHAL_H
 
-#include "ellipsoid.h"
 #include "ct.h"
 
+class Ellipsoid;
+
 class LambertAzimuthal : public CT
 {
 public:

src/map/lambertconic.cpp

@@ -42,6 +42,7 @@ Defense.
 */
 
 #include <cmath>
+#include "ellipsoid.h"
 #include "lambertconic.h"
 
 #ifndef M_PI_2

src/map/lambertconic.h

@@ -1,9 +1,10 @@
 #ifndef LAMBERTCONIC_H
 #define LAMBERTCONIC_H
 
-#include "ellipsoid.h"
 #include "ct.h"
 
+class Ellipsoid;
+
 class LambertConic1 : public CT
 {
 public:

src/map/transversemercator.h

@@ -2,7 +2,8 @@
 #define TRANSVERSEMERCATOR_H
 
 #include "ct.h"
-#include "ellipsoid.h"
+
+class Ellipsoid;
 
 class TransverseMercator : public CT
 {