diff --git a/lint/lint.go b/lint/lint.go
index 709fad3..157f911 100644
--- a/lint/lint.go
+++ b/lint/lint.go
@@ -45,10 +45,12 @@
 		config: "eclipse/settings/code-style/gwt-checkstyle.xml",
 		includes: []string{
 			"dev/core/src/",
-			"dev/core/super/com/google/gwt/dev/jjs/intrinsic/",
+			"dev/core/super/",
 			"user/src/",
 			"user/super/com/google/gwt/emul/",
 			"user/super/com/google/gwt/junit/translatable/",
+			"codeserver/java/",
+			"samples/",
 		},
 		excludes: []string{
 			"dev/core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java",
@@ -64,7 +66,9 @@
 		config: "eclipse/settings/code-style/gwt-checkstyle-tests.xml",
 		includes: []string{
 			"user/test/com/google/",
+			"user/test-super/com/google",
 			"user/test/test/",
+			"dev/core/test/",
 		},
 	},
 }