diff --git a/Makefile.in b/Makefile.in
index 4550b0cce82..b4145a0186c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -285,4 +285,4 @@ backup-rust:
 	mv src/compiler/rust ..
 
 restore-rust:
-	if [ -d ../rust ]; then rm -rf src/rust; mv ../rust src/; fi
+	if [ -d ../rust ]; then rm -rf src/compiler/rust; mv ../rust src/compiler/; fi
diff --git a/src/etc/tidy.py b/src/etc/tidy.py
index 023c7380c9d..37c499f57a8 100644
--- a/src/etc/tidy.py
+++ b/src/etc/tidy.py
@@ -32,19 +32,10 @@ def do_license_check(name, contents):
         report_error_name_no(name, 1, "incorrect license")
 
 exceptions = [
-    "src/cairo", # Upstream
-    "src/libcss", # Upstream
-    "src/libhubbub", # Upstream
-    "src/libparserutils", # Upstream
-    "src/libwapcaplet", # Upstream
-    "src/mozjs", # Upstream
-    "src/pixman", # Upstream
-    "src/rust/", # Upstream
-    "src/rust-azure/src", # Upstream
-    "src/rust-azure/include", # Upstream
-    "src/rust-harfbuzz/harfbuzz", # Upstream
-    "src/skia", # Upstream
-    "src/servo/dom/bindings/codegen", # Generated and upstream code combined with our own. Could use cleanup
+    "src/support", # Upstream
+    "src/platform", # Upstream
+    "src/compiler", # Upstream
+    "src/components/servo/dom/bindings/codegen", # Generated and upstream code combined with our own. Could use cleanup
 ]
 
 def should_check(name):