14 files changed, 27 insertions, 31 deletions
diff --git a/render/box.c b/render/box.c
index bb1800b00..07ea114d4 100644
--- a/render/box.c
+++ b/render/box.c
@@ -35,9 +35,8 @@
 #include "utils/utils.h"
 #include "content/content_protected.h"
 #include "content/hlcache.h"
-#include "css/css.h"
-#include "css/utils.h"
-#include "css/dump.h"
+#include "content/handlers/css/utils.h"
+#include "content/handlers/css/dump.h"
 #include "desktop/scrollbar.h"
 #include "desktop/gui_misc.h"
 #include "desktop/gui_internal.h"
diff --git a/render/box.h b/render/box.h
index 4ac3453aa..c3f95c21c 100644
--- a/render/box.h
+++ b/render/box.h
@@ -89,8 +89,7 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
-
-#include "css/css.h"
+#include <libcss/libcss.h>
 
 struct content;
 struct box;
diff --git a/render/box_construct.c b/render/box_construct.c
index 7e982d7a3..6dce5c690 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -43,10 +43,9 @@
 #include "utils/utils.h"
 #include "utils/string.h"
 #include "content/content_protected.h"
-#include "css/css.h"
-#include "css/hints.h"
-#include "css/select.h"
-#include "css/utils.h"
+#include "content/handlers/css/hints.h"
+#include "content/handlers/css/select.h"
+#include "netsurf/css.h"
 #include "desktop/gui_misc.h"
 #include "desktop/gui_internal.h"
 
diff --git a/render/box_normalise.c b/render/box_normalise.c
index 1010c408b..76767a2a9 100644
--- a/render/box_normalise.c
+++ b/render/box_normalise.c
@@ -26,12 +26,14 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <string.h>
-#include "css/css.h"
-#include "css/select.h"
+
+#include "utils/log.h"
+#include "utils/errors.h"
+#include "content/handlers/css/select.h"
+
 #include "render/box.h"
 #include "render/html_internal.h"
 #include "render/table.h"
-#include "utils/log.h"
 
 /* Define to enable box normalise debug */
 #undef BOX_NORMALISE_DEBUG
diff --git a/render/font.c b/render/font.c
index 0b059a218..831097e21 100644
--- a/render/font.c
+++ b/render/font.c
@@ -22,9 +22,8 @@
  * Renderer internal font handling implementation.
  */
 
-#include "css/css.h"
-#include "css/utils.h"
 #include "utils/nsoption.h"
+#include "content/handlers/css/utils.h"
 
 #include "render/font.h"
 
diff --git a/render/form.c b/render/form.c
index dce906437..75d16d83b 100644
--- a/render/form.c
+++ b/render/form.c
@@ -42,8 +42,7 @@
 #include "utils/utils.h"
 #include "content/fetch.h"
 #include "content/hlcache.h"
-#include "css/css.h"
-#include "css/utils.h"
+#include "content/handlers/css/utils.h"
 #include "desktop/browser.h"
 #include "desktop/mouse.h"
 #include "desktop/knockout.h"
diff --git a/render/html.h b/render/html.h
index ee204d3d6..215bfbbe6 100644
--- a/render/html.h
+++ b/render/html.h
@@ -31,7 +31,6 @@
 #include <dom/bindings/hubbub/parser.h>
 
 #include "content/content_type.h"
-#include "css/css.h"
 #include "desktop/browser.h"
 #include "desktop/mouse.h"
 #include "desktop/plot_style.h"
diff --git a/render/html_css.c b/render/html_css.c
index 6761a6502..0c8ee3351 100644
--- a/render/html_css.c
+++ b/render/html_css.c
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 
 #include "content/hlcache.h"
+#include "content/handlers/css/css.h"
 #include "utils/nsoption.h"
 #include "utils/corestrings.h"
 #include "utils/config.h"
diff --git a/render/html_internal.h b/render/html_internal.h
index de28726fb..f0e98158f 100644
--- a/render/html_internal.h
+++ b/render/html_internal.h
@@ -16,13 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
+/**
+ * \file
  * Content for text/html (private data).
  */
 
 #ifndef NETSURF_RENDER_HTML_INTERNAL_H_
 #define NETSURF_RENDER_HTML_INTERNAL_H_
 
+#include <libcss/libcss.h>
+
 #include "content/content_protected.h"
 #include "desktop/selection.h"
 #include "render/html.h"
diff --git a/render/html_object.c b/render/html_object.c
index 22c9b712a..9e5e26730 100644
--- a/render/html_object.c
+++ b/render/html_object.c
@@ -33,7 +33,7 @@
 #include "utils/log.h"
 #include "utils/nsoption.h"
 #include "content/hlcache.h"
-#include "css/utils.h"
+#include "content/handlers/css/utils.h"
 #include "desktop/scrollbar.h"
 #include "desktop/gui_misc.h"
 #include "desktop/gui_internal.h"
diff --git a/render/html_redraw.c b/render/html_redraw.c
index 93c136fb0..7f8391cf9 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -41,8 +41,7 @@
 #include "utils/utils.h"
 #include "utils/nsoption.h"
 #include "content/content_protected.h"
-#include "css/css.h"
-#include "css/utils.h"
+#include "content/handlers/css/utils.h"
 #include "desktop/browser.h"
 #include "desktop/plotters.h"
 #include "desktop/selection.h"
diff --git a/render/layout.c b/render/layout.c
index e80ec994a..a7f2e8db5 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -46,10 +46,9 @@
 #include "utils/log.h"
 #include "utils/talloc.h"
 #include "utils/utils.h"
-#include "css/css.h"
-#include "css/utils.h"
-#include "content/content_protected.h"
 #include "utils/nsoption.h"
+#include "content/content_protected.h"
+#include "content/handlers/css/utils.h"
 #include "desktop/browser.h"
 #include "desktop/scrollbar.h"
 #include "desktop/textarea.h"
diff --git a/render/table.c b/render/table.c
index 656386491..62553ecdd 100644
--- a/render/table.c
+++ b/render/table.c
@@ -22,15 +22,14 @@
  */
 
 #include <assert.h>
-
 #include <dom/dom.h>
 
-#include "css/css.h"
-#include "css/utils.h"
-#include "render/box.h"
-#include "render/table.h"
 #include "utils/log.h"
 #include "utils/talloc.h"
+#include "content/handlers/css/utils.h"
+
+#include "render/box.h"
+#include "render/table.h"
 
 /* Define to enable verbose table debug */
 #undef TABLE_DEBUG
diff --git a/render/textplain.c b/render/textplain.c
index c825b7946..5ecf1436d 100644
--- a/render/textplain.c
+++ b/render/textplain.c
@@ -39,8 +39,7 @@
 #include "utils/utf8.h"
 #include "content/content_protected.h"
 #include "content/hlcache.h"
-#include "css/css.h"
-#include "css/utils.h"
+#include "content/handlers/css/utils.h"
 #include "desktop/browser.h"
 #include "utils/nsoption.h"
 #include "desktop/plotters.h"