diff --git a/polymer-element.html b/polymer-element.html
index 5264e0d3..29db3564 100644
--- a/polymer-element.html
+++ b/polymer-element.html
@@ -1 +1,4 @@
-<link rel="import" href="src/mixins/element-mixin.html">
\ No newline at end of file
+<link rel="import" href="src/mixins/element-mixin.html">
+<script>
+  Polymer.Element = Polymer.ElementMixin(HTMLElement);
+</script>
\ No newline at end of file
diff --git a/polymer.html b/polymer.html
index c464ef77..cff38c5d 100644
--- a/polymer.html
+++ b/polymer.html
@@ -9,3 +9,8 @@
 <link rel="import" href="src/elements/array-selector.html">
 <!-- custom-style -->
 <link rel="import" href="src/elements/custom-style.html">
+<script>
+  Polymer.LegacyElement = Polymer.LegacyElementMixin(HTMLElement);
+  // bc
+  Polymer.Base = Polymer.LegacyElement.prototype;
+</script>
\ No newline at end of file
diff --git a/src/elements/dom-if.html b/src/elements/dom-if.html
index f05df461..3b716f94 100644
--- a/src/elements/dom-if.html
+++ b/src/elements/dom-if.html
@@ -8,7 +8,7 @@ Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 
-<link rel="import" href="../mixins/element-mixin.html">
+<link rel="import" href="../../polymer-element.html">
 <link rel="import" href="../lib/templatize.html">
 <link rel="import" href="../lib/debounce.html">
 <link rel="import" href="../lib/flush.html">
diff --git a/src/elements/dom-repeat.html b/src/elements/dom-repeat.html
index 7262b67e..9b370abb 100644
--- a/src/elements/dom-repeat.html
+++ b/src/elements/dom-repeat.html
@@ -98,7 +98,7 @@ Then the `observe` property should be configured as follows:
 
 -->
 
-<link rel="import" href="../mixins/element-mixin.html">
+<link rel="import" href="../../polymer-element.html">
 <link rel="import" href="../lib/templatize.html">
 <link rel="import" href="../lib/debounce.html">
 <link rel="import" href="../lib/flush.html">
diff --git a/src/legacy/legacy-element-mixin.html b/src/legacy/legacy-element-mixin.html
index 6c4f5802..0c9d55ac 100644
--- a/src/legacy/legacy-element-mixin.html
+++ b/src/legacy/legacy-element-mixin.html
@@ -746,9 +746,5 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
   });
 
-  // bc
-  Polymer.LegacyElement = Polymer.LegacyElementMixin(HTMLElement);
-  Polymer.Base = Polymer.LegacyElement.prototype;
-
 })();
 </script>
diff --git a/src/mixins/element-mixin.html b/src/mixins/element-mixin.html
index 681f977d..7d3f515a 100644
--- a/src/mixins/element-mixin.html
+++ b/src/mixins/element-mixin.html
@@ -460,8 +460,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     }
   };
 
-  Polymer.Element = Polymer.ElementMixin(HTMLElement);
-
   Polymer.updateStyles = function(props) {
     if (window.ShadyCSS) {
       ShadyCSS.updateStyles(props);