More (final?) headers cleaning, recursive path in Oshd.

meteoio/Config.cc

@@ -16,7 +16,11 @@
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <meteoio/Config.h>
+#include <meteoio/FileUtils.h>
+
 #include <algorithm>
+#include <fstream>
+#include <cstdio>
 
 using namespace std;
 

meteoio/Config.h

@@ -19,11 +19,8 @@
 #define CONFIGREADER_H
 
 #include <meteoio/IOUtils.h>
-#include <meteoio/FileUtils.h>
 #include <meteoio/IOExceptions.h>
 
-#include <cstdio>
-#include <fstream>
 #include <string>
 #include <sstream>
 #include <map>

meteoio/GridsManager.cc

@@ -17,6 +17,7 @@
 */
 
 #include <meteoio/GridsManager.h>
+#include <meteoio/dataClasses/Coords.h>
 
 using namespace std;
 

meteoio/GridsManager.h

@@ -18,10 +18,8 @@
 #ifndef GRIDSMANAGER_H
 #define GRIDSMANAGER_H
 
-#include <meteoio/DataGenerator.h>
 #include <meteoio/dataClasses/Buffer.h>
 #include <meteoio/dataClasses/MeteoData.h>
-#include <meteoio/dataClasses/Coords.h>
 #include <meteoio/IOHandler.h>
 #include <meteoio/Config.h>
 

meteoio/IOHandler.cmake.cc

@@ -15,13 +15,14 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
-
+#include <meteoio/IOHandler.h>
+#include <meteoio/IOExceptions.h>
 #include <meteoio/IOUtils.h>
 #include <meteoio/MathOptim.h>
-#include <meteoio/IOHandler.h>
 #include <meteoio/dataClasses/MeteoData.h> //needed for the merge strategies
 
 #include <algorithm>
+#include <fstream>
 
 #cmakedefine PLUGIN_ALPUG
 #cmakedefine PLUGIN_ARCIO

meteoio/IOHandler.h

@@ -19,7 +19,6 @@
 #define IOHANDLER_H
 
 #include <meteoio/IOInterface.h>
-#include <meteoio/IOExceptions.h>
 #include <meteoio/DataCreator.h>
 
 #include <map>

meteoio/IOInterface.h

@@ -19,14 +19,11 @@
 #define IOINTERFACE_H
 
 #include <meteoio/Config.h> //so the plugins can get access to Config for their constructor
-#include <meteoio/dataClasses/Coords.h>
 #include <meteoio/dataClasses/Array2D.h>
-#include <meteoio/dataClasses/Date.h>
 #include <meteoio/dataClasses/DEMObject.h>
 #include <meteoio/dataClasses/Grid2DObject.h>
 #include <meteoio/dataClasses/Grid3DObject.h>
 #include <meteoio/dataClasses/MeteoData.h>
-#include <meteoio/dataClasses/StationData.h>
 
 #include <vector>
 #include <string>

meteoio/IOManager.h

@@ -22,7 +22,6 @@
 #include <meteoio/Meteo2DInterpolator.h>
 #include <meteoio/MeteoProcessor.h>
 #include <meteoio/dataClasses/MeteoData.h>
-#include <meteoio/dataClasses/Coords.h>
 #include <meteoio/TimeSeriesManager.h>
 #include <meteoio/GridsManager.h>
 

meteoio/IOUtils.cc

@@ -15,6 +15,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
+#include <cstdio>
 #include <cmath>
 #include <cstring>
 #include <ctype.h>

meteoio/MeteoProcessor.h

@@ -19,7 +19,6 @@
 #define METEOPROCESSOR_H
 
 #include <meteoio/dataClasses/MeteoData.h>
-#include <meteoio/dataClasses/StationData.h>
 #include <meteoio/Config.h>
 #include <meteoio/Meteo1DInterpolator.h>
 #include <meteoio/meteoFilters/ProcessingStack.h>

meteoio/ResamplingAlgorithms2D.h

@@ -18,8 +18,8 @@
 #ifndef RESAMPLINGALGORITHMS2D_H
 #define RESAMPLINGALGORITHMS2D_H
 
-#include <meteoio/dataClasses/Array2D.h>
-#include <meteoio/dataClasses/Grid2DObject.h>
+#include <meteoio/dataClasses/Grid2DObject.h> //this contains Array2D
+
 #include <iostream>
 #include <string>
 

meteoio/dataClasses/DEMObject.cc

@@ -21,6 +21,7 @@
 
 #include <meteoio/dataClasses/DEMObject.h>
 #include <meteoio/MathOptim.h>
+#include <meteoio/IOUtils.h>
 #include <meteoio/meteoLaws/Meteoconst.h> //for math constants
 
 /**

meteoio/dataClasses/DEMObject.h

@@ -20,12 +20,8 @@
 
 #include <meteoio/dataClasses/Array2D.h>
 #include <meteoio/dataClasses/Grid2DObject.h>
-#include <meteoio/IOUtils.h>
 #include <meteoio/meteoLaws/Meteoconst.h> //for math constants
 
-#include <cmath>
-#include <limits>
-
 namespace mio {
 
 /**

meteoio/dataClasses/Grid2DObject.cc

@@ -16,6 +16,8 @@
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <meteoio/dataClasses/Grid2DObject.h>
+#include <meteoio/IOExceptions.h>
+#include <meteoio/IOUtils.h>
 #include <meteoio/MathOptim.h>
 #include <meteoio/ResamplingAlgorithms2D.h>
 #include <cmath>

meteoio/dataClasses/Grid2DObject.h

@@ -20,8 +20,6 @@
 
 #include <meteoio/dataClasses/Coords.h>
 #include <meteoio/dataClasses/Array2D.h>
-#include <meteoio/IOExceptions.h>
-#include <meteoio/IOUtils.h>
 
 #include <iostream>
 

meteoio/dataClasses/Grid3DObject.cc

@@ -16,6 +16,7 @@
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <meteoio/dataClasses/Grid3DObject.h>
+#include <meteoio/IOExceptions.h>
 #include <cmath>
 
 using namespace std;

meteoio/dataClasses/Grid3DObject.h

@@ -20,7 +20,6 @@
 
 #include <meteoio/dataClasses/Coords.h>
 #include <meteoio/dataClasses/Array3D.h>
-#include <meteoio/IOExceptions.h>
 #include <meteoio/dataClasses/Grid2DObject.h>
 
 #include <iostream>

meteoio/dataClasses/Matrix.cc

@@ -17,6 +17,9 @@
 */
 
 #include <meteoio/dataClasses/Matrix.h>
+#include <meteoio/IOUtils.h>
+#include <meteoio/IOExceptions.h>
+
 #include <time.h> //needed for random()
 #include <cmath> //needed for fabs()
 #include <iostream>

meteoio/dataClasses/Matrix.h

@@ -18,9 +18,6 @@
 #ifndef MATRIX_H
 #define MATRIX_H
 
-#include <meteoio/IOUtils.h>
-#include <meteoio/IOExceptions.h>
-
 #include <vector>
 #include <iostream>
 

meteoio/dataClasses/MeteoData.cc

@@ -21,6 +21,8 @@
 
 #include <cmath>
 #include <limits>
+#include <iomanip>
+#include <sstream>
 
 using namespace std;
 namespace mio {