1 files changed, 16 insertions, 7 deletions
diff --git a/components/style/selector_impl.rs b/components/style/selector_impl.rs
index 3d1d7813bd2..85734d51387 100644
--- a/components/style/selector_impl.rs
+++ b/components/style/selector_impl.rs
@@ -5,23 +5,34 @@
 //! The pseudo-classes and pseudo-elements supported by the style system.
 
 use matching::{common_style_affecting_attributes, CommonStyleAffectingAttributeMode};
-use restyle_hints;
 use selectors::Element;
 use selectors::parser::{AttrSelector, SelectorImpl};
 
 pub type AttrValue = <TheSelectorImpl as SelectorImpl>::AttrValue;
 
 #[cfg(feature = "servo")]
-pub use servo_selector_impl::*;
+pub use servo::selector_impl::*;
+
+#[cfg(feature = "gecko")]
+pub use gecko::selector_impl::*;
 
 #[cfg(feature = "servo")]
-pub use servo_selector_impl::{ServoSelectorImpl as TheSelectorImpl, ServoElementSnapshot as ElementSnapshot};
+pub use servo::selector_impl::ServoSelectorImpl as TheSelectorImpl;
 
 #[cfg(feature = "gecko")]
-pub use gecko::selector_impl::*;
+pub use gecko::selector_impl::GeckoSelectorImpl as TheSelectorImpl;
+
+#[cfg(feature = "servo")]
+pub use servo::selector_impl::ServoElementSnapshot as Snapshot;
 
 #[cfg(feature = "gecko")]
-pub use gecko::selector_impl::{GeckoSelectorImpl as TheSelectorImpl};
+pub use gecko::snapshot::GeckoElementSnapshot as Snapshot;
+
+#[cfg(feature = "servo")]
+pub use servo::restyle_damage::ServoRestyleDamage as RestyleDamage;
+
+#[cfg(feature = "gecko")]
+pub use gecko::restyle_damage::GeckoRestyleDamage as RestyleDamage;
 
 /// This function determines if a pseudo-element is eagerly cascaded or not.
 ///
@@ -71,8 +82,6 @@ impl PseudoElementCascadeType {
 }
 
 pub trait ElementExt: Element<Impl=TheSelectorImpl> {
-    type Snapshot: restyle_hints::ElementSnapshot + 'static;
-
     fn is_link(&self) -> bool;
 }