Make "utils.h" commonly available in "viking.h"

diff --git a/src/acquire.c b/src/acquire.c
index 17ae43c96da548cc676ddd089e987c73d73f8538..249bcfda88167e8f33208dab5874c82b767f58a0 100644 (file)
--- a/src/acquire.c
+++ b/src/acquire.c
@@ -32,7 +32,6 @@
 #include "babel.h"
 #include "gpx.h"
 #include "acquire.h"
-#include "util.h"
 
 /************************ FILTER LIST *******************/
 // extern VikDataSourceInterface vik_datasource_gps_interface;

diff --git a/src/geonamessearch.c b/src/geonamessearch.c
index d4516468816b375833e7497eece3529e1ae7dfa4..c1b198a94c0a7e3b9d9676c77b14ca2d74aa2a03 100644 (file)
--- a/src/geonamessearch.c
+++ b/src/geonamessearch.c
@@ -31,7 +31,6 @@
 #include <glib/gi18n.h>
 
 #include "viking.h"
-#include "util.h"
 #include "geonamessearch.h"
 
 /* Compatibility */

diff --git a/src/googlesearch.c b/src/googlesearch.c
index cce2a8294b2631a8d09b01aff94e3bd2e90884fb..3ed59698cca951fceb96cf947df319a2c6b4b1fe 100644 (file)
--- a/src/googlesearch.c
+++ b/src/googlesearch.c
@@ -30,7 +30,6 @@
 #include <glib/gi18n.h>
 
 #include "viking.h"
-#include "util.h"
 #include "curl_download.h"
 
 #include "googlesearch.h"

diff --git a/src/vikgoto.c b/src/vikgoto.c
index 4e742abb0a76ca4aee05dbd8fe7d47c5cd165f2f..640014f92bca19d98917cb568f2b4afd03f15e31 100644 (file)
--- a/src/vikgoto.c
+++ b/src/vikgoto.c
@@ -31,7 +31,6 @@
 #include <glib/gi18n.h>
 
 #include "viking.h"
-#include "util.h"
 #include "vikgototool.h"
 #include "vikgoto.h"
 

diff --git a/src/viking.h b/src/viking.h
index 74545d3a75a0fa7d664a64ad089f93f1e25503a9..8494a536d4c714939e44a42aecef41216d3e923d 100644 (file)
--- a/src/viking.h
+++ b/src/viking.h
@@ -59,5 +59,6 @@
 #include "gpspoint.h"
 #include "gpsmapper.h"
 #include "settings.h"
+#include "util.h"
 
 #endif

diff --git a/src/viktrwlayer.c b/src/viktrwlayer.c
index d0a6ba3fb1714a6febb55e9a1a611056240f2084..32bc6667ed370ea48a2a5eea5b64da5a63b2acf0 100644 (file)
--- a/src/viktrwlayer.c
+++ b/src/viktrwlayer.c
@@ -60,7 +60,6 @@
 #include "datasources.h"
 #include "datasource_gps.h"
 #include "vikexttool_datasources.h"
-#include "util.h"
 #include "ui_util.h"
 #include "vikutils.h"
 

diff --git a/src/viktrwlayer_export.c b/src/viktrwlayer_export.c
index 36ecc1302f7646e8cc778d41a78db1fa4f16f697..e2187067ccf04d30b4524c5a27b6350880e0b8e4 100644 (file)
--- a/src/viktrwlayer_export.c
+++ b/src/viktrwlayer_export.c
@@ -32,7 +32,6 @@
 #include "viking.h"
 #include "viktrwlayer_export.h"
 #include "gpx.h"
-#include "util.h"
 
 void vik_trw_layer_export ( VikTrwLayer *vtl, const gchar *title, const gchar* default_name, VikTrack* trk, VikFileType_t file_type )
 {

diff --git a/src/vikutils.c b/src/vikutils.c
index 364adfce0e69cbb2ad409a554dde0dc4775db6eb..1ec8b017b55500d4f518df2a8143549625694915 100644 (file)
--- a/src/vikutils.c
+++ b/src/vikutils.c
@@ -35,7 +35,6 @@
 #include "preferences.h"
 #include "vikmapslayer.h"
 #include "settings.h"
-#include "util.h"
 #include "ui_util.h"
 #include "dir.h"
 #include "misc/kdtree.h"