diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index 0560b1df..ecc01ac9 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -9,7 +9,10 @@ import {
   ViewEncapsulation,
   OnDestroy
 } from '@angular/core';
-import {Overlay, OverlayState, OverlayRef, OVERLAY_PROVIDERS} from '@angular2-material/core/overlay/overlay';
+import {Overlay} from '@angular2-material/core/overlay/overlay';
+import {OverlayState} from '@angular2-material/core/overlay/overlay-state';
+import {OverlayRef} from '@angular2-material/core/overlay/overlay-ref';
+import {OVERLAY_DIRECTIVES} from '@angular2-material/core/overlay/overlay-directives';
 import {Animate} from '../../core/util/animate';
 import {MdDialogPortal} from './dialog-portal';
 import {MdDialogActions} from './dialog-actions';
diff --git a/src/index.ts b/src/index.ts
index fc50315b..0c8efad1 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -30,7 +30,8 @@ import {MdSwitch} from "./components/switch/switch";
 import {MdSubheader} from "./components/subheader/subheader";
 import {Media} from "./core/util/media";
 import {ViewportHelper, BrowserViewportHelper, NodeViewportHelper} from "./core/util/viewport";
-import {OVERLAY_CONTAINER_TOKEN, createOverlayContainer} from "@angular2-material/core/overlay/overlay";
+import {createOverlayContainer} from "@angular2-material/core/overlay/overlay-container";
+import {OVERLAY_CONTAINER_TOKEN} from "@angular2-material/core/overlay/overlay-directives";
 import {MdBackdrop} from "./components/backdrop/backdrop";
 
 export * from './components/button/button';