diff --git a/modules/@angular/integration_test/public_api_spec.ts b/modules/@angular/integration_test/public_api_spec.ts
index 8ddd143f85..3bb02b34a1 100644
--- a/modules/@angular/integration_test/public_api_spec.ts
+++ b/modules/@angular/integration_test/public_api_spec.ts
@@ -23,6 +23,11 @@ import {ListWrapper} from '../facade/src/collection';
 //
 // =================================================================================================
 // =================================================================================================
+// Note that this test only tests for *values* exported (e.g. classes, functions, variables), but
+// not for *types* exported (interfaces, typedefs).
+// See tools/public_api_guard/public_api_spec.ts for a type based test.
+// =================================================================================================
+
 
 var COMMON: string[] = [
   'APP_BASE_HREF',
diff --git a/modules/@angular/platform-browser/src/platform_browser.ts b/modules/@angular/platform-browser/src/platform_browser.ts
index ee1a0b486d..dcc95101e5 100644
--- a/modules/@angular/platform-browser/src/platform_browser.ts
+++ b/modules/@angular/platform-browser/src/platform_browser.ts
@@ -26,7 +26,15 @@ export {
 export * from '../private_export';
 export {DOCUMENT} from './dom/dom_tokens';
 
-export {DomSanitizationService, SecurityContext} from './security/dom_sanitization_service';
+export {
+  DomSanitizationService,
+  SafeHtml,
+  SafeScript,
+  SafeStyle,
+  SafeUrl,
+  SafeResourceUrl,
+  SecurityContext
+} from './security/dom_sanitization_service';
 
 export {
   bootstrapStatic,
diff --git a/tools/public_api_guard/public_api_spec.ts b/tools/public_api_guard/public_api_spec.ts
index 7ace20b459..d00860aa90 100644
--- a/tools/public_api_guard/public_api_spec.ts
+++ b/tools/public_api_guard/public_api_spec.ts
@@ -1224,6 +1224,11 @@ const BROWSER = [
   'By.css(selector:string):Predicate<DebugElement>',
   'By.directive(type:Type):Predicate<DebugElement>',
   'DomSanitizationService',
+  'SafeHtml',
+  'SafeScript',
+  'SafeStyle',
+  'SafeUrl',
+  'SafeResourceUrl',
   'SecurityContext',
   'Title',
   'Title.getTitle():string',