diff --git a/src/librustpkg/conditions.rs b/src/librustpkg/conditions.rs
index 785c635e08561..2d7c4f7fd6455 100644
--- a/src/librustpkg/conditions.rs
+++ b/src/librustpkg/conditions.rs
@@ -14,33 +14,33 @@ pub use std::path::Path;
 pub use package_id::PkgId;
 
 condition! {
-    bad_path: (super::Path, ~str) -> super::Path;
+    pub bad_path: (super::Path, ~str) -> super::Path;
 }
 
 condition! {
-    nonexistent_package: (super::PkgId, ~str) -> super::Path;
+    pub nonexistent_package: (super::PkgId, ~str) -> super::Path;
 }
 
 condition! {
-    copy_failed: (super::Path, super::Path) -> ();
+    pub copy_failed: (super::Path, super::Path) -> ();
 }
 
 condition! {
-    missing_pkg_files: (super::PkgId) -> ();
+    pub missing_pkg_files: (super::PkgId) -> ();
 }
 
 condition! {
-    bad_pkg_id: (super::Path, ~str) -> super::PkgId;
+    pub bad_pkg_id: (super::Path, ~str) -> super::PkgId;
 }
 
 condition! {
-    no_rust_path: (~str) -> super::Path;
+    pub no_rust_path: (~str) -> super::Path;
 }
 
 condition! {
-    not_a_workspace: (~str) -> super::Path;
+    pub not_a_workspace: (~str) -> super::Path;
 }
 
 condition! {
-    failed_to_create_temp_dir: (~str) -> super::Path;
+    pub failed_to_create_temp_dir: (~str) -> super::Path;
 }
diff --git a/src/librustpkg/package_source.rs b/src/librustpkg/package_source.rs
index ae2083f1b22c1..8f2d8877cf947 100644
--- a/src/librustpkg/package_source.rs
+++ b/src/librustpkg/package_source.rs
@@ -34,6 +34,7 @@ pub struct PkgSrc {
 }
 
 condition! {
+    // #6009: should this be pub or not, when #8215 is fixed?
     build_err: (~str) -> ();
 }
 
diff --git a/src/libstd/c_str.rs b/src/libstd/c_str.rs
index 70b04e37ee1ff..907d80e69b171 100644
--- a/src/libstd/c_str.rs
+++ b/src/libstd/c_str.rs
@@ -28,8 +28,8 @@ pub enum NullByteResolution {
 }
 
 condition! {
-    // this should be &[u8] but there's a lifetime issue
-    null_byte: (~[u8]) -> super::NullByteResolution;
+    // this should be &[u8] but there's a lifetime issue; (Issue #5370)
+    pub null_byte: (~[u8]) -> super::NullByteResolution;
 }
 
 /// The representation of a C String.
diff --git a/src/libstd/rt/io/mod.rs b/src/libstd/rt/io/mod.rs
index 116d240308a36..d157c2419a588 100644
--- a/src/libstd/rt/io/mod.rs
+++ b/src/libstd/rt/io/mod.rs
@@ -384,15 +384,13 @@ impl ToStr for IoErrorKind {
 // XXX: Can't put doc comments on macros
 // Raised by `I/O` operations on error.
 condition! {
-    // FIXME (#6009): uncomment `pub` after expansion support lands.
-    /*pub*/ io_error: super::IoError -> ();
+    pub io_error: super::IoError -> ();
 }
 
 // XXX: Can't put doc comments on macros
 // Raised by `read` on error
 condition! {
-    // FIXME (#6009): uncomment `pub` after expansion support lands.
-    /*pub*/ read_error: super::IoError -> ();
+    pub read_error: super::IoError -> ();
 }
 
 pub trait Reader {
diff --git a/src/libstd/str.rs b/src/libstd/str.rs
index e4d1b324e7368..471ac409cbba2 100644
--- a/src/libstd/str.rs
+++ b/src/libstd/str.rs
@@ -42,7 +42,7 @@ Section: Conditions
 */
 
 condition! {
-    not_utf8: (~str) -> ~str;
+    pub not_utf8: (~str) -> ~str;
 }
 
 /*
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index adccf513ea93e..d3ba2f0eb1446 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -905,8 +905,7 @@ pub fn std_macros() -> @str {
 
         { $c:ident: $input:ty -> $out:ty; } => {
 
-            // FIXME (#6009): remove mod's `pub` below once variant above lands.
-            pub mod $c {
+            mod $c {
                 #[allow(non_uppercase_statics)];
                 static key: ::std::local_data::Key<
                     @::std::condition::Handler<$input, $out>> =