[tracker-miners/wip/carlosg/cli-split: 1/5] tracker: Update used headers

[Carlos Garnacho <carlosg src gnome org>]

commit 1c303ffba78829f1dab876ed1f3b1304d3c97a33
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Dec 19 17:52:35 2019 +0100

    tracker: Update used headers
    
    The just re-imported subcommands poke internal bits, update those
    to point to the right places in the tracker-miners repo.

 src/tracker/tracker-config.c        |  4 ++--
 src/tracker/tracker-daemon.c        |  6 +++---
 src/tracker/tracker-dbus.c          |  4 ++--
 src/tracker/tracker-extract.c       |  6 +++---
 src/tracker/tracker-index.c         |  4 ++--
 src/tracker/tracker-miner-manager.c | 10 ++++++----
 src/tracker/tracker-process.c       |  2 +-
 src/tracker/tracker-reset.c         |  9 ++++-----
 src/tracker/tracker-search.c        |  5 ++---
 src/tracker/tracker-status.c        |  5 ++---
 src/tracker/tracker-tag.c           |  4 +---
 11 files changed, 28 insertions(+), 31 deletions(-)
---
diff --git a/src/tracker/tracker-config.c b/src/tracker/tracker-config.c
index 13bf58e25..60c15973f 100644
--- a/src/tracker/tracker-config.c
+++ b/src/tracker/tracker-config.c
@@ -18,12 +18,12 @@
  * 02110-1301, USA.
  */
 
-#include "config.h"
+#include "config-miners.h"
 
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
 
 #include "tracker-config.h"
 #include "tracker-miner-manager.h"
diff --git a/src/tracker/tracker-daemon.c b/src/tracker/tracker-daemon.c
index 240152df6..7947cf2dc 100644
--- a/src/tracker/tracker-daemon.c
+++ b/src/tracker/tracker-daemon.c
@@ -18,7 +18,7 @@
  * 02110-1301, USA.
  */
 
-#include "config.h"
+#include "config-miners.h"
 
 #include <errno.h>
 
@@ -30,11 +30,11 @@
 #include <glib-unix.h>
 #include <glib/gi18n.h>
 #include <glib/gprintf.h>
+#include <locale.h>
 
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
 #include <libtracker-sparql/tracker-sparql.h>
 
-#include "tracker-daemon.h"
 #include "tracker-config.h"
 #include "tracker-process.h"
 #include "tracker-dbus.h"
diff --git a/src/tracker/tracker-dbus.c b/src/tracker/tracker-dbus.c
index 4644d33cd..7260e27a0 100644
--- a/src/tracker/tracker-dbus.c
+++ b/src/tracker/tracker-dbus.c
@@ -18,12 +18,12 @@
  * 02110-1301, USA.
  */
 
-#include "config.h"
+#include "config-miners.h"
 
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
 
 #include "tracker-dbus.h"
 
diff --git a/src/tracker/tracker-extract.c b/src/tracker/tracker-extract.c
index 7a2a002e4..7d37df358 100644
--- a/src/tracker/tracker-extract.c
+++ b/src/tracker/tracker-extract.c
@@ -17,18 +17,18 @@
  * 02110-1301, USA.
  */
 
-#include "config.h"
+#include "config-miners.h"
 
 #include <stdlib.h>
 
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
+#include <locale.h>
 
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
 
 #include "tracker-config.h"
-#include "tracker-extract.h"
 
 static gchar *verbosity;
 static gchar *output_format = "turtle";
diff --git a/src/tracker/tracker-index.c b/src/tracker/tracker-index.c
index fc52c990d..f5adc4d39 100644
--- a/src/tracker/tracker-index.c
+++ b/src/tracker/tracker-index.c
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-#include "config.h"
+#include "config-miners.h"
 
 #include <stdlib.h>
 #include <errno.h>
@@ -29,10 +29,10 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
+#include <locale.h>
 
 #include <libtracker-sparql/tracker-sparql.h>
 
-#include "tracker-index.h"
 #include "tracker-dbus.h"
 #include "tracker-miner-manager.h"
 
diff --git a/src/tracker/tracker-miner-manager.c b/src/tracker/tracker-miner-manager.c
index e9f5aafd1..c22fc5249 100644
--- a/src/tracker/tracker-miner-manager.c
+++ b/src/tracker/tracker-miner-manager.c
@@ -18,14 +18,16 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#include "config.h"
+#include "config-miners.h"
 
 #include <gio/gio.h>
 #include <string.h>
 
-#include <libtracker-common/tracker-dbus.h>
-#include <libtracker-common/tracker-type-utils.h>
-#include <libtracker-common/tracker-domain-ontology.h>
+#include <libtracker-miners-common/tracker-dbus.h>
+#include <libtracker-miners-common/tracker-type-utils.h>
+#include <libtracker-miners-common/tracker-domain-ontology.h>
+
+#include <libtracker-sparql/tracker-sparql.h>
 
 #include "tracker-miner-manager.h"
 
diff --git a/src/tracker/tracker-process.c b/src/tracker/tracker-process.c
index ee02b02d1..0ed06b9e4 100644
--- a/src/tracker/tracker-process.c
+++ b/src/tracker/tracker-process.c
@@ -18,7 +18,7 @@
  * 02110-1301, USA.
  */
 
-#include "config.h"
+#include "config-miners.h"
 
 #include <stdlib.h>
 #include <errno.h>
diff --git a/src/tracker/tracker-reset.c b/src/tracker/tracker-reset.c
index 7fb037dd7..c25970c67 100644
--- a/src/tracker/tracker-reset.c
+++ b/src/tracker/tracker-reset.c
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-#include "config.h"
+#include "config-miners.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -26,12 +26,11 @@
 #include <glib/gi18n.h>
 #include <glib/gprintf.h>
 #include <gio/gio.h>
+#include <locale.h>
 
-#include <libtracker-common/tracker-common.h>
-#include <libtracker-data/tracker-data.h>
+#include <libtracker-miners-common/tracker-common.h>
+#include <libtracker-sparql/tracker-sparql.h>
 
-#include "tracker-reset.h"
-#include "tracker-daemon.h"
 #include "tracker-process.h"
 #include "tracker-config.h"
 #include "tracker-color.h"
diff --git a/src/tracker/tracker-search.c b/src/tracker/tracker-search.c
index 782d1bb50..a4c388736 100644
--- a/src/tracker/tracker-search.c
+++ b/src/tracker/tracker-search.c
@@ -19,7 +19,7 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#include "config.h"
+#include "config-miners.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -29,11 +29,10 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
 #include <libtracker-sparql/tracker-sparql.h>
 
 #include "tracker-color.h"
-#include "tracker-search.h"
 
 static gint limit = -1;
 static gint offset;
diff --git a/src/tracker/tracker-status.c b/src/tracker/tracker-status.c
index 4cb16b2cd..537d5a356 100644
--- a/src/tracker/tracker-status.c
+++ b/src/tracker/tracker-status.c
@@ -19,7 +19,7 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#include "config.h"
+#include "config-miners.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -29,10 +29,9 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
 #include <libtracker-sparql/tracker-sparql.h>
 
-#include "tracker-status.h"
 #include "tracker-config.h"
 #include "tracker-miner-manager.h"
 
diff --git a/src/tracker/tracker-tag.c b/src/tracker/tracker-tag.c
index 78c511092..249d1c328 100644
--- a/src/tracker/tracker-tag.c
+++ b/src/tracker/tracker-tag.c
@@ -18,7 +18,7 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#include "config.h"
+#include "config-miners.h"
 
 #include <stdlib.h>
 #include <time.h>
@@ -30,8 +30,6 @@
 
 #include <libtracker-sparql/tracker-sparql.h>
 
-#include "tracker-tag.h"
-
 #define TAG_OPTIONS_ENABLED() \
        (resources || \
         add_tag || \