4 files changed, 10 insertions, 6 deletions
diff --git a/src/html/chadombuilder.nim b/src/html/chadombuilder.nim
index 336543d1..c7a41619 100644
--- a/src/html/chadombuilder.nim
+++ b/src/html/chadombuilder.nim
@@ -2,13 +2,14 @@ import deques
 import options
 import streams
 
-import data/charset
 import html/dom
 import html/htmlparser
 import html/tags
 import js/javascript
 import types/url
 
+import chakasu/charset
+
 # DOMBuilder implementation for Chawan.
 
 type
diff --git a/src/html/dom.nim b/src/html/dom.nim
index c0dc066c..00f2a549 100644
--- a/src/html/dom.nim
+++ b/src/html/dom.nim
@@ -10,8 +10,6 @@ import tables
 import css/cssparser
 import css/sheet
 import css/values
-import data/charset
-import encoding/decoderstream
 import html/event
 import html/tags
 import img/bitmap
@@ -33,6 +31,9 @@ import types/vector
 import utils/mimeguess
 import utils/twtstr
 
+import chakasu/charset
+import chakasu/decoderstream
+
 type
   FormMethod* = enum
     FORM_METHOD_GET, FORM_METHOD_POST, FORM_METHOD_DIALOG
diff --git a/src/html/htmlparser.nim b/src/html/htmlparser.nim
index 2192ccf8..60a9aad9 100644
--- a/src/html/htmlparser.nim
+++ b/src/html/htmlparser.nim
@@ -6,13 +6,14 @@ import strutils
 import tables
 import unicode
 
-import data/charset
-import encoding/decoderstream
 import html/htmltokenizer
 import html/parseerror
 import html/tags
 import utils/twtstr
 
+import chakasu/charset
+import chakasu/decoderstream
+
 # Generics break without exporting macros. Maybe a compiler bug?
 export macros
 
diff --git a/src/html/htmltokenizer.nim b/src/html/htmltokenizer.nim
index d38d427c..f487f31f 100644
--- a/src/html/htmltokenizer.nim
+++ b/src/html/htmltokenizer.nim
@@ -5,7 +5,6 @@ import macros
 import tables
 import unicode
 
-import encoding/decoderstream
 import html/entity
 import html/parseerror
 import html/tags
@@ -13,6 +12,8 @@ import utils/opt
 import utils/radixtree
 import utils/twtstr
 
+import chakasu/decoderstream
+
 # Tokenizer
 type
   Tokenizer* = object