move the CSS content handler

12 files changed, 15 insertions, 20 deletions

diff --git a/desktop/browser.c b/desktop/browser.c
index 4cd017d57..2ee36fd7d 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -52,11 +52,11 @@
 #include "content/fetch.h"
 #include "content/hlcache.h"
 #include "content/urldb.h"
+#include "content/handlers/css/utils.h"
 #include "render/form_internal.h"
 #include "render/html.h"
 #include "render/box.h"
 #include "curl/curl.h"
-#include "css/utils.h"
 #include "javascript/js.h"
 
 #include "desktop/browser_history.h"
diff --git a/desktop/browser_history.c b/desktop/browser_history.c
index b90884e04..b3d12d525 100644
--- a/desktop/browser_history.c
+++ b/desktop/browser_history.c
@@ -34,7 +34,6 @@
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "content/urldb.h"
-#include "css/css.h"
 #include "content/handlers/image/bitmap.h"
 
 #include "desktop/gui_layout.h"
diff --git a/desktop/font_haru.c b/desktop/font_haru.c
index d2d7efdaf..caa751bcb 100644
--- a/desktop/font_haru.c
+++ b/desktop/font_haru.c
@@ -36,9 +36,6 @@
 
 #include <hpdf.h>
 
-#include "css/css.h"
-#include "css/utils.h"
-
 #include "utils/nsoption.h"
 #include "desktop/save_pdf/font_haru.h"
 #include "desktop/font.h"
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 440e14081..d3d45ca66 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -37,7 +37,7 @@
 #include "content/hlcache.h"
 #include "content/mimesniff.h"
 #include "content/urldb.h"
-#include "css/css.h"
+#include "content/handlers/css/css.h"
 #include "content/handlers/image/image.h"
 #include "content/handlers/image/image_cache.h"
 #include "javascript/js.h"
diff --git a/desktop/print.c b/desktop/print.c
index 711e907e2..c3cfefc0b 100644
--- a/desktop/print.c
+++ b/desktop/print.c
@@ -32,7 +32,7 @@
 #include "utils/talloc.h"
 #include "content/content.h"
 #include "content/hlcache.h"
-#include "css/utils.h"
+#include "content/handlers/css/utils.h"
 #include "render/box.h"
 
 #include "desktop/plotters.h"
diff --git a/desktop/print.h b/desktop/print.h
index 5c51981d1..fb1fd63ac 100644
--- a/desktop/print.h
+++ b/desktop/print.h
@@ -33,8 +33,7 @@
 #define NETSURF_DESKTOP_PRINT_H
 
 #include <stdbool.h>
-
-#include "css/css.h"
+#include <libcss/libcss.h>
 
 struct hlcache_handle;
 struct printer;
diff --git a/desktop/save_complete.c b/desktop/save_complete.c
index 98b0304f8..6f63960aa 100644
--- a/desktop/save_complete.c
+++ b/desktop/save_complete.c
@@ -41,7 +41,7 @@
 #include "utils/messages.h"
 #include "content/content.h"
 #include "content/hlcache.h"
-#include "css/css.h"
+#include "content/handlers/css/css.h"
 #include "render/box.h"
 #include "render/html.h"
 
diff --git a/desktop/save_pdf.c b/desktop/save_pdf.c
index 0168d0203..40082f23c 100644
--- a/desktop/save_pdf.c
+++ b/desktop/save_pdf.c
@@ -44,6 +44,7 @@
  */
 
 #include "utils/config.h"
+#include "utils/errors.h"
 
 #include "desktop/save_pdf.h"
 
@@ -52,18 +53,18 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-
 #include <hpdf.h>
 
+#include "utils/log.h"
+#include "utils/utils.h"
+#include "utils/useragent.h"
 #include "content/hlcache.h"
 #include "utils/nsoption.h"
+#include "content/handlers/image/bitmap.h"
+
 #include "desktop/plotters.h"
 #include "desktop/print.h"
 #include "desktop/printer.h"
-#include "content/handlers/image/bitmap.h"
-#include "utils/log.h"
-#include "utils/utils.h"
-#include "utils/useragent.h"
 
 #include "font_haru.h"
 
diff --git a/desktop/system_colour.c b/desktop/system_colour.c
index 178c03536..f33b57a37 100644
--- a/desktop/system_colour.c
+++ b/desktop/system_colour.c
@@ -26,10 +26,10 @@
 #include "utils/config.h"
 #include "utils/utils.h"
 #include "utils/log.h"
-#include "css/utils.h"
-#include "desktop/system_colour.h"
 #include "utils/nsoption.h"
+#include "netsurf/css.h"
 
+#include "desktop/system_colour.h"
 
 #define colour_list_len ((NSOPTION_SYS_COLOUR_END - NSOPTION_SYS_COLOUR_START) + 1)
 
diff --git a/desktop/textarea.c b/desktop/textarea.c
index 467965d39..96a1713ef 100644
--- a/desktop/textarea.c
+++ b/desktop/textarea.c
@@ -26,10 +26,10 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "css/utils.h"
 #include "utils/log.h"
 #include "utils/utf8.h"
 #include "utils/utils.h"
+#include "content/handlers/css/utils.h"
 
 #include "desktop/browser.h"
 #include "desktop/mouse.h"
diff --git a/desktop/tree.c b/desktop/tree.c
index c5bca61da..e9a2dfdcc 100644
--- a/desktop/tree.c
+++ b/desktop/tree.c
@@ -32,7 +32,6 @@
 #include "utils/utils.h"
 #include "content/content.h"
 #include "content/hlcache.h"
-#include "css/utils.h"
 #include "utils/nsoption.h"
 
 #include "desktop/browser.h"
diff --git a/desktop/treeview.c b/desktop/treeview.c
index 6b04eacb9..c12ecd98e 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -23,9 +23,9 @@
  */
 
 #include "utils/log.h"
-#include "css/utils.h"
 #include "content/handlers/image/bitmap.h"
 #include "content/hlcache.h"
+#include "content/handlers/css/utils.h"
 
 #include "desktop/system_colour.h"
 #include "desktop/knockout.h"