diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs
index d6b1eb86937b..4c337993468e 100644
--- a/src/librustc_driver/lib.rs
+++ b/src/librustc_driver/lib.rs
@@ -1207,6 +1207,10 @@ pub fn diagnostics_registry() -> errors::registry::Registry {
     all_errors.extend_from_slice(&rustc_trans::DIAGNOSTICS);
     all_errors.extend_from_slice(&rustc_const_eval::DIAGNOSTICS);
     all_errors.extend_from_slice(&rustc_metadata::DIAGNOSTICS);
+    all_errors.extend_from_slice(&rustc_passes::DIAGNOSTICS);
+    all_errors.extend_from_slice(&rustc_plugin::DIAGNOSTICS);
+    all_errors.extend_from_slice(&rustc_mir::DIAGNOSTICS);
+    all_errors.extend_from_slice(&syntax::DIAGNOSTICS);
 
     Registry::new(&all_errors)
 }
diff --git a/src/librustc_mir/lib.rs b/src/librustc_mir/lib.rs
index 912c2043390f..ea8624930e5f 100644
--- a/src/librustc_mir/lib.rs
+++ b/src/librustc_mir/lib.rs
@@ -57,3 +57,5 @@ pub fn provide(providers: &mut Providers) {
     shim::provide(providers);
     transform::provide(providers);
 }
+
+__build_diagnostic_array! { librustc_mir, DIAGNOSTICS }
diff --git a/src/librustc_passes/lib.rs b/src/librustc_passes/lib.rs
index 3949152e8489..ed5ea69d04ea 100644
--- a/src/librustc_passes/lib.rs
+++ b/src/librustc_passes/lib.rs
@@ -45,3 +45,5 @@ pub mod loops;
 pub mod mir_stats;
 pub mod no_asm;
 pub mod static_recursion;
+
+__build_diagnostic_array! { librustc_passes, DIAGNOSTICS }
diff --git a/src/librustc_plugin/lib.rs b/src/librustc_plugin/lib.rs
index 1de31c5d7915..e17a3c82b502 100644
--- a/src/librustc_plugin/lib.rs
+++ b/src/librustc_plugin/lib.rs
@@ -84,3 +84,5 @@ pub mod diagnostics;
 pub mod registry;
 pub mod load;
 pub mod build;
+
+__build_diagnostic_array! { librustc_plugin, DIAGNOSTICS }
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index a8338fccb6b1..43345b02bf61 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -148,4 +148,4 @@ pub mod ext {
 #[cfg(test)]
 mod test_snippet;
 
-// __build_diagnostic_array! { libsyntax, DIAGNOSTICS }
+__build_diagnostic_array! { libsyntax, DIAGNOSTICS }