Update the core to use the split operations table headers

Second in the series to decouple the core API usage from the frontends.

7 files changed, 20 insertions, 9 deletions

diff --git a/content/fetch.c b/content/fetch.c
index 195f61fb7..7923e9af3 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -40,7 +40,6 @@
 #include <curl/curl.h>
 
 #include "utils/config.h"
-#include "desktop/gui_factory.h"
 #include "utils/corestrings.h"
 #include "utils/nsoption.h"
 #include "utils/log.h"
@@ -48,6 +47,8 @@
 #include "utils/nsurl.h"
 #include "utils/utils.h"
 #include "utils/ring.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_internal.h"
 
 #include "content/fetch.h"
 #include "content/fetchers.h"
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index b3a4b9f38..df48d8b99 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -41,7 +41,6 @@
 #include <libwapcaplet/libwapcaplet.h>
 
 #include "utils/config.h"
-#include "desktop/gui_factory.h"
 #include "utils/corestrings.h"
 #include "utils/nsoption.h"
 #include "utils/log.h"
@@ -50,6 +49,8 @@
 #include "utils/ring.h"
 #include "utils/useragent.h"
 #include "utils/file.h"
+#include "desktop/gui_fetch.h"
+#include "desktop/gui_internal.h"
 
 #include "content/fetch.h"
 #include "content/fetchers.h"
diff --git a/content/fetchers/file.c b/content/fetchers/file.c
index acb30c07a..eced97f6f 100644
--- a/content/fetchers/file.c
+++ b/content/fetchers/file.c
@@ -16,7 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* file: URL handling. Based on the data fetcher by Rob Kendrick */
+/**
+ * \file
+ *
+ * file scheme URL handling. Based on the data fetcher by Rob Kendrick
+ */
 
 #include "utils/config.h"
 
@@ -42,7 +46,6 @@
 
 #include <libwapcaplet/libwapcaplet.h>
 
-#include "desktop/gui_factory.h"
 #include "utils/corestrings.h"
 #include "utils/nsoption.h"
 #include "utils/errors.h"
@@ -51,6 +54,8 @@
 #include "utils/utils.h"
 #include "utils/ring.h"
 #include "utils/file.h"
+#include "desktop/gui_fetch.h"
+#include "desktop/gui_internal.h"
 
 #include "content/dirlist.h"
 #include "content/fetch.h"
diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c
index 18e302140..723d09481 100644
--- a/content/fetchers/resource.c
+++ b/content/fetchers/resource.c
@@ -44,7 +44,8 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "utils/ring.h"
-#include "desktop/gui_factory.h"
+#include "desktop/gui_fetch.h"
+#include "desktop/gui_internal.h"
 
 #include "content/fetch.h"
 #include "content/fetchers.h"
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index fde17ed62..230b3f1ee 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -43,7 +43,6 @@
 #include "utils/log.h"
 #include "utils/utils.h"
 #include "utils/messages.h"
-#include "desktop/gui.h"
 
 #include "content/backing_store.h"
 
diff --git a/content/hlcache.c b/content/hlcache.c
index 0d7996524..8a7ffe9da 100644
--- a/content/hlcache.c
+++ b/content/hlcache.c
@@ -24,12 +24,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "desktop/gui_factory.h"
 #include "utils/http.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/ring.h"
 #include "utils/utils.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_internal.h"
 
 #include "content/content.h"
 #include "content/mimesniff.h"
diff --git a/content/llcache.c b/content/llcache.c
index ad4d6d1f7..ec6988fa3 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -16,7 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
+/**
+ * \file
+ *
  * Low-level resource cache implementation
  *
  * This is the implementation of the low level cache. This cache
@@ -43,7 +45,8 @@
 #include "utils/nsurl.h"
 #include "utils/utils.h"
 #include "utils/time.h"
-#include "desktop/gui_factory.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_internal.h"
 
 #include "content/fetch.h"
 #include "content/backing_store.h"