diff --git a/src/rustc/syntax/parse/lexer.rs b/src/librustsyntax/parse/lexer.rs
similarity index 99%
rename from src/rustc/syntax/parse/lexer.rs
rename to src/librustsyntax/parse/lexer.rs
index 5613b736d069de0919ff7dba1ffe96139f3c3c95..a4a5e0e17ac3be75ace7c57f51fa848a74bec87c 100644
--- a/src/rustc/syntax/parse/lexer.rs
+++ b/src/librustsyntax/parse/lexer.rs
@@ -1,7 +1,7 @@
 import io::reader_util;
 import util::interner;
 import util::interner::intern;
-import driver::diagnostic;
+import diagnostic;
 
 type reader = @{
     cm: codemap::codemap,
diff --git a/src/rustc/syntax/parse/token.rs b/src/librustsyntax/parse/token.rs
similarity index 100%
rename from src/rustc/syntax/parse/token.rs
rename to src/librustsyntax/parse/token.rs
diff --git a/src/librustsyntax/rustsyntax.rc b/src/librustsyntax/rustsyntax.rc
index 4267eff6c6176954d582bf2e38789aaeeead1c78..081f31f7b000d70fdefd1c7ec935f0f8edd5135d 100644
--- a/src/librustsyntax/rustsyntax.rc
+++ b/src/librustsyntax/rustsyntax.rc
@@ -14,4 +14,8 @@ mod visit;
 mod fold;
 mod util {
     mod interner;
+}
+mod parse {
+    mod token;
+    mod lexer;
 }
\ No newline at end of file
diff --git a/src/rustc/rustc.rc b/src/rustc/rustc.rc
index bd864d74dcd98804a8655884135f64e3f31896c7..d161eeb78db7093d11b2eb08bd8a28c71fa51172 100644
--- a/src/rustc/rustc.rc
+++ b/src/rustc/rustc.rc
@@ -71,9 +71,7 @@ mod middle {
 
 mod syntax {
     mod parse {
-        mod lexer;
         mod parser;
-        mod token;
         mod eval;
     }
     mod ext {
diff --git a/src/rustc/syntax/parse.rs b/src/rustc/syntax/parse.rs
new file mode 100644
index 0000000000000000000000000000000000000000..5fffd171dd7b59758835b0ad7224790abe2196b5
--- /dev/null
+++ b/src/rustc/syntax/parse.rs
@@ -0,0 +1,7 @@
+import rustsyntax::parse::token;
+export token;
+
+import rustsyntax::parse::lexer;
+export lexer;
+
+export parser;
\ No newline at end of file