diff --git a/hyde/ext/plugins/requirejs.py b/hyde/ext/plugins/requirejs.py
index 399ed67..4edc738 100644
--- a/hyde/ext/plugins/requirejs.py
+++ b/hyde/ext/plugins/requirejs.py
@@ -18,9 +18,8 @@ Please see the homepage of requirejs for usage details.
 """
 
 from hyde.plugin import CLTransformer
-from hyde.fs import File
 
-import re
+from fswrap import File
 import subprocess
 
 class RequireJSPlugin(CLTransformer):
diff --git a/hyde/tests/ext/test_requirejs.py b/hyde/tests/ext/test_requirejs.py
index c5f73dc..5b4e5eb 100644
--- a/hyde/tests/ext/test_requirejs.py
+++ b/hyde/tests/ext/test_requirejs.py
@@ -4,11 +4,11 @@ Use nose
 `$ pip install nose`
 `$ nosetests`
 """
-from hyde.fs import File, Folder
-from hyde.model import Expando
 from hyde.generator import Generator
 from hyde.site import Site
 
+from fswrap import File, Folder
+
 RJS_SOURCE = File(__file__).parent.child_folder('requirejs')
 TEST_SITE = File(__file__).parent.parent.child_folder('_test')