diff --git a/modules/angular2/angular2.ts b/modules/angular2/angular2.ts
index ae3df8692c..2eec37d346 100644
--- a/modules/angular2/angular2.ts
+++ b/modules/angular2/angular2.ts
@@ -1,9 +1,76 @@
-export * from './change_detection';
+export {
+  DehydratedException,
+  ExpressionChangedAfterItHasBeenChecked,
+  ChangeDetectionError,
+  ChangeDetection,
+  ON_PUSH,
+  DEFAULT,
+  ChangeDetectorRef,
+  PipeRegistry,
+  WrappedValue,
+  Pipe,
+  PipeFactory,
+  NullPipe,
+  NullPipeFactory,
+  defaultPipes,
+  DynamicChangeDetection,
+  JitChangeDetection,
+  PreGeneratedChangeDetection,
+  preGeneratedProtoDetectors,
+  defaultPipeRegistry
+} from './change_detection';
+
+export {
+  Inject,
+  InjectPromise,
+  InjectLazy,
+  Optional,
+  Injectable,
+  forwardRef,
+  resolveForwardRef,
+  ForwardRefFn,
+  Injector,
+  Binding,
+  bind,
+  Key,
+  NoBindingError,
+  AbstractBindingError,
+  AsyncBindingError,
+  CyclicDependencyError,
+  InstantiationError,
+  InvalidBindingError,
+  NoAnnotationError,
+  OpaqueToken
+} from './di';
+
 export * from './core';
 export * from './annotations';
 export * from './directives';
-export * from './forms';
-export * from './di';
+
+export {
+  AbstractControl,
+  Control,
+  ControlGroup,
+  ControlArray,
+  NgControlName,
+  NgFormControl,
+  NgModel,
+  NgControl,
+  NgControlGroup,
+  NgFormModel,
+  NgForm,
+  ControlValueAccessor,
+  DefaultValueAccessor,
+  CheckboxControlValueAccessor,
+  SelectControlValueAccessor,
+  formDirectives,
+  Validators,
+  NgValidator,
+  NgRequiredValidator,
+  FormBuilder,
+  formInjectables
+} from './forms';
+
 export * from './http';
 export {Observable, EventEmitter} from 'angular2/src/facade/async';
 export * from 'angular2/src/render/api';
diff --git a/modules/angular2/di.ts b/modules/angular2/di.ts
index 912b554526..b175e1112c 100644
--- a/modules/angular2/di.ts
+++ b/modules/angular2/di.ts
@@ -5,9 +5,17 @@
  * The `di` module provides dependency injection container services.
  */
 
-export * from './src/di/annotations';
-export * from './src/di/decorators';
-export * from './src/di/forward_ref';
+export {
+  InjectAnnotation,
+  InjectPromiseAnnotation,
+  InjectLazyAnnotation,
+  OptionalAnnotation,
+  InjectableAnnotation,
+  DependencyAnnotation
+} from './src/di/annotations';
+
+export {Inject, InjectPromise, InjectLazy, Optional, Injectable} from './src/di/decorators';
+export {forwardRef, resolveForwardRef, ForwardRefFn} from './src/di/forward_ref';
 export {resolveBindings, Injector} from './src/di/injector';
 export {Binding, BindingBuilder, ResolvedBinding, Dependency, bind} from './src/di/binding';
 export {Key, KeyRegistry, TypeLiteral} from './src/di/key';
diff --git a/modules/angular2/forms.ts b/modules/angular2/forms.ts
index bd59db924e..ffc86bb6d0 100644
--- a/modules/angular2/forms.ts
+++ b/modules/angular2/forms.ts
@@ -13,12 +13,25 @@
  *
  */
 
-export * from './src/forms/model';
-export * from './src/forms/directives';
-export * from './src/forms/validators';
-export * from './src/forms/directives/validators';
-export * from './src/forms/form_builder';
+export {AbstractControl, Control, ControlGroup, ControlArray} from './src/forms/model';
+
+export {NgControlName} from './src/forms/directives/ng_control_name';
+export {NgFormControl} from './src/forms/directives/ng_form_control';
+export {NgModel} from './src/forms/directives/ng_model';
+export {NgControl} from './src/forms/directives/ng_control';
+export {NgControlGroup} from './src/forms/directives/ng_control_group';
+export {NgFormModel} from './src/forms/directives/ng_form_model';
+export {NgForm} from './src/forms/directives/ng_form';
+export {ControlValueAccessor} from './src/forms/directives/control_value_accessor';
+export {DefaultValueAccessor} from './src/forms/directives/default_value_accessor';
+export {CheckboxControlValueAccessor} from './src/forms/directives/checkbox_value_accessor';
+export {SelectControlValueAccessor} from './src/forms/directives/select_control_value_accessor';
+export {formDirectives} from './src/forms/directives';
+export {Validators} from './src/forms/validators';
+export {NgValidator, NgRequiredValidator} from './src/forms/directives/validators';
+export {FormBuilder} from './src/forms/form_builder';
 
 import {FormBuilder} from './src/forms/form_builder';
 import {CONST_EXPR, Type} from './src/facade/lang';
-export const formInjectables: List<Type> = CONST_EXPR([FormBuilder]);
+
+export const formInjectables: List<Type> = CONST_EXPR([FormBuilder]);
\ No newline at end of file