diff --git a/WordPress/Classes/Apps/Reader/ReaderTabViewController.swift b/WordPress/Classes/Apps/Reader/ReaderTabViewController.swift
index 5b5f82fdb0a0..8760366e3f4f 100644
--- a/WordPress/Classes/Apps/Reader/ReaderTabViewController.swift
+++ b/WordPress/Classes/Apps/Reader/ReaderTabViewController.swift
@@ -1,6 +1,7 @@
 import Combine
 import UIKit
 import SwiftUI
+import WordPressData
 import WordPressUI
 
 final class ReaderTabViewController: UITabBarController, UITabBarControllerDelegate {
diff --git a/WordPress/Classes/Models/Gutenberg/BlockEditorSettings+GutenbergEditorSettings.swift b/WordPress/Classes/Models/Gutenberg/BlockEditorSettings+GutenbergEditorSettings.swift
index 7fe887249453..8faa5fdce6fa 100644
--- a/WordPress/Classes/Models/Gutenberg/BlockEditorSettings+GutenbergEditorSettings.swift
+++ b/WordPress/Classes/Models/Gutenberg/BlockEditorSettings+GutenbergEditorSettings.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 import WordPressKit
 import Gutenberg
 
diff --git a/WordPress/Classes/Services/ReaderTopicService+Interests.swift b/WordPress/Classes/Services/ReaderTopicService+Interests.swift
index 4a225af12553..6856c868a58c 100644
--- a/WordPress/Classes/Services/ReaderTopicService+Interests.swift
+++ b/WordPress/Classes/Services/ReaderTopicService+Interests.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 import WordPressKit
 import WordPressShared
 
diff --git a/WordPress/Classes/System/Root View/RootViewPresenter.swift b/WordPress/Classes/System/Root View/RootViewPresenter.swift
index ffa75b9fae37..8d8e8cb0c7ed 100644
--- a/WordPress/Classes/System/Root View/RootViewPresenter.swift	
+++ b/WordPress/Classes/System/Root View/RootViewPresenter.swift	
@@ -1,5 +1,6 @@
 import Foundation
 import WordPressData
+import WordPressKit
 import WordPressShared
 
 protocol RootViewPresenter: AnyObject {
diff --git a/WordPress/Classes/Utility/Notifications/PushAuthenticationManager.swift b/WordPress/Classes/Utility/Notifications/PushAuthenticationManager.swift
index 468ca56c4f0a..4a7aa5fa249f 100644
--- a/WordPress/Classes/Utility/Notifications/PushAuthenticationManager.swift
+++ b/WordPress/Classes/Utility/Notifications/PushAuthenticationManager.swift
@@ -1,4 +1,5 @@
 import UIKit
+import WordPressData
 import WordPressShared
 
 /// The purpose of this class is to handle WordPress.com Push Authentication Notifications.
diff --git a/WordPress/Classes/Utility/Notifications/PushNotificationsManager.swift b/WordPress/Classes/Utility/Notifications/PushNotificationsManager.swift
index f62c44eb4061..d08c0668cbc6 100644
--- a/WordPress/Classes/Utility/Notifications/PushNotificationsManager.swift
+++ b/WordPress/Classes/Utility/Notifications/PushNotificationsManager.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 import WordPressShared
 import NSObject_SafeExpectations
 import UserNotifications
diff --git a/WordPress/Classes/Utility/Universal Links/Routes+Reader.swift b/WordPress/Classes/Utility/Universal Links/Routes+Reader.swift
index 2214e0f8e142..d5926a35b147 100644
--- a/WordPress/Classes/Utility/Universal Links/Routes+Reader.swift	
+++ b/WordPress/Classes/Utility/Universal Links/Routes+Reader.swift	
@@ -1,4 +1,5 @@
 import UIKit
+import WordPressData
 
 enum ReaderRoute {
     case root
diff --git a/WordPress/Classes/Utility/Universal Links/Routes+Stats.swift b/WordPress/Classes/Utility/Universal Links/Routes+Stats.swift
index d3014c35af1d..3ecce380e362 100644
--- a/WordPress/Classes/Utility/Universal Links/Routes+Stats.swift	
+++ b/WordPress/Classes/Utility/Universal Links/Routes+Stats.swift	
@@ -1,4 +1,5 @@
 import UIKit
+import WordPressKit
 
 enum StatsRoute {
     case root
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+Swift.swift b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+Swift.swift
index 9c9d6a9c58ae..495a7a0f489f 100644
--- a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+Swift.swift	
+++ b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+Swift.swift	
@@ -1,4 +1,6 @@
 import Foundation
+import UIKit
+import WordPressData
 import WordPressShared
 import WordPressAPI
 import WordPressCore
diff --git a/WordPress/Classes/ViewRelated/Blog/Site Management/SiteSettingsViewController+SiteManagement.swift b/WordPress/Classes/ViewRelated/Blog/Site Management/SiteSettingsViewController+SiteManagement.swift
index 0732b518ca7e..f53d8969c46b 100644
--- a/WordPress/Classes/ViewRelated/Blog/Site Management/SiteSettingsViewController+SiteManagement.swift	
+++ b/WordPress/Classes/ViewRelated/Blog/Site Management/SiteSettingsViewController+SiteManagement.swift	
@@ -1,5 +1,6 @@
 import UIKit
 import SVProgressHUD
+import WordPressData
 import WordPressShared
 
 /// Implements site management services triggered from SiteSettingsViewController
diff --git a/WordPress/Classes/ViewRelated/Me/Account Settings/AccountSettingsViewController.swift b/WordPress/Classes/ViewRelated/Me/Account Settings/AccountSettingsViewController.swift
index 162d11d8a2f8..7ed5f0058960 100644
--- a/WordPress/Classes/ViewRelated/Me/Account Settings/AccountSettingsViewController.swift	
+++ b/WordPress/Classes/ViewRelated/Me/Account Settings/AccountSettingsViewController.swift	
@@ -1,6 +1,7 @@
 import UIKit
 import SwiftUI
 import SVProgressHUD
+import WordPressData
 import WordPressShared
 import WordPressFlux
 import WordPressUI
diff --git a/WordPress/Classes/ViewRelated/Me/Domain Details/DomainDetailsWebViewController.swift b/WordPress/Classes/ViewRelated/Me/Domain Details/DomainDetailsWebViewController.swift
index 6bcd8c459c49..c9b7bb1bf56e 100644
--- a/WordPress/Classes/ViewRelated/Me/Domain Details/DomainDetailsWebViewController.swift	
+++ b/WordPress/Classes/ViewRelated/Me/Domain Details/DomainDetailsWebViewController.swift	
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 import WordPressShared
 
 final class DomainDetailsWebViewController: WebKitViewController {
diff --git a/WordPress/Classes/ViewRelated/Plugins/ViewModels/PluginViewModel.swift b/WordPress/Classes/ViewRelated/Plugins/ViewModels/PluginViewModel.swift
index 6aaeab7b48de..3a4e521670bb 100644
--- a/WordPress/Classes/ViewRelated/Plugins/ViewModels/PluginViewModel.swift
+++ b/WordPress/Classes/ViewRelated/Plugins/ViewModels/PluginViewModel.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 import WordPressFlux
 import WordPressKit
 import WordPressUI
diff --git a/WordPress/Classes/ViewRelated/Post/Views/AuthorFilterViewController.swift b/WordPress/Classes/ViewRelated/Post/Views/AuthorFilterViewController.swift
index 3597b83a5a40..f8f36503184f 100644
--- a/WordPress/Classes/ViewRelated/Post/Views/AuthorFilterViewController.swift
+++ b/WordPress/Classes/ViewRelated/Post/Views/AuthorFilterViewController.swift
@@ -1,5 +1,6 @@
 import UIKit
 import Gridicons
+import WordPressData
 import WordPressUI
 
 /// Displays a simple table view picker list to choose between author filters
diff --git a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderLikeAction.swift b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderLikeAction.swift
index 85c13a87e9a3..e17665a9e023 100644
--- a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderLikeAction.swift
+++ b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderLikeAction.swift
@@ -1,4 +1,5 @@
 import UIKit
+import WordPressData
 
 /// Encapsulates a command to toggle a post's liked status
 final class ReaderLikeAction {
diff --git a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderPostMenu.swift b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderPostMenu.swift
index 2bc587bfd0ba..c06a7f0314b5 100644
--- a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderPostMenu.swift
+++ b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderPostMenu.swift
@@ -1,6 +1,7 @@
 import Foundation
 import UIKit
 import SafariServices
+import WordPressData
 import WordPressShared
 
 struct ReaderPostMenu {
diff --git a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderStreamViewController+Sharing.swift b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderStreamViewController+Sharing.swift
index 8c1f05d9aa98..b229be42f4c0 100644
--- a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderStreamViewController+Sharing.swift
+++ b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderStreamViewController+Sharing.swift
@@ -2,6 +2,7 @@ import UIKit
 import MobileCoreServices
 import UniformTypeIdentifiers
 import ShareExtensionCore
+import WordPressData
 
 // MARK: - Functionality related to sharing a blog via the reader.
 
diff --git a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderBlockingHelper.swift b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderBlockingHelper.swift
index d764bc25abb4..de612a550af4 100644
--- a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderBlockingHelper.swift
+++ b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderBlockingHelper.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 
 struct ReaderBlockingHelper {
     func blockSite(forPost post: ReaderPost, context: NSManagedObjectContext = ContextManager.shared.mainContext) {
diff --git a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionCell.swift b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionCell.swift
index d62580c704ab..90460ea33417 100644
--- a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionCell.swift
+++ b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionCell.swift
@@ -1,4 +1,5 @@
 import SwiftUI
+import WordPressData
 import WordPressUI
 
 struct ReaderSubscriptionCell: View {
diff --git a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionNotificationSettingsButton.swift b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionNotificationSettingsButton.swift
index 4da2cad4ddf2..d917a7954169 100644
--- a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionNotificationSettingsButton.swift
+++ b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionNotificationSettingsButton.swift
@@ -1,4 +1,5 @@
 import SwiftUI
+import WordPressData
 import WordPressUI
 
 struct ReaderSubscriptionNotificationSettingsButton: View {
diff --git a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionsView.swift b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionsView.swift
index b7ef7a12b920..ed9f81532b39 100644
--- a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionsView.swift
+++ b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionsView.swift
@@ -1,4 +1,5 @@
 import SwiftUI
+import WordPressData
 import WordPressUI
 import WordPressShared
 
diff --git a/WordPress/Classes/ViewRelated/Stats/Extensions/StatsViewController+JetpackSettings.swift b/WordPress/Classes/ViewRelated/Stats/Extensions/StatsViewController+JetpackSettings.swift
index 16fd3e41d520..426323a815fb 100644
--- a/WordPress/Classes/ViewRelated/Stats/Extensions/StatsViewController+JetpackSettings.swift
+++ b/WordPress/Classes/ViewRelated/Stats/Extensions/StatsViewController+JetpackSettings.swift
@@ -1,5 +1,6 @@
 import Foundation
 import UIKit
+import WordPressData
 
 extension StatsViewController {
 
diff --git a/WordPress/Classes/ViewRelated/Stats/Helpers/SiteStatsImmuTableRows.swift b/WordPress/Classes/ViewRelated/Stats/Helpers/SiteStatsImmuTableRows.swift
index e8ec29370fea..399b36a77b9f 100644
--- a/WordPress/Classes/ViewRelated/Stats/Helpers/SiteStatsImmuTableRows.swift
+++ b/WordPress/Classes/ViewRelated/Stats/Helpers/SiteStatsImmuTableRows.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKit
 
 /// Helper class to encapsulate ImmuTableRows creation
 /// Stats Revamp results in the same ImmuTableRows created in different screens
diff --git a/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityCell.swift b/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityCell.swift
index 1570fb5f0d9a..474b3a22276e 100644
--- a/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityCell.swift	
+++ b/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityCell.swift	
@@ -1,4 +1,5 @@
 import UIKit
+import WordPressKit
 import WordPressShared
 
 class PostingActivityCell: StatsBaseCell, NibLoadable, Accessible {
diff --git a/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityCollectionViewCell.swift b/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityCollectionViewCell.swift
index b56c5b0b9d17..2552189863e3 100644
--- a/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityCollectionViewCell.swift	
+++ b/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityCollectionViewCell.swift	
@@ -1,4 +1,5 @@
 import UIKit
+import WordPressKit
 
 class PostingActivityCollectionViewCell: UICollectionViewCell {
 
diff --git a/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityDay.swift b/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityDay.swift
index 37f5cafebc3e..04e23e175753 100644
--- a/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityDay.swift	
+++ b/WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityDay.swift	
@@ -1,4 +1,5 @@
 import UIKit
+import WordPressKit
 import WordPressShared
 
 protocol PostingActivityDayDelegate: AnyObject {
diff --git a/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsTableViewController.swift b/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsTableViewController.swift
index 4a589f9f8d32..3aa614113462 100644
--- a/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsTableViewController.swift
+++ b/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsTableViewController.swift
@@ -1,5 +1,6 @@
 import UIKit
 import WordPressData
+import WordPressKit
 import WordPressFlux
 import WordPressUI
 
diff --git a/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsViewModel.swift b/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsViewModel.swift
index b91e084d95d5..45c99a290d38 100644
--- a/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsViewModel.swift
+++ b/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsViewModel.swift
@@ -1,4 +1,6 @@
 import Foundation
+import WordPressData
+import WordPressKit
 import WordPressFlux
 import WordPressShared
 
diff --git a/WordPress/Classes/ViewRelated/Stats/Insights/ViewsVisitors/ViewsVisitorsLineChartCell.swift b/WordPress/Classes/ViewRelated/Stats/Insights/ViewsVisitors/ViewsVisitorsLineChartCell.swift
index e702e0056176..de2a1f60cc30 100644
--- a/WordPress/Classes/ViewRelated/Stats/Insights/ViewsVisitors/ViewsVisitorsLineChartCell.swift
+++ b/WordPress/Classes/ViewRelated/Stats/Insights/ViewsVisitors/ViewsVisitorsLineChartCell.swift
@@ -1,5 +1,6 @@
 import UIKit
 import WordPressData
+import WordPressKit
 import WordPressShared
 
 struct StatsSegmentedControlData: Equatable {
diff --git a/WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodTableViewController.swift b/WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodTableViewController.swift
index 5e8217207dc9..28a71625671b 100644
--- a/WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodTableViewController.swift	
+++ b/WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodTableViewController.swift	
@@ -1,6 +1,7 @@
 import UIKit
 import WordPressData
 import WordPressFlux
+import WordPressKit
 import WordPressUI
 import Combine
 
diff --git a/WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodViewModel.swift b/WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodViewModel.swift
index 1559b7eaa12f..417285275587 100644
--- a/WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodViewModel.swift	
+++ b/WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodViewModel.swift	
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKit
 import WordPressFlux
 import WordPressShared
 
diff --git a/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsDetailTableViewController.swift b/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsDetailTableViewController.swift
index e58406874185..c40cbe4f8370 100644
--- a/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsDetailTableViewController.swift	
+++ b/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsDetailTableViewController.swift	
@@ -1,6 +1,7 @@
 import UIKit
 import WordPressData
 import WordPressFlux
+import WordPressKit
 import WordPressUI
 
 @objc protocol SiteStatsDetailsDelegate {
diff --git a/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsTableViewController.swift b/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsTableViewController.swift
index 77d9ee04e353..2eba1e46ef87 100644
--- a/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsTableViewController.swift	
+++ b/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsTableViewController.swift	
@@ -1,5 +1,6 @@
 import UIKit
 import WordPressData
+import WordPressKit
 import WordPressFlux
 import WordPressUI
 
diff --git a/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsViewModel.swift b/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsViewModel.swift
index 238115624727..4c634961e297 100644
--- a/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsViewModel.swift	
+++ b/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsViewModel.swift	
@@ -1,6 +1,7 @@
 import Foundation
 import UIKit
 import WordPressFlux
+import WordPressKit
 import WordPressShared
 
 /// The view model used by SiteStatsDetailTableViewController to show
diff --git a/WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift b/WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift
index a709208c5ccb..f53b326f6673 100644
--- a/WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift
+++ b/WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift
@@ -1,4 +1,5 @@
 import UIKit
+import WordPressKit
 import WordPressShared
 
 enum StatsTabType: Int, FilterTabBarItem, CaseIterable {
diff --git a/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m b/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m
index b0466f8f672f..b76f2701cda7 100644
--- a/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m
+++ b/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m
@@ -5,6 +5,9 @@
 #else
 #import "WordPress-Swift.h"
 #endif
+// For some reason, the modular import does not work.
+// @import WordPressData;
+#import <WordPressData/WordPressData.h>
 
 CGFloat const STVDefaultMinHeaderHeight = 0.f;
 NSString * const CellIdentifier = @"SuggestionsTableViewCell";
diff --git a/WordPress/Classes/ViewRelated/Support/SupportTableViewControllerConfiguration.swift b/WordPress/Classes/ViewRelated/Support/SupportTableViewControllerConfiguration.swift
index 3d00937a9168..992466e03810 100644
--- a/WordPress/Classes/ViewRelated/Support/SupportTableViewControllerConfiguration.swift
+++ b/WordPress/Classes/ViewRelated/Support/SupportTableViewControllerConfiguration.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 
 struct SupportTableViewControllerConfiguration {
 
diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController.m b/WordPress/Classes/ViewRelated/System/WPTabBarController.m
index 23ef96ccc8c4..4641ca093cb8 100644
--- a/WordPress/Classes/ViewRelated/System/WPTabBarController.m
+++ b/WordPress/Classes/ViewRelated/System/WPTabBarController.m
@@ -10,6 +10,9 @@
 #else
 #import "WordPress-Swift.h"
 #endif
+// For some reason, the modular import does not work.
+// @import WordPressData;
+#import <WordPressData/WordPressData.h>
 
 @import Gridicons;
 @import WordPressData;