diff --git a/.kokoro b/.kokoro
index 36629dac942..893bc7da48f 100755
--- a/.kokoro
+++ b/.kokoro
@@ -49,6 +49,7 @@ fix_bazel_imports() {
   rewrite_tests "s/import MaterialComponents.Material(.+)/import components_\1_\1/"
   rewrite_source "s/import <Motion(.+)\/Motion.+\.h>/import \"Motion\1.h\"/"
   rewrite_source "s/import <MDF(.+)\/MDF.+\.h>/import \"MDF\1.h\"/"
+  rewrite_source "s/import <MaterialComponents\/Material(.+)\.h>/import\/\*framework import\*\/ \"Material\1.h\"/"
   rewrite_tests "s/import MDFTextAccessibility/import material_text_accessibility_ios_MDFTextAccessibility/"
   rewrite_tests "s/import MDFInternationalization/import material_internationalization_ios_MDFInternationalization/"
   stashed_dir="$(pwd)/"
@@ -63,6 +64,7 @@ fix_bazel_imports() {
     rewrite_tests "s/import components_(.+)_(.+)/import MaterialComponents.Material\1_\2/"
     rewrite_source "s/import \"Motion(.+)\.h\"/import <Motion\1\/Motion\1.h>/"
     rewrite_source "s/import \"MDF(.+)\.h\"/import <MDF\1\/MDF\1.h>/"
+    rewrite_source "s/import\/\*framework import\*\/ \"Material(.+)\.h\"/import <MaterialComponents\/Material\1\.h>/"
     rewrite_tests "s/import material_text_accessibility_ios_MDFTextAccessibility/import MDFTextAccessibility/"
     rewrite_tests "s/import material_internationalization_ios_MDFInternationalization/import MDFInternationalization/"
   }
diff --git a/components/ActionSheet/src/ActionSheetThemer/MDCActionSheetScheme.h b/components/ActionSheet/src/ActionSheetThemer/MDCActionSheetScheme.h
index 7eecd04c381..29c133f1e6f 100644
--- a/components/ActionSheet/src/ActionSheetThemer/MDCActionSheetScheme.h
+++ b/components/ActionSheet/src/ActionSheetThemer/MDCActionSheetScheme.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "MaterialColorScheme.h"
-#import "MaterialTypographyScheme.h"
+#import <MaterialComponents/MaterialColorScheme.h>
+#import <MaterialComponents/MaterialTypographyScheme.h>
 
 #import <Foundation/Foundation.h>
 
diff --git a/components/ActionSheet/src/ColorThemer/MDCActionSheetColorThemer.h b/components/ActionSheet/src/ColorThemer/MDCActionSheetColorThemer.h
index b988c232200..40d198a7c8d 100644
--- a/components/ActionSheet/src/ColorThemer/MDCActionSheetColorThemer.h
+++ b/components/ActionSheet/src/ColorThemer/MDCActionSheetColorThemer.h
@@ -13,10 +13,11 @@
 // limitations under the License.
 
 #import "MaterialActionSheet.h"
-#import "MaterialColorScheme.h"
 
 #import <Foundation/Foundation.h>
 
+#import <MaterialComponents/MaterialColorScheme.h>
+
 /**
  The Material Design color system's themer for instances of MDCActionSheetController.
  */
diff --git a/components/ActionSheet/src/MDCActionSheetController.h b/components/ActionSheet/src/MDCActionSheetController.h
index 19591e367e0..a1a3354f83b 100644
--- a/components/ActionSheet/src/MDCActionSheetController.h
+++ b/components/ActionSheet/src/MDCActionSheetController.h
@@ -14,7 +14,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import "MaterialBottomSheet.h"
+#import <MaterialComponents/MaterialBottomSheet.h>
 
 @class MDCActionSheetAction;
 
diff --git a/components/ActionSheet/src/TypographyThemer/MDCActionSheetTypographyThemer.h b/components/ActionSheet/src/TypographyThemer/MDCActionSheetTypographyThemer.h
index 52eaa063577..ca775091238 100644
--- a/components/ActionSheet/src/TypographyThemer/MDCActionSheetTypographyThemer.h
+++ b/components/ActionSheet/src/TypographyThemer/MDCActionSheetTypographyThemer.h
@@ -13,10 +13,11 @@
 // limitations under the License.
 
 #import "MaterialActionSheet.h"
-#import "MaterialTypographyScheme.h"
 
 #import <Foundation/Foundation.h>
 
+#import <MaterialComponents/MaterialTypographyScheme.h>
+
 /**
  The Material Design typography system's themer for instances of MDCActionSheetController.
  */