diff --git a/components/List/src/Theming/MDCBaseCell+MaterialTheming.m b/components/List/src/Theming/MDCBaseCell+MaterialTheming.m
index 528155aceed..88086113262 100644
--- a/components/List/src/Theming/MDCBaseCell+MaterialTheming.m
+++ b/components/List/src/Theming/MDCBaseCell+MaterialTheming.m
@@ -14,6 +14,12 @@
 
 #import "MDCBaseCell+MaterialTheming.h"
 
+#import "MaterialList.h"
+
+#import "MaterialColorScheme.h"
+
+#import "MaterialContainerScheme.h"
+
 static const CGFloat kInkAlpha = (CGFloat)0.16;
 
 @implementation MDCBaseCell (MaterialTheming)
diff --git a/components/List/src/Theming/MDCSelfSizingStereoCell+MaterialTheming.m b/components/List/src/Theming/MDCSelfSizingStereoCell+MaterialTheming.m
index 7044e01acc5..d1875cdae42 100644
--- a/components/List/src/Theming/MDCSelfSizingStereoCell+MaterialTheming.m
+++ b/components/List/src/Theming/MDCSelfSizingStereoCell+MaterialTheming.m
@@ -14,7 +14,12 @@
 
 #import "MDCSelfSizingStereoCell+MaterialTheming.h"
 
+#import "MaterialList.h"
 #import "MaterialTypography.h"
+#import "MaterialColorScheme.h"
+#import "MaterialContainerScheme.h"
+#import "MaterialTypographyScheme.h"
+#import "MaterialTypographyScheme+Scheming.h"
 
 static const CGFloat kHighAlpha = (CGFloat)0.87;
 static const CGFloat kInkAlpha = (CGFloat)0.16;
diff --git a/components/NavigationBar/tests/unit/NavigationBarRippleTests.m b/components/NavigationBar/tests/unit/NavigationBarRippleTests.m
index 064bad2a0c5..a51d5dcc661 100644
--- a/components/NavigationBar/tests/unit/NavigationBarRippleTests.m
+++ b/components/NavigationBar/tests/unit/NavigationBarRippleTests.m
@@ -15,9 +15,7 @@
 #import <XCTest/XCTest.h>
 
 #import "MaterialButtonBar.h"
-#import "MaterialInk.h"
 #import "MaterialNavigationBar.h"
-#import "MaterialRipple.h"
 
 @interface MDCNavigationBar (Testing)
 - (MDCButtonBar *)leadingButtonBar;
diff --git a/components/NavigationBar/tests/unit/NavigationBarTests.m b/components/NavigationBar/tests/unit/NavigationBarTests.m
index db637f1f393..656c14e1de6 100644
--- a/components/NavigationBar/tests/unit/NavigationBarTests.m
+++ b/components/NavigationBar/tests/unit/NavigationBarTests.m
@@ -15,8 +15,9 @@
 #import <XCTest/XCTest.h>
 
 #import "MaterialButtonBar.h"
-#import "MaterialNavigationBar+TypographyThemer.h"
 #import "MaterialNavigationBar.h"
+#import "MaterialNavigationBar+TypographyThemer.h"
+#import "MaterialTypographyScheme.h"
 
 static const CGFloat kEpsilonAccuracy = (CGFloat)0.001;
 
diff --git a/components/NavigationDrawer/tests/unit/MDCNavigationDrawerScrollViewTests.m b/components/NavigationDrawer/tests/unit/MDCNavigationDrawerScrollViewTests.m
index e61b8753406..425e38d5002 100644
--- a/components/NavigationDrawer/tests/unit/MDCNavigationDrawerScrollViewTests.m
+++ b/components/NavigationDrawer/tests/unit/MDCNavigationDrawerScrollViewTests.m
@@ -17,6 +17,9 @@
 #import "../../src/private/MDCBottomDrawerContainerViewController.h"
 #import "../../src/private/MDCBottomDrawerHeaderMask.h"
 #import "../../src/private/MDCBottomDrawerShadowedView.h"
+#import "MDCBottomDrawerState.h"
+#import "MaterialNavigationDrawer.h"
+#import "MDCBottomDrawerContainerViewControllerDelegate.h"
 #import "MDCNavigationDrawerFakes.h"
 #import "MaterialShadowLayer.h"
 
diff --git a/components/NavigationDrawer/tests/unit/MDCNavigationDrawerThemeTest.m b/components/NavigationDrawer/tests/unit/MDCNavigationDrawerThemeTest.m
index 676184746cd..f858c0c8073 100644
--- a/components/NavigationDrawer/tests/unit/MDCNavigationDrawerThemeTest.m
+++ b/components/NavigationDrawer/tests/unit/MDCNavigationDrawerThemeTest.m
@@ -14,9 +14,10 @@
 
 #import <XCTest/XCTest.h>
 
-#import "MDCNavigationDrawerFakes.h"
 #import "MaterialNavigationDrawer+ColorThemer.h"
 #import "MaterialNavigationDrawer.h"
+#import "MDCNavigationDrawerFakes.h"
+#import "MaterialColorScheme.h"
 
 static const CGFloat kScimAlpha = (CGFloat)0.32;
 
diff --git a/components/Ripple/tests/unit/MDCRippleLayerTests.m b/components/Ripple/tests/unit/MDCRippleLayerTests.m
index 449ccaf6170..49b5ec1e00d 100644
--- a/components/Ripple/tests/unit/MDCRippleLayerTests.m
+++ b/components/Ripple/tests/unit/MDCRippleLayerTests.m
@@ -15,6 +15,7 @@
 #import <XCTest/XCTest.h>
 
 #import "../../src/private/MDCRippleLayer.h"
+#import "MDCRippleLayerDelegate.h"
 
 #pragma mark - Fake classes
 
diff --git a/components/ShadowElevations/examples/ShadowElevationsPointsLabel.m b/components/ShadowElevations/examples/ShadowElevationsPointsLabel.m
index 6b0f15177ec..015ee720132 100644
--- a/components/ShadowElevations/examples/ShadowElevationsPointsLabel.m
+++ b/components/ShadowElevations/examples/ShadowElevationsPointsLabel.m
@@ -14,6 +14,7 @@
 
 #import "ShadowElevationsPointsLabel.h"
 
+#import "MaterialShadowElevations.h"
 #import "MaterialShadowLayer.h"
 
 @implementation ShadowElevationsPointsLabel
diff --git a/components/ShadowElevations/examples/ShadowElevationsTypicalUseExample.m b/components/ShadowElevations/examples/ShadowElevationsTypicalUseExample.m
index 9e9d4ffc3ca..fe0b4338529 100644
--- a/components/ShadowElevations/examples/ShadowElevationsTypicalUseExample.m
+++ b/components/ShadowElevations/examples/ShadowElevationsTypicalUseExample.m
@@ -18,7 +18,6 @@
 
 #import "MaterialMath.h"
 #import "MaterialShadowElevations.h"
-#import "MaterialShadowLayer.h"
 #import "MaterialSlider.h"
 
 static NSString *const kDefaultShadowElevationLabelString = @"";
diff --git a/components/ShadowLayer/examples/ShadowCornerRadiusExample.m b/components/ShadowLayer/examples/ShadowCornerRadiusExample.m
index 10831514ac3..47d5d79de6e 100644
--- a/components/ShadowLayer/examples/ShadowCornerRadiusExample.m
+++ b/components/ShadowLayer/examples/ShadowCornerRadiusExample.m
@@ -14,7 +14,6 @@
 
 #import <UIKit/UIKit.h>
 
-#import "MaterialShadowLayer.h"
 #import "MaterialSlider.h"
 #import "ShadowRadiusLabel.h"
 
diff --git a/components/ShadowLayer/examples/ShadowRadiusLabel.m b/components/ShadowLayer/examples/ShadowRadiusLabel.m
index 12f3b3b1776..29b3e83c633 100644
--- a/components/ShadowLayer/examples/ShadowRadiusLabel.m
+++ b/components/ShadowLayer/examples/ShadowRadiusLabel.m
@@ -14,6 +14,7 @@
 
 #import "ShadowRadiusLabel.h"
 
+#import "MaterialShadowElevations.h"
 #import "MaterialShadowLayer.h"
 
 @implementation ShadowRadiusLabel
diff --git a/components/Slider/examples/SliderAutolayoutExampleViewController.m b/components/Slider/examples/SliderAutolayoutExampleViewController.m
index 900b0ea9977..4a13b038718 100644
--- a/components/Slider/examples/SliderAutolayoutExampleViewController.m
+++ b/components/Slider/examples/SliderAutolayoutExampleViewController.m
@@ -16,6 +16,8 @@
 
 #import "MaterialSlider+ColorThemer.h"
 #import "MaterialSlider.h"
+#import "MaterialColorScheme.h"
+#import "MaterialTypographyScheme.h"
 
 @interface SliderAutolayoutExampleViewController ()
 @property(weak, nonatomic) IBOutlet UISlider *vanillaSlider;
diff --git a/components/Slider/examples/SliderCollectionViewController.m b/components/Slider/examples/SliderCollectionViewController.m
index b42f6c4e921..ac2a97040b7 100644
--- a/components/Slider/examples/SliderCollectionViewController.m
+++ b/components/Slider/examples/SliderCollectionViewController.m
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "MaterialCollections.h"
 #import "MaterialColorScheme.h"
 #import "MaterialPalettes.h"
 #import "MaterialSlider+ColorThemer.h"
diff --git a/components/Snackbar/src/MDCSnackbarManager.m b/components/Snackbar/src/MDCSnackbarManager.m
index 3f8fccca1e5..949d176d489 100644
--- a/components/Snackbar/src/MDCSnackbarManager.m
+++ b/components/Snackbar/src/MDCSnackbarManager.m
@@ -14,7 +14,9 @@
 
 #import "MDCSnackbarManager.h"
 
+#import "MaterialButtons.h"
 #import "MaterialOverlayWindow.h"
+#import "MaterialShadowElevations.h"
 #import "MDCSnackbarManagerDelegate.h"
 #import "MDCSnackbarMessage.h"
 #import "MDCSnackbarMessageView.h"
diff --git a/components/Snackbar/src/MDCSnackbarMessageView.m b/components/Snackbar/src/MDCSnackbarMessageView.m
index 52bfe95c4c1..1708987fdb7 100644
--- a/components/Snackbar/src/MDCSnackbarMessageView.m
+++ b/components/Snackbar/src/MDCSnackbarMessageView.m
@@ -14,6 +14,9 @@
 
 #import <QuartzCore/QuartzCore.h>
 
+#import "MaterialButtons.h"
+#import "MaterialElevation.h"
+#import "MaterialShadowElevations.h"
 #import "MDCSnackbarManager.h"
 #import "MDCSnackbarMessage.h"
 #import "MDCSnackbarMessageView.h"
diff --git a/components/Snackbar/tests/unit/MDCSnackbarRippleTests.m b/components/Snackbar/tests/unit/MDCSnackbarRippleTests.m
index de2c26ac682..1b2007b789e 100644
--- a/components/Snackbar/tests/unit/MDCSnackbarRippleTests.m
+++ b/components/Snackbar/tests/unit/MDCSnackbarRippleTests.m
@@ -14,6 +14,8 @@
 
 #import <XCTest/XCTest.h>
 
+#import "MaterialButtons.h"
+#import "MaterialInk.h"
 #import "MaterialSnackbar.h"
 
 #import "../../src/private/MDCSnackbarManagerInternal.h"
diff --git a/components/Snackbar/tests/unit/SnackbarManagerTests.m b/components/Snackbar/tests/unit/SnackbarManagerTests.m
index c2d399e4aef..cb449671af7 100644
--- a/components/Snackbar/tests/unit/SnackbarManagerTests.m
+++ b/components/Snackbar/tests/unit/SnackbarManagerTests.m
@@ -14,6 +14,7 @@
 
 #import <XCTest/XCTest.h>
 #import "../../src/private/MDCSnackbarManagerInternal.h"
+#import "MaterialShadowElevations.h"
 #import "MaterialSnackbar.h"
 
 @interface MDCSnackbarManagerInternal (SnackbarManagerTesting)
diff --git a/components/Tabs/src/MDCTabBar.m b/components/Tabs/src/MDCTabBar.m
index 7487e5cbea4..f3a85811baa 100644
--- a/components/Tabs/src/MDCTabBar.m
+++ b/components/Tabs/src/MDCTabBar.m
@@ -14,6 +14,10 @@
 
 #import "MDCTabBar.h"
 
+#import "MDCTabBarAlignment.h"
+#import "MDCTabBarItemAppearance.h"
+#import "MDCTabBarTextTransform.h"
+#import "MDCItemBarDelegate.h"
 #import <MDFInternationalization/MDFInternationalization.h>
 
 #import "private/MDCItemBar.h"
@@ -23,8 +27,6 @@
 #import "MaterialRipple.h"
 #import "MDCTabBarExtendedAlignment.h"
 #import "MDCTabBarDelegate.h"
-#import "MDCTabBarDisplayDelegate.h"
-#import "MDCTabBarIndicatorTemplate.h"
 #import "MDCTabBarUnderlineIndicatorTemplate.h"
 #import "MDCTabBarSizeClassDelegate.h"
 #import "MaterialTypography.h"
@@ -85,11 +87,11 @@ static MDCItemBarAlignment MDCItemBarAlignmentForTabBarAlignment(
   return [UIColor colorWithWhite:1 alpha:(CGFloat)0.7];
 }
 
-@interface MDCTabBar ()
-@property(nonatomic, weak, nullable) id<MDCTabBarSizeClassDelegate> sizeClassDelegate;
-@end
+@protocol MDCTabBarSizeClassDelegate;
+@protocol MDCTabBarDisplayDelegate;
 
 @interface MDCTabBar ()
+@property(nonatomic, weak, nullable) id<MDCTabBarSizeClassDelegate> sizeClassDelegate;
 @property(nonatomic, weak, nullable) id<MDCTabBarDisplayDelegate> displayDelegate;
 @end
 
diff --git a/components/Tabs/src/MDCTabBarViewController.m b/components/Tabs/src/MDCTabBarViewController.m
index d5f218b1877..b191cf5c7e0 100644
--- a/components/Tabs/src/MDCTabBarViewController.m
+++ b/components/Tabs/src/MDCTabBarViewController.m
@@ -16,7 +16,10 @@
 
 #import "MaterialShadowElevations.h"
 #import "MaterialShadowLayer.h"
+#import "MDCTabBar.h"
+#import "MDCTabBarAlignment.h"
 #import "MDCTabBarControllerDelegate.h"
+#import "MDCTabBarItemAppearance.h"
 
 const CGFloat MDCTabBarViewControllerAnimationDuration = (CGFloat)0.3;
 
diff --git a/components/Tabs/src/TabBarView/private/MDCTabBarViewItemView.m b/components/Tabs/src/TabBarView/private/MDCTabBarViewItemView.m
index 5cbf1880fd1..a39e46d27df 100644
--- a/components/Tabs/src/TabBarView/private/MDCTabBarViewItemView.m
+++ b/components/Tabs/src/TabBarView/private/MDCTabBarViewItemView.m
@@ -16,6 +16,7 @@
 
 #import <CoreGraphics/CoreGraphics.h>
 
+#import "MaterialRipple.h"
 #import "MDCTabBarViewItemViewDelegate.h"
 #import "MaterialMath.h"
 
diff --git a/components/Tabs/src/TabBarView/private/MDCTabBarViewPrivateIndicatorContext.m b/components/Tabs/src/TabBarView/private/MDCTabBarViewPrivateIndicatorContext.m
index 21a9563cd20..e8ce5cff508 100644
--- a/components/Tabs/src/TabBarView/private/MDCTabBarViewPrivateIndicatorContext.m
+++ b/components/Tabs/src/TabBarView/private/MDCTabBarViewPrivateIndicatorContext.m
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "MDCTabBarViewIndicatorContext.h"
 
 #import "MDCTabBarViewPrivateIndicatorContext.h"
 
diff --git a/components/Tabs/tests/snapshot/MDCTabBarDynamicColorSnapshotTests.m b/components/Tabs/tests/snapshot/MDCTabBarDynamicColorSnapshotTests.m
index dd4d26b801a..66d3b23e012 100644
--- a/components/Tabs/tests/snapshot/MDCTabBarDynamicColorSnapshotTests.m
+++ b/components/Tabs/tests/snapshot/MDCTabBarDynamicColorSnapshotTests.m
@@ -15,8 +15,10 @@
 #import "MaterialSnapshot.h"
 
 #import "MaterialAvailability.h"
-#import "MaterialTabs+Theming.h"
 #import "MaterialTabs.h"
+#import "MaterialTabs+Theming.h"
+#import "MaterialColorScheme.h"
+#import "MaterialContainerScheme.h"
 
 /**
  An MDCTabBar subclass that allows the user to override the @c traitCollection property.
diff --git a/components/Tabs/tests/snapshot/MDCTabBarExtendedAlignmentSnapshotTests.m b/components/Tabs/tests/snapshot/MDCTabBarExtendedAlignmentSnapshotTests.m
index f45b676ea24..3806b5d5da7 100644
--- a/components/Tabs/tests/snapshot/MDCTabBarExtendedAlignmentSnapshotTests.m
+++ b/components/Tabs/tests/snapshot/MDCTabBarExtendedAlignmentSnapshotTests.m
@@ -17,6 +17,7 @@
 #import "MDCTabBarExtendedAlignment.h"
 #import "MaterialTabs.h"
 #import "MaterialTabs+Theming.h"
+#import "MaterialContainerScheme.h"
 
 static NSString *const kItemTitleShort1Latin = @"Quando";
 static NSString *const kItemTitleShort2Latin = @"No";