summaryrefslogtreecommitdiff
path: root/SmartDeviceLink
diff options
context:
space:
mode:
authorMuller, Alexander (A.) <amulle19@ford.com>2017-01-17 16:17:50 -0800
committerMuller, Alexander (A.) <amulle19@ford.com>2017-01-17 16:17:50 -0800
commit436cb0793b6f7dbbd5f59c507c18b7ef71aef35f (patch)
treee85536c884f0d434101e44be92f605bd58c04da1 /SmartDeviceLink
parent90cdd57989acca6d1c3f929396938faf11313521 (diff)
downloadsdl_ios-436cb0793b6f7dbbd5f59c507c18b7ef71aef35f.tar.gz
Moved the import from SDLRPCStruct to implementation of all classes to remove build warning of redefinition
Diffstat (limited to 'SmartDeviceLink')
-rw-r--r--SmartDeviceLink/SDLAddCommand.m1
-rw-r--r--SmartDeviceLink/SDLAddCommandResponse.m1
-rw-r--r--SmartDeviceLink/SDLAddSubMenu.m1
-rw-r--r--SmartDeviceLink/SDLAddSubMenuResponse.m1
-rw-r--r--SmartDeviceLink/SDLAirbagStatus.m1
-rw-r--r--SmartDeviceLink/SDLAlert.m1
-rw-r--r--SmartDeviceLink/SDLAlertManeuver.m1
-rw-r--r--SmartDeviceLink/SDLAlertManeuverResponse.m1
-rw-r--r--SmartDeviceLink/SDLAlertResponse.m1
-rw-r--r--SmartDeviceLink/SDLAppInfo.m1
-rw-r--r--SmartDeviceLink/SDLAudioPassThruCapabilities.m1
-rw-r--r--SmartDeviceLink/SDLBeltStatus.m1
-rw-r--r--SmartDeviceLink/SDLBodyInformation.m1
-rw-r--r--SmartDeviceLink/SDLButtonCapabilities.m1
-rw-r--r--SmartDeviceLink/SDLChangeRegistration.m1
-rw-r--r--SmartDeviceLink/SDLChangeRegistrationResponse.m1
-rw-r--r--SmartDeviceLink/SDLChoice.m1
-rw-r--r--SmartDeviceLink/SDLClusterModeStatus.m1
-rw-r--r--SmartDeviceLink/SDLCreateInteractionChoiceSet.m1
-rw-r--r--SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m1
-rw-r--r--SmartDeviceLink/SDLDIDResult.m1
-rw-r--r--SmartDeviceLink/SDLDateTime.m2
-rw-r--r--SmartDeviceLink/SDLDeleteCommand.m1
-rw-r--r--SmartDeviceLink/SDLDeleteCommandResponse.m1
-rw-r--r--SmartDeviceLink/SDLDeleteFile.m1
-rw-r--r--SmartDeviceLink/SDLDeleteFileResponse.m1
-rw-r--r--SmartDeviceLink/SDLDeleteInteractionChoiceSet.m1
-rw-r--r--SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m1
-rw-r--r--SmartDeviceLink/SDLDeleteSubMenu.m1
-rw-r--r--SmartDeviceLink/SDLDeleteSubMenuResponse.m1
-rw-r--r--SmartDeviceLink/SDLDeviceInfo.m1
-rw-r--r--SmartDeviceLink/SDLDeviceStatus.m1
-rw-r--r--SmartDeviceLink/SDLDiagnosticMessage.m1
-rw-r--r--SmartDeviceLink/SDLDiagnosticMessageResponse.m1
-rw-r--r--SmartDeviceLink/SDLDialNumber.m1
-rw-r--r--SmartDeviceLink/SDLDialNumberResponse.m1
-rw-r--r--SmartDeviceLink/SDLDisplayCapabilities.m1
-rw-r--r--SmartDeviceLink/SDLECallInfo.m1
-rw-r--r--SmartDeviceLink/SDLEmergencyEvent.m1
-rw-r--r--SmartDeviceLink/SDLEncodedSyncPData.m1
-rw-r--r--SmartDeviceLink/SDLEncodedSyncPDataResponse.m1
-rw-r--r--SmartDeviceLink/SDLEndAudioPassThru.m1
-rw-r--r--SmartDeviceLink/SDLEndAudioPassThruResponse.m1
-rw-r--r--SmartDeviceLink/SDLFunctionID.h1
-rw-r--r--SmartDeviceLink/SDLGPSData.m1
-rw-r--r--SmartDeviceLink/SDLGenericResponse.m1
-rw-r--r--SmartDeviceLink/SDLGetDTCs.m1
-rw-r--r--SmartDeviceLink/SDLGetDTCsResponse.m1
-rw-r--r--SmartDeviceLink/SDLGetVehicleData.m1
-rw-r--r--SmartDeviceLink/SDLGetVehicleDataResponse.m1
-rw-r--r--SmartDeviceLink/SDLGetWaypoints.m1
-rw-r--r--SmartDeviceLink/SDLGetWaypointsResponse.m1
-rw-r--r--SmartDeviceLink/SDLHMICapabilities.m1
-rw-r--r--SmartDeviceLink/SDLHMIPermissions.m1
-rw-r--r--SmartDeviceLink/SDLHeadLampStatus.m1
-rw-r--r--SmartDeviceLink/SDLImage.m1
-rw-r--r--SmartDeviceLink/SDLImageField.m1
-rw-r--r--SmartDeviceLink/SDLImageResolution.m1
-rw-r--r--SmartDeviceLink/SDLKeyboardProperties.m1
-rw-r--r--SmartDeviceLink/SDLListFiles.m1
-rw-r--r--SmartDeviceLink/SDLListFilesResponse.m1
-rw-r--r--SmartDeviceLink/SDLLocationCoordinate.m2
-rw-r--r--SmartDeviceLink/SDLLocationDetails.m1
-rw-r--r--SmartDeviceLink/SDLMenuParams.m1
-rw-r--r--SmartDeviceLink/SDLMyKey.m1
-rw-r--r--SmartDeviceLink/SDLNames.m1
-rw-r--r--SmartDeviceLink/SDLOasisAddress.m2
-rw-r--r--SmartDeviceLink/SDLOnAppInterfaceUnregistered.m1
-rw-r--r--SmartDeviceLink/SDLOnAudioPassThru.m1
-rw-r--r--SmartDeviceLink/SDLOnButtonEvent.m1
-rw-r--r--SmartDeviceLink/SDLOnButtonPress.m1
-rw-r--r--SmartDeviceLink/SDLOnCommand.m1
-rw-r--r--SmartDeviceLink/SDLOnDriverDistraction.m1
-rw-r--r--SmartDeviceLink/SDLOnEncodedSyncPData.m1
-rw-r--r--SmartDeviceLink/SDLOnHMIStatus.m1
-rw-r--r--SmartDeviceLink/SDLOnHashChange.m1
-rw-r--r--SmartDeviceLink/SDLOnKeyboardInput.m1
-rw-r--r--SmartDeviceLink/SDLOnLanguageChange.m1
-rw-r--r--SmartDeviceLink/SDLOnLockScreenStatus.m2
-rw-r--r--SmartDeviceLink/SDLOnPermissionsChange.m1
-rw-r--r--SmartDeviceLink/SDLOnSyncPData.m1
-rw-r--r--SmartDeviceLink/SDLOnSystemRequest.m1
-rw-r--r--SmartDeviceLink/SDLOnTBTClientState.m1
-rw-r--r--SmartDeviceLink/SDLOnTouchEvent.m1
-rw-r--r--SmartDeviceLink/SDLOnVehicleData.m1
-rw-r--r--SmartDeviceLink/SDLOnWaypointChange.m1
-rw-r--r--SmartDeviceLink/SDLParameterPermissions.m1
-rw-r--r--SmartDeviceLink/SDLPerformAudioPassThru.m1
-rw-r--r--SmartDeviceLink/SDLPerformAudioPassThruResponse.m1
-rw-r--r--SmartDeviceLink/SDLPerformInteraction.m1
-rw-r--r--SmartDeviceLink/SDLPerformInteractionResponse.m1
-rw-r--r--SmartDeviceLink/SDLPermissionItem.m1
-rw-r--r--SmartDeviceLink/SDLPresetBankCapabilities.m1
-rw-r--r--SmartDeviceLink/SDLProtocolMessage.m2
-rw-r--r--SmartDeviceLink/SDLPutFile.m1
-rw-r--r--SmartDeviceLink/SDLPutFileResponse.m1
-rw-r--r--SmartDeviceLink/SDLRPCMessage.m1
-rw-r--r--SmartDeviceLink/SDLRPCNotification.m1
-rw-r--r--SmartDeviceLink/SDLRPCRequest.m1
-rw-r--r--SmartDeviceLink/SDLRPCResponse.m1
-rw-r--r--SmartDeviceLink/SDLRPCStruct.h2
-rw-r--r--SmartDeviceLink/SDLReadDID.m1
-rw-r--r--SmartDeviceLink/SDLReadDIDResponse.m1
-rw-r--r--SmartDeviceLink/SDLRegisterAppInterface.m1
-rw-r--r--SmartDeviceLink/SDLRegisterAppInterfaceResponse.m1
-rw-r--r--SmartDeviceLink/SDLResetGlobalProperties.m1
-rw-r--r--SmartDeviceLink/SDLResetGlobalPropertiesResponse.m1
-rw-r--r--SmartDeviceLink/SDLScreenParams.m1
-rw-r--r--SmartDeviceLink/SDLScrollableMessage.m1
-rw-r--r--SmartDeviceLink/SDLScrollableMessageResponse.m1
-rw-r--r--SmartDeviceLink/SDLSendLocation.m1
-rw-r--r--SmartDeviceLink/SDLSendLocationResponse.m1
-rw-r--r--SmartDeviceLink/SDLSetAppIcon.m1
-rw-r--r--SmartDeviceLink/SDLSetAppIconResponse.m1
-rw-r--r--SmartDeviceLink/SDLSetDisplayLayout.m1
-rw-r--r--SmartDeviceLink/SDLSetDisplayLayoutResponse.m1
-rw-r--r--SmartDeviceLink/SDLSetGlobalProperties.m1
-rw-r--r--SmartDeviceLink/SDLSetGlobalPropertiesResponse.m1
-rw-r--r--SmartDeviceLink/SDLSetMediaClockTimer.m1
-rw-r--r--SmartDeviceLink/SDLSetMediaClockTimerResponse.m1
-rw-r--r--SmartDeviceLink/SDLShow.m1
-rw-r--r--SmartDeviceLink/SDLShowConstantTBT.m1
-rw-r--r--SmartDeviceLink/SDLShowConstantTBTResponse.m2
-rw-r--r--SmartDeviceLink/SDLShowResponse.m1
-rw-r--r--SmartDeviceLink/SDLSingleTireStatus.m1
-rw-r--r--SmartDeviceLink/SDLSlider.m1
-rw-r--r--SmartDeviceLink/SDLSliderResponse.m1
-rw-r--r--SmartDeviceLink/SDLSoftButton.m1
-rw-r--r--SmartDeviceLink/SDLSoftButtonCapabilities.m1
-rw-r--r--SmartDeviceLink/SDLSpeak.m1
-rw-r--r--SmartDeviceLink/SDLSpeakResponse.m1
-rw-r--r--SmartDeviceLink/SDLStartTime.m1
-rw-r--r--SmartDeviceLink/SDLSubscribeButton.m1
-rw-r--r--SmartDeviceLink/SDLSubscribeButtonResponse.m1
-rw-r--r--SmartDeviceLink/SDLSubscribeVehicleData.m1
-rw-r--r--SmartDeviceLink/SDLSubscribeVehicleDataResponse.m1
-rw-r--r--SmartDeviceLink/SDLSubscribeWaypoints.m2
-rw-r--r--SmartDeviceLink/SDLSubscribeWaypointsResponse.m2
-rw-r--r--SmartDeviceLink/SDLSyncMsgVersion.m1
-rw-r--r--SmartDeviceLink/SDLSyncPData.m1
-rw-r--r--SmartDeviceLink/SDLSyncPDataResponse.m1
-rw-r--r--SmartDeviceLink/SDLSystemRequest.m1
-rw-r--r--SmartDeviceLink/SDLSystemRequestResponse.m1
-rw-r--r--SmartDeviceLink/SDLTTSChunk.m1
-rw-r--r--SmartDeviceLink/SDLTextField.m1
-rw-r--r--SmartDeviceLink/SDLTireStatus.m1
-rw-r--r--SmartDeviceLink/SDLTouchCoord.m1
-rw-r--r--SmartDeviceLink/SDLTouchEvent.m1
-rw-r--r--SmartDeviceLink/SDLTouchEventCapabilities.m1
-rw-r--r--SmartDeviceLink/SDLTurn.m1
-rw-r--r--SmartDeviceLink/SDLUnregisterAppInterface.m1
-rw-r--r--SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m1
-rw-r--r--SmartDeviceLink/SDLUnsubscribeButton.m1
-rw-r--r--SmartDeviceLink/SDLUnsubscribeButtonResponse.m1
-rw-r--r--SmartDeviceLink/SDLUnsubscribeVehicleData.m1
-rw-r--r--SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m1
-rw-r--r--SmartDeviceLink/SDLUnsubscribeWaypoints.m2
-rw-r--r--SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m2
-rw-r--r--SmartDeviceLink/SDLUpdateTurnList.m1
-rw-r--r--SmartDeviceLink/SDLUpdateTurnListResponse.m1
-rw-r--r--SmartDeviceLink/SDLVehicleDataResult.m1
-rw-r--r--SmartDeviceLink/SDLVehicleType.m1
-rw-r--r--SmartDeviceLink/SDLVrHelpItem.m1
-rw-r--r--SmartDeviceLink/SmartDeviceLink.h1
164 files changed, 172 insertions, 3 deletions
diff --git a/SmartDeviceLink/SDLAddCommand.m b/SmartDeviceLink/SDLAddCommand.m
index bc2601422..454e41815 100644
--- a/SmartDeviceLink/SDLAddCommand.m
+++ b/SmartDeviceLink/SDLAddCommand.m
@@ -4,6 +4,7 @@
#import "SDLAddCommand.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLImage.h"
#import "SDLMenuParams.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLAddCommandResponse.m b/SmartDeviceLink/SDLAddCommandResponse.m
index f02a460a1..d7f5a725c 100644
--- a/SmartDeviceLink/SDLAddCommandResponse.m
+++ b/SmartDeviceLink/SDLAddCommandResponse.m
@@ -2,6 +2,7 @@
#import "SDLAddCommandResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLAddCommandResponse
diff --git a/SmartDeviceLink/SDLAddSubMenu.m b/SmartDeviceLink/SDLAddSubMenu.m
index 76103320f..02a52b8a5 100644
--- a/SmartDeviceLink/SDLAddSubMenu.m
+++ b/SmartDeviceLink/SDLAddSubMenu.m
@@ -2,6 +2,7 @@
#import "SDLAddSubMenu.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLAddSubMenu
diff --git a/SmartDeviceLink/SDLAddSubMenuResponse.m b/SmartDeviceLink/SDLAddSubMenuResponse.m
index 328a38401..3f2c86c24 100644
--- a/SmartDeviceLink/SDLAddSubMenuResponse.m
+++ b/SmartDeviceLink/SDLAddSubMenuResponse.m
@@ -2,6 +2,7 @@
#import "SDLAddSubMenuResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLAddSubMenuResponse
diff --git a/SmartDeviceLink/SDLAirbagStatus.m b/SmartDeviceLink/SDLAirbagStatus.m
index a4f7068e1..ca4981849 100644
--- a/SmartDeviceLink/SDLAirbagStatus.m
+++ b/SmartDeviceLink/SDLAirbagStatus.m
@@ -2,6 +2,7 @@
#import "SDLAirbagStatus.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLAirbagStatus
diff --git a/SmartDeviceLink/SDLAlert.m b/SmartDeviceLink/SDLAlert.m
index d073d9542..98ec9f562 100644
--- a/SmartDeviceLink/SDLAlert.m
+++ b/SmartDeviceLink/SDLAlert.m
@@ -2,6 +2,7 @@
#import "SDLAlert.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLSoftButton.h"
#import "SDLTTSChunk.h"
diff --git a/SmartDeviceLink/SDLAlertManeuver.m b/SmartDeviceLink/SDLAlertManeuver.m
index c5c94b0a1..0c2b58d67 100644
--- a/SmartDeviceLink/SDLAlertManeuver.m
+++ b/SmartDeviceLink/SDLAlertManeuver.m
@@ -4,6 +4,7 @@
#import "SDLAlertManeuver.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLSoftButton.h"
#import "SDLTTSChunk.h"
diff --git a/SmartDeviceLink/SDLAlertManeuverResponse.m b/SmartDeviceLink/SDLAlertManeuverResponse.m
index 60581be85..020337d3a 100644
--- a/SmartDeviceLink/SDLAlertManeuverResponse.m
+++ b/SmartDeviceLink/SDLAlertManeuverResponse.m
@@ -3,6 +3,7 @@
#import "SDLAlertManeuverResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLAlertManeuverResponse
diff --git a/SmartDeviceLink/SDLAlertResponse.m b/SmartDeviceLink/SDLAlertResponse.m
index d350a1c77..d067c40aa 100644
--- a/SmartDeviceLink/SDLAlertResponse.m
+++ b/SmartDeviceLink/SDLAlertResponse.m
@@ -3,6 +3,7 @@
#import "SDLAlertResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLAlertResponse
diff --git a/SmartDeviceLink/SDLAppInfo.m b/SmartDeviceLink/SDLAppInfo.m
index 7163a7f78..f0d3f22af 100644
--- a/SmartDeviceLink/SDLAppInfo.m
+++ b/SmartDeviceLink/SDLAppInfo.m
@@ -3,6 +3,7 @@
#import "SDLAppInfo.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionString";
diff --git a/SmartDeviceLink/SDLAudioPassThruCapabilities.m b/SmartDeviceLink/SDLAudioPassThruCapabilities.m
index ae590c2ac..eb8555eff 100644
--- a/SmartDeviceLink/SDLAudioPassThruCapabilities.m
+++ b/SmartDeviceLink/SDLAudioPassThruCapabilities.m
@@ -4,6 +4,7 @@
#import "SDLAudioPassThruCapabilities.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLBeltStatus.m b/SmartDeviceLink/SDLBeltStatus.m
index 604c68b4d..3ee50c7bf 100644
--- a/SmartDeviceLink/SDLBeltStatus.m
+++ b/SmartDeviceLink/SDLBeltStatus.m
@@ -3,6 +3,7 @@
#import "SDLBeltStatus.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLVehicleDataEventStatus.h"
diff --git a/SmartDeviceLink/SDLBodyInformation.m b/SmartDeviceLink/SDLBodyInformation.m
index 3cdee6db7..3a9bc9b64 100644
--- a/SmartDeviceLink/SDLBodyInformation.m
+++ b/SmartDeviceLink/SDLBodyInformation.m
@@ -4,6 +4,7 @@
#import "SDLBodyInformation.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLIgnitionStableStatus.h"
#import "SDLIgnitionStatus.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLButtonCapabilities.m b/SmartDeviceLink/SDLButtonCapabilities.m
index 91f651731..3350ab0f4 100644
--- a/SmartDeviceLink/SDLButtonCapabilities.m
+++ b/SmartDeviceLink/SDLButtonCapabilities.m
@@ -3,6 +3,7 @@
#import "SDLButtonCapabilities.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLButtonCapabilities
diff --git a/SmartDeviceLink/SDLChangeRegistration.m b/SmartDeviceLink/SDLChangeRegistration.m
index 0561ed003..713483798 100644
--- a/SmartDeviceLink/SDLChangeRegistration.m
+++ b/SmartDeviceLink/SDLChangeRegistration.m
@@ -4,6 +4,7 @@
#import "SDLChangeRegistration.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLChangeRegistration
diff --git a/SmartDeviceLink/SDLChangeRegistrationResponse.m b/SmartDeviceLink/SDLChangeRegistrationResponse.m
index a4cab1c9b..d17eb946e 100644
--- a/SmartDeviceLink/SDLChangeRegistrationResponse.m
+++ b/SmartDeviceLink/SDLChangeRegistrationResponse.m
@@ -4,6 +4,7 @@
#import "SDLChangeRegistrationResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLChangeRegistrationResponse
diff --git a/SmartDeviceLink/SDLChoice.m b/SmartDeviceLink/SDLChoice.m
index eb8fb94b5..ff712d830 100644
--- a/SmartDeviceLink/SDLChoice.m
+++ b/SmartDeviceLink/SDLChoice.m
@@ -3,6 +3,7 @@
#import "SDLChoice.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLImage.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLClusterModeStatus.m b/SmartDeviceLink/SDLClusterModeStatus.m
index fba5e8114..ba64af3de 100644
--- a/SmartDeviceLink/SDLClusterModeStatus.m
+++ b/SmartDeviceLink/SDLClusterModeStatus.m
@@ -3,6 +3,7 @@
#import "SDLClusterModeStatus.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLClusterModeStatus
diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
index 94be7e956..5a790e48d 100644
--- a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
+++ b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
@@ -4,6 +4,7 @@
#import "SDLCreateInteractionChoiceSet.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLChoice.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m
index 11b055e82..94b4860f5 100644
--- a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m
+++ b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m
@@ -4,6 +4,7 @@
#import "SDLCreateInteractionChoiceSetResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLCreateInteractionChoiceSetResponse
diff --git a/SmartDeviceLink/SDLDIDResult.m b/SmartDeviceLink/SDLDIDResult.m
index 8c1da777d..cc5dbb90a 100644
--- a/SmartDeviceLink/SDLDIDResult.m
+++ b/SmartDeviceLink/SDLDIDResult.m
@@ -3,6 +3,7 @@
#import "SDLDIDResult.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLDIDResult
diff --git a/SmartDeviceLink/SDLDateTime.m b/SmartDeviceLink/SDLDateTime.m
index 2b0e4fddd..88c691c89 100644
--- a/SmartDeviceLink/SDLDateTime.m
+++ b/SmartDeviceLink/SDLDateTime.m
@@ -2,6 +2,8 @@
//
#import "SDLDateTime.h"
+
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLDateTime
diff --git a/SmartDeviceLink/SDLDeleteCommand.m b/SmartDeviceLink/SDLDeleteCommand.m
index 834605661..1eb46f8de 100644
--- a/SmartDeviceLink/SDLDeleteCommand.m
+++ b/SmartDeviceLink/SDLDeleteCommand.m
@@ -4,6 +4,7 @@
#import "SDLDeleteCommand.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLDeleteCommand
diff --git a/SmartDeviceLink/SDLDeleteCommandResponse.m b/SmartDeviceLink/SDLDeleteCommandResponse.m
index 7f97574cb..f756c4ffe 100644
--- a/SmartDeviceLink/SDLDeleteCommandResponse.m
+++ b/SmartDeviceLink/SDLDeleteCommandResponse.m
@@ -4,6 +4,7 @@
#import "SDLDeleteCommandResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLDeleteCommandResponse
diff --git a/SmartDeviceLink/SDLDeleteFile.m b/SmartDeviceLink/SDLDeleteFile.m
index c284f20fe..c66784ff9 100644
--- a/SmartDeviceLink/SDLDeleteFile.m
+++ b/SmartDeviceLink/SDLDeleteFile.m
@@ -4,6 +4,7 @@
#import "SDLDeleteFile.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLDeleteFile
diff --git a/SmartDeviceLink/SDLDeleteFileResponse.m b/SmartDeviceLink/SDLDeleteFileResponse.m
index ac1346fd4..c614e42e7 100644
--- a/SmartDeviceLink/SDLDeleteFileResponse.m
+++ b/SmartDeviceLink/SDLDeleteFileResponse.m
@@ -4,6 +4,7 @@
#import "SDLDeleteFileResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLDeleteFileResponse
diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
index 14b69718e..7816add86 100644
--- a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
+++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
@@ -4,6 +4,7 @@
#import "SDLDeleteInteractionChoiceSet.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLDeleteInteractionChoiceSet
diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m
index bcca0be95..e8c2ba292 100644
--- a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m
+++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m
@@ -4,6 +4,7 @@
#import "SDLDeleteInteractionChoiceSetResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLDeleteInteractionChoiceSetResponse
diff --git a/SmartDeviceLink/SDLDeleteSubMenu.m b/SmartDeviceLink/SDLDeleteSubMenu.m
index e4832baba..1ce1b0f3f 100644
--- a/SmartDeviceLink/SDLDeleteSubMenu.m
+++ b/SmartDeviceLink/SDLDeleteSubMenu.m
@@ -4,6 +4,7 @@
#import "SDLDeleteSubMenu.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLDeleteSubMenu
diff --git a/SmartDeviceLink/SDLDeleteSubMenuResponse.m b/SmartDeviceLink/SDLDeleteSubMenuResponse.m
index a9755f8a2..0ef3c4f77 100644
--- a/SmartDeviceLink/SDLDeleteSubMenuResponse.m
+++ b/SmartDeviceLink/SDLDeleteSubMenuResponse.m
@@ -4,6 +4,7 @@
#import "SDLDeleteSubMenuResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLDeleteSubMenuResponse
diff --git a/SmartDeviceLink/SDLDeviceInfo.m b/SmartDeviceLink/SDLDeviceInfo.m
index 907cfd3fc..6638eff3c 100644
--- a/SmartDeviceLink/SDLDeviceInfo.m
+++ b/SmartDeviceLink/SDLDeviceInfo.m
@@ -7,6 +7,7 @@
#import <CoreTelephony/CTTelephonyNetworkInfo.h>
#import <UIKit/UIKit.h>
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLDeviceInfo
diff --git a/SmartDeviceLink/SDLDeviceStatus.m b/SmartDeviceLink/SDLDeviceStatus.m
index 60e22259e..8015d568a 100644
--- a/SmartDeviceLink/SDLDeviceStatus.m
+++ b/SmartDeviceLink/SDLDeviceStatus.m
@@ -3,6 +3,7 @@
#import "SDLDeviceStatus.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLDeviceLevelStatus.h"
#import "SDLNames.h"
#import "SDLPrimaryAudioSource.h"
diff --git a/SmartDeviceLink/SDLDiagnosticMessage.m b/SmartDeviceLink/SDLDiagnosticMessage.m
index 4c8373cc4..69bcee0d1 100644
--- a/SmartDeviceLink/SDLDiagnosticMessage.m
+++ b/SmartDeviceLink/SDLDiagnosticMessage.m
@@ -4,6 +4,7 @@
#import "SDLDiagnosticMessage.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLDiagnosticMessage
diff --git a/SmartDeviceLink/SDLDiagnosticMessageResponse.m b/SmartDeviceLink/SDLDiagnosticMessageResponse.m
index 43255f646..09d05625c 100644
--- a/SmartDeviceLink/SDLDiagnosticMessageResponse.m
+++ b/SmartDeviceLink/SDLDiagnosticMessageResponse.m
@@ -3,6 +3,7 @@
#import "SDLDiagnosticMessageResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLDiagnosticMessageResponse
diff --git a/SmartDeviceLink/SDLDialNumber.m b/SmartDeviceLink/SDLDialNumber.m
index 3351c9aae..7930892d1 100644
--- a/SmartDeviceLink/SDLDialNumber.m
+++ b/SmartDeviceLink/SDLDialNumber.m
@@ -4,6 +4,7 @@
#import "SDLDialNumber.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLDialNumber
diff --git a/SmartDeviceLink/SDLDialNumberResponse.m b/SmartDeviceLink/SDLDialNumberResponse.m
index 3d16f2621..2d38855b0 100644
--- a/SmartDeviceLink/SDLDialNumberResponse.m
+++ b/SmartDeviceLink/SDLDialNumberResponse.m
@@ -4,6 +4,7 @@
#import "SDLDialNumberResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLDisplayCapabilities.m b/SmartDeviceLink/SDLDisplayCapabilities.m
index f1334962f..3ebeddbc1 100644
--- a/SmartDeviceLink/SDLDisplayCapabilities.m
+++ b/SmartDeviceLink/SDLDisplayCapabilities.m
@@ -3,6 +3,7 @@
#import "SDLDisplayCapabilities.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLImageField.h"
#import "SDLScreenParams.h"
diff --git a/SmartDeviceLink/SDLECallInfo.m b/SmartDeviceLink/SDLECallInfo.m
index e7833b77d..2ec37c1a8 100644
--- a/SmartDeviceLink/SDLECallInfo.m
+++ b/SmartDeviceLink/SDLECallInfo.m
@@ -3,6 +3,7 @@
#import "SDLECallInfo.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLEmergencyEvent.m b/SmartDeviceLink/SDLEmergencyEvent.m
index 0e28963dc..8214503b2 100644
--- a/SmartDeviceLink/SDLEmergencyEvent.m
+++ b/SmartDeviceLink/SDLEmergencyEvent.m
@@ -3,6 +3,7 @@
#import "SDLEmergencyEvent.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLEmergencyEvent
diff --git a/SmartDeviceLink/SDLEncodedSyncPData.m b/SmartDeviceLink/SDLEncodedSyncPData.m
index d25401914..063b7d441 100644
--- a/SmartDeviceLink/SDLEncodedSyncPData.m
+++ b/SmartDeviceLink/SDLEncodedSyncPData.m
@@ -4,6 +4,7 @@
#import "SDLEncodedSyncPData.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLEncodedSyncPData
diff --git a/SmartDeviceLink/SDLEncodedSyncPDataResponse.m b/SmartDeviceLink/SDLEncodedSyncPDataResponse.m
index d469e1bfa..4bbc652d3 100644
--- a/SmartDeviceLink/SDLEncodedSyncPDataResponse.m
+++ b/SmartDeviceLink/SDLEncodedSyncPDataResponse.m
@@ -4,6 +4,7 @@
#import "SDLEncodedSyncPDataResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLEncodedSyncPDataResponse
diff --git a/SmartDeviceLink/SDLEndAudioPassThru.m b/SmartDeviceLink/SDLEndAudioPassThru.m
index 8045a6a98..0203eba21 100644
--- a/SmartDeviceLink/SDLEndAudioPassThru.m
+++ b/SmartDeviceLink/SDLEndAudioPassThru.m
@@ -4,6 +4,7 @@
#import "SDLEndAudioPassThru.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLEndAudioPassThru
diff --git a/SmartDeviceLink/SDLEndAudioPassThruResponse.m b/SmartDeviceLink/SDLEndAudioPassThruResponse.m
index 9cad307ec..636d4cf87 100644
--- a/SmartDeviceLink/SDLEndAudioPassThruResponse.m
+++ b/SmartDeviceLink/SDLEndAudioPassThruResponse.m
@@ -4,6 +4,7 @@
#import "SDLEndAudioPassThruResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLEndAudioPassThruResponse
diff --git a/SmartDeviceLink/SDLFunctionID.h b/SmartDeviceLink/SDLFunctionID.h
index edd72485d..f50eb01f7 100644
--- a/SmartDeviceLink/SDLFunctionID.h
+++ b/SmartDeviceLink/SDLFunctionID.h
@@ -4,6 +4,7 @@
#import <Foundation/Foundation.h>
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "NSNumber+NumberType.h"
diff --git a/SmartDeviceLink/SDLGPSData.m b/SmartDeviceLink/SDLGPSData.m
index 4b2762854..9096d9d46 100644
--- a/SmartDeviceLink/SDLGPSData.m
+++ b/SmartDeviceLink/SDLGPSData.m
@@ -3,6 +3,7 @@
#import "SDLGPSData.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLGPSData
diff --git a/SmartDeviceLink/SDLGenericResponse.m b/SmartDeviceLink/SDLGenericResponse.m
index a6a0a8ee9..a4d937950 100644
--- a/SmartDeviceLink/SDLGenericResponse.m
+++ b/SmartDeviceLink/SDLGenericResponse.m
@@ -4,6 +4,7 @@
#import "SDLGenericResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLGenericResponse
diff --git a/SmartDeviceLink/SDLGetDTCs.m b/SmartDeviceLink/SDLGetDTCs.m
index a756e6447..99e903a95 100644
--- a/SmartDeviceLink/SDLGetDTCs.m
+++ b/SmartDeviceLink/SDLGetDTCs.m
@@ -4,6 +4,7 @@
#import "SDLGetDTCs.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLGetDTCs
diff --git a/SmartDeviceLink/SDLGetDTCsResponse.m b/SmartDeviceLink/SDLGetDTCsResponse.m
index 99d4a7c0c..05875bfaa 100644
--- a/SmartDeviceLink/SDLGetDTCsResponse.m
+++ b/SmartDeviceLink/SDLGetDTCsResponse.m
@@ -4,6 +4,7 @@
#import "SDLGetDTCsResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLGetDTCsResponse
diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m
index 9f04d7a0e..4b1d97cd8 100644
--- a/SmartDeviceLink/SDLGetVehicleData.m
+++ b/SmartDeviceLink/SDLGetVehicleData.m
@@ -4,6 +4,7 @@
#import "SDLGetVehicleData.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLGetVehicleData
diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m
index 5b27744b2..c46eeeac0 100644
--- a/SmartDeviceLink/SDLGetVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m
@@ -4,6 +4,7 @@
#import "SDLGetVehicleDataResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLAirbagStatus.h"
#import "SDLBeltStatus.h"
#import "SDLBodyInformation.h"
diff --git a/SmartDeviceLink/SDLGetWaypoints.m b/SmartDeviceLink/SDLGetWaypoints.m
index 4ecc2ea7a..c02c8f069 100644
--- a/SmartDeviceLink/SDLGetWaypoints.m
+++ b/SmartDeviceLink/SDLGetWaypoints.m
@@ -3,6 +3,7 @@
#import "SDLGetWaypoints.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLGetWayPoints
diff --git a/SmartDeviceLink/SDLGetWaypointsResponse.m b/SmartDeviceLink/SDLGetWaypointsResponse.m
index 312346f6f..75551d347 100644
--- a/SmartDeviceLink/SDLGetWaypointsResponse.m
+++ b/SmartDeviceLink/SDLGetWaypointsResponse.m
@@ -3,6 +3,7 @@
#import "SDLGetWaypointsResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLLocationDetails.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLHMICapabilities.m b/SmartDeviceLink/SDLHMICapabilities.m
index 5bffa6ebd..df285685c 100644
--- a/SmartDeviceLink/SDLHMICapabilities.m
+++ b/SmartDeviceLink/SDLHMICapabilities.m
@@ -4,6 +4,7 @@
#import "SDLHMICapabilities.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLHMICapabilities
diff --git a/SmartDeviceLink/SDLHMIPermissions.m b/SmartDeviceLink/SDLHMIPermissions.m
index 0f720cfec..e084a8e66 100644
--- a/SmartDeviceLink/SDLHMIPermissions.m
+++ b/SmartDeviceLink/SDLHMIPermissions.m
@@ -4,6 +4,7 @@
#import "SDLHMIPermissions.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLHMIPermissions
diff --git a/SmartDeviceLink/SDLHeadLampStatus.m b/SmartDeviceLink/SDLHeadLampStatus.m
index 0193fa17a..4d3cb43b7 100644
--- a/SmartDeviceLink/SDLHeadLampStatus.m
+++ b/SmartDeviceLink/SDLHeadLampStatus.m
@@ -3,6 +3,7 @@
#import "SDLHeadLampStatus.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLAmbientLightStatus.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLImage.m b/SmartDeviceLink/SDLImage.m
index b9b643a60..2c89b1047 100644
--- a/SmartDeviceLink/SDLImage.m
+++ b/SmartDeviceLink/SDLImage.m
@@ -3,6 +3,7 @@
#import "SDLImage.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLImage
diff --git a/SmartDeviceLink/SDLImageField.m b/SmartDeviceLink/SDLImageField.m
index 201537ec0..dc00bb523 100644
--- a/SmartDeviceLink/SDLImageField.m
+++ b/SmartDeviceLink/SDLImageField.m
@@ -3,6 +3,7 @@
#import "SDLImageField.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLImageFieldName.h"
#import "SDLImageResolution.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLImageResolution.m b/SmartDeviceLink/SDLImageResolution.m
index 2562afe21..4375b1299 100644
--- a/SmartDeviceLink/SDLImageResolution.m
+++ b/SmartDeviceLink/SDLImageResolution.m
@@ -4,6 +4,7 @@
#import "SDLImageResolution.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLImageResolution
diff --git a/SmartDeviceLink/SDLKeyboardProperties.m b/SmartDeviceLink/SDLKeyboardProperties.m
index 3888175c3..45fbcfed5 100644
--- a/SmartDeviceLink/SDLKeyboardProperties.m
+++ b/SmartDeviceLink/SDLKeyboardProperties.m
@@ -3,6 +3,7 @@
#import "SDLKeyboardProperties.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLKeyboardProperties
diff --git a/SmartDeviceLink/SDLListFiles.m b/SmartDeviceLink/SDLListFiles.m
index e2beb0a08..d27963de2 100644
--- a/SmartDeviceLink/SDLListFiles.m
+++ b/SmartDeviceLink/SDLListFiles.m
@@ -4,6 +4,7 @@
#import "SDLListFiles.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLListFiles
diff --git a/SmartDeviceLink/SDLListFilesResponse.m b/SmartDeviceLink/SDLListFilesResponse.m
index f70e4541f..8ae451edd 100644
--- a/SmartDeviceLink/SDLListFilesResponse.m
+++ b/SmartDeviceLink/SDLListFilesResponse.m
@@ -4,6 +4,7 @@
#import "SDLListFilesResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLListFilesResponse
diff --git a/SmartDeviceLink/SDLLocationCoordinate.m b/SmartDeviceLink/SDLLocationCoordinate.m
index c2d9635db..f02283a83 100644
--- a/SmartDeviceLink/SDLLocationCoordinate.m
+++ b/SmartDeviceLink/SDLLocationCoordinate.m
@@ -2,6 +2,8 @@
//
#import "SDLLocationCoordinate.h"
+
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLLocationCoordinate
diff --git a/SmartDeviceLink/SDLLocationDetails.m b/SmartDeviceLink/SDLLocationDetails.m
index 223ea0fc4..d62b914ad 100644
--- a/SmartDeviceLink/SDLLocationDetails.m
+++ b/SmartDeviceLink/SDLLocationDetails.m
@@ -3,6 +3,7 @@
#import "SDLLocationDetails.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLImage.h"
#import "SDLLocationCoordinate.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLMenuParams.m b/SmartDeviceLink/SDLMenuParams.m
index 21f939d4b..7b41410ce 100644
--- a/SmartDeviceLink/SDLMenuParams.m
+++ b/SmartDeviceLink/SDLMenuParams.m
@@ -4,6 +4,7 @@
#import "SDLMenuParams.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLMenuParams
diff --git a/SmartDeviceLink/SDLMyKey.m b/SmartDeviceLink/SDLMyKey.m
index 5e36f780f..7c81f3a4b 100644
--- a/SmartDeviceLink/SDLMyKey.m
+++ b/SmartDeviceLink/SDLMyKey.m
@@ -3,6 +3,7 @@
#import "SDLMyKey.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLVehicleDataStatus.h"
diff --git a/SmartDeviceLink/SDLNames.m b/SmartDeviceLink/SDLNames.m
index 112bfcdae..756c2ffce 100644
--- a/SmartDeviceLink/SDLNames.m
+++ b/SmartDeviceLink/SDLNames.m
@@ -1,6 +1,7 @@
// SDLNames.h
//
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
SDLName const SDLNameAccelerationPedalPosition = @"accPedalPosition";
diff --git a/SmartDeviceLink/SDLOasisAddress.m b/SmartDeviceLink/SDLOasisAddress.m
index 0d1ad863f..989af83da 100644
--- a/SmartDeviceLink/SDLOasisAddress.m
+++ b/SmartDeviceLink/SDLOasisAddress.m
@@ -2,6 +2,8 @@
//
#import "SDLOasisAddress.h"
+
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLOasisAddress
diff --git a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
index 2eb174fb3..ea5bca870 100644
--- a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
+++ b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
@@ -3,6 +3,7 @@
#import "SDLOnAppInterfaceUnregistered.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLOnAppInterfaceUnregistered
diff --git a/SmartDeviceLink/SDLOnAudioPassThru.m b/SmartDeviceLink/SDLOnAudioPassThru.m
index 72f23e5ef..9e88bc4b7 100644
--- a/SmartDeviceLink/SDLOnAudioPassThru.m
+++ b/SmartDeviceLink/SDLOnAudioPassThru.m
@@ -4,6 +4,7 @@
#import "SDLOnAudioPassThru.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLOnAudioPassThru
diff --git a/SmartDeviceLink/SDLOnButtonEvent.m b/SmartDeviceLink/SDLOnButtonEvent.m
index 7a5388d76..e3b7ed3ca 100644
--- a/SmartDeviceLink/SDLOnButtonEvent.m
+++ b/SmartDeviceLink/SDLOnButtonEvent.m
@@ -3,6 +3,7 @@
#import "SDLOnButtonEvent.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLOnButtonEvent
diff --git a/SmartDeviceLink/SDLOnButtonPress.m b/SmartDeviceLink/SDLOnButtonPress.m
index e792329dc..ec1530314 100644
--- a/SmartDeviceLink/SDLOnButtonPress.m
+++ b/SmartDeviceLink/SDLOnButtonPress.m
@@ -3,6 +3,7 @@
#import "SDLOnButtonPress.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLOnButtonPress
diff --git a/SmartDeviceLink/SDLOnCommand.m b/SmartDeviceLink/SDLOnCommand.m
index 76ca3d4a5..e5de51ffb 100644
--- a/SmartDeviceLink/SDLOnCommand.m
+++ b/SmartDeviceLink/SDLOnCommand.m
@@ -3,6 +3,7 @@
#import "SDLOnCommand.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLOnCommand
diff --git a/SmartDeviceLink/SDLOnDriverDistraction.m b/SmartDeviceLink/SDLOnDriverDistraction.m
index 551ec17fa..f43e6c106 100644
--- a/SmartDeviceLink/SDLOnDriverDistraction.m
+++ b/SmartDeviceLink/SDLOnDriverDistraction.m
@@ -3,6 +3,7 @@
#import "SDLOnDriverDistraction.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLDriverDistractionState.h"
diff --git a/SmartDeviceLink/SDLOnEncodedSyncPData.m b/SmartDeviceLink/SDLOnEncodedSyncPData.m
index 1e8f11ab6..caf473c1a 100644
--- a/SmartDeviceLink/SDLOnEncodedSyncPData.m
+++ b/SmartDeviceLink/SDLOnEncodedSyncPData.m
@@ -3,6 +3,7 @@
#import "SDLOnEncodedSyncPData.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLOnEncodedSyncPData
diff --git a/SmartDeviceLink/SDLOnHMIStatus.m b/SmartDeviceLink/SDLOnHMIStatus.m
index 8275afe1a..4f71a4300 100644
--- a/SmartDeviceLink/SDLOnHMIStatus.m
+++ b/SmartDeviceLink/SDLOnHMIStatus.m
@@ -3,6 +3,7 @@
#import "SDLOnHMIStatus.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLAudioStreamingState.h"
#import "SDLHMILevel.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLOnHashChange.m b/SmartDeviceLink/SDLOnHashChange.m
index 3092a58d4..186873a8d 100644
--- a/SmartDeviceLink/SDLOnHashChange.m
+++ b/SmartDeviceLink/SDLOnHashChange.m
@@ -4,6 +4,7 @@
#import "SDLOnHashChange.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLOnHashChange
diff --git a/SmartDeviceLink/SDLOnKeyboardInput.m b/SmartDeviceLink/SDLOnKeyboardInput.m
index 1ef8768db..cfa35eedc 100644
--- a/SmartDeviceLink/SDLOnKeyboardInput.m
+++ b/SmartDeviceLink/SDLOnKeyboardInput.m
@@ -3,6 +3,7 @@
#import "SDLOnKeyboardInput.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLOnKeyboardInput
diff --git a/SmartDeviceLink/SDLOnLanguageChange.m b/SmartDeviceLink/SDLOnLanguageChange.m
index 0610d8d4a..fea4805fa 100644
--- a/SmartDeviceLink/SDLOnLanguageChange.m
+++ b/SmartDeviceLink/SDLOnLanguageChange.m
@@ -3,6 +3,7 @@
#import "SDLOnLanguageChange.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLLanguage.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLOnLockScreenStatus.m b/SmartDeviceLink/SDLOnLockScreenStatus.m
index 67b7f28e2..94b26aac9 100644
--- a/SmartDeviceLink/SDLOnLockScreenStatus.m
+++ b/SmartDeviceLink/SDLOnLockScreenStatus.m
@@ -5,10 +5,10 @@
#import "SDLOnLockScreenStatus.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLHMILevel.h"
#import "SDLLockScreenStatus.h"
-
@implementation SDLOnLockScreenStatus
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLOnPermissionsChange.m b/SmartDeviceLink/SDLOnPermissionsChange.m
index 4c304caea..554c9eeb7 100644
--- a/SmartDeviceLink/SDLOnPermissionsChange.m
+++ b/SmartDeviceLink/SDLOnPermissionsChange.m
@@ -3,6 +3,7 @@
#import "SDLOnPermissionsChange.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLPermissionItem.h"
diff --git a/SmartDeviceLink/SDLOnSyncPData.m b/SmartDeviceLink/SDLOnSyncPData.m
index 6db8b77f2..2b9d4bd26 100644
--- a/SmartDeviceLink/SDLOnSyncPData.m
+++ b/SmartDeviceLink/SDLOnSyncPData.m
@@ -4,6 +4,7 @@
#import "SDLOnSyncPData.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLOnSyncPData
diff --git a/SmartDeviceLink/SDLOnSystemRequest.m b/SmartDeviceLink/SDLOnSystemRequest.m
index f93bf8c86..ce45a0142 100644
--- a/SmartDeviceLink/SDLOnSystemRequest.m
+++ b/SmartDeviceLink/SDLOnSystemRequest.m
@@ -3,6 +3,7 @@
#import "SDLOnSystemRequest.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLOnSystemRequest
diff --git a/SmartDeviceLink/SDLOnTBTClientState.m b/SmartDeviceLink/SDLOnTBTClientState.m
index 2ba9f9ce1..8a04eed45 100644
--- a/SmartDeviceLink/SDLOnTBTClientState.m
+++ b/SmartDeviceLink/SDLOnTBTClientState.m
@@ -3,6 +3,7 @@
#import "SDLOnTBTClientState.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLOnTBTClientState
diff --git a/SmartDeviceLink/SDLOnTouchEvent.m b/SmartDeviceLink/SDLOnTouchEvent.m
index e97e5601b..76c90272c 100644
--- a/SmartDeviceLink/SDLOnTouchEvent.m
+++ b/SmartDeviceLink/SDLOnTouchEvent.m
@@ -3,6 +3,7 @@
#import "SDLOnTouchEvent.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLTouchEvent.h"
diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m
index f23cca2b0..7e793489a 100644
--- a/SmartDeviceLink/SDLOnVehicleData.m
+++ b/SmartDeviceLink/SDLOnVehicleData.m
@@ -3,6 +3,7 @@
#import "SDLOnVehicleData.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLAirbagStatus.h"
#import "SDLBeltStatus.h"
#import "SDLBodyInformation.h"
diff --git a/SmartDeviceLink/SDLOnWaypointChange.m b/SmartDeviceLink/SDLOnWaypointChange.m
index 9fb130338..72965ec7b 100644
--- a/SmartDeviceLink/SDLOnWaypointChange.m
+++ b/SmartDeviceLink/SDLOnWaypointChange.m
@@ -3,6 +3,7 @@
#import "SDLOnWaypointChange.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLLocationDetails.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLParameterPermissions.m b/SmartDeviceLink/SDLParameterPermissions.m
index 1843869c6..311966bfd 100644
--- a/SmartDeviceLink/SDLParameterPermissions.m
+++ b/SmartDeviceLink/SDLParameterPermissions.m
@@ -4,6 +4,7 @@
#import "SDLParameterPermissions.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLParameterPermissions
diff --git a/SmartDeviceLink/SDLPerformAudioPassThru.m b/SmartDeviceLink/SDLPerformAudioPassThru.m
index 80a923fa9..cb29f1541 100644
--- a/SmartDeviceLink/SDLPerformAudioPassThru.m
+++ b/SmartDeviceLink/SDLPerformAudioPassThru.m
@@ -4,6 +4,7 @@
#import "SDLPerformAudioPassThru.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLTTSChunk.h"
diff --git a/SmartDeviceLink/SDLPerformAudioPassThruResponse.m b/SmartDeviceLink/SDLPerformAudioPassThruResponse.m
index 386b91c50..0ee4c124d 100644
--- a/SmartDeviceLink/SDLPerformAudioPassThruResponse.m
+++ b/SmartDeviceLink/SDLPerformAudioPassThruResponse.m
@@ -4,6 +4,7 @@
#import "SDLPerformAudioPassThruResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLPerformAudioPassThruResponse
diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m
index d79c54287..24b16d98d 100644
--- a/SmartDeviceLink/SDLPerformInteraction.m
+++ b/SmartDeviceLink/SDLPerformInteraction.m
@@ -4,6 +4,7 @@
#import "SDLPerformInteraction.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLTTSChunk.h"
#import "SDLVRHelpItem.h"
diff --git a/SmartDeviceLink/SDLPerformInteractionResponse.m b/SmartDeviceLink/SDLPerformInteractionResponse.m
index be89639a6..b3352ce0e 100644
--- a/SmartDeviceLink/SDLPerformInteractionResponse.m
+++ b/SmartDeviceLink/SDLPerformInteractionResponse.m
@@ -4,6 +4,7 @@
#import "SDLPerformInteractionResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLPerformInteractionResponse
diff --git a/SmartDeviceLink/SDLPermissionItem.m b/SmartDeviceLink/SDLPermissionItem.m
index 14a340ab7..64d7c5cec 100644
--- a/SmartDeviceLink/SDLPermissionItem.m
+++ b/SmartDeviceLink/SDLPermissionItem.m
@@ -3,6 +3,7 @@
#import "SDLPermissionItem.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLHMIPermissions.h"
#import "SDLNames.h"
#import "SDLParameterPermissions.h"
diff --git a/SmartDeviceLink/SDLPresetBankCapabilities.m b/SmartDeviceLink/SDLPresetBankCapabilities.m
index fb83854df..cec923d03 100644
--- a/SmartDeviceLink/SDLPresetBankCapabilities.m
+++ b/SmartDeviceLink/SDLPresetBankCapabilities.m
@@ -4,6 +4,7 @@
#import "SDLPresetBankCapabilities.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLPresetBankCapabilities
diff --git a/SmartDeviceLink/SDLProtocolMessage.m b/SmartDeviceLink/SDLProtocolMessage.m
index 4f2c795a9..f59e792ec 100644
--- a/SmartDeviceLink/SDLProtocolMessage.m
+++ b/SmartDeviceLink/SDLProtocolMessage.m
@@ -3,6 +3,8 @@
#import "SDLProtocolMessage.h"
+
+#import "NSMutableDictionary+Store.h"
#import "SDLFunctionID.h"
#import "SDLNames.h"
#import "SDLProtocolHeader.h"
diff --git a/SmartDeviceLink/SDLPutFile.m b/SmartDeviceLink/SDLPutFile.m
index a57fa66fb..0eecb481a 100644
--- a/SmartDeviceLink/SDLPutFile.m
+++ b/SmartDeviceLink/SDLPutFile.m
@@ -3,6 +3,7 @@
#import "SDLPutFile.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLPutFile
diff --git a/SmartDeviceLink/SDLPutFileResponse.m b/SmartDeviceLink/SDLPutFileResponse.m
index 4cb8c893b..167a1daac 100644
--- a/SmartDeviceLink/SDLPutFileResponse.m
+++ b/SmartDeviceLink/SDLPutFileResponse.m
@@ -4,6 +4,7 @@
#import "SDLPutFileResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLPutFileResponse
diff --git a/SmartDeviceLink/SDLRPCMessage.m b/SmartDeviceLink/SDLRPCMessage.m
index 04a03dabb..72900d5a8 100644
--- a/SmartDeviceLink/SDLRPCMessage.m
+++ b/SmartDeviceLink/SDLRPCMessage.m
@@ -4,6 +4,7 @@
#import "SDLRPCMessage.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLRPCMessage
diff --git a/SmartDeviceLink/SDLRPCNotification.m b/SmartDeviceLink/SDLRPCNotification.m
index 22f53b7d3..1da74198a 100644
--- a/SmartDeviceLink/SDLRPCNotification.m
+++ b/SmartDeviceLink/SDLRPCNotification.m
@@ -4,6 +4,7 @@
#import "SDLRPCNotification.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLRPCNotification
diff --git a/SmartDeviceLink/SDLRPCRequest.m b/SmartDeviceLink/SDLRPCRequest.m
index a2112f28f..3cb47fba8 100644
--- a/SmartDeviceLink/SDLRPCRequest.m
+++ b/SmartDeviceLink/SDLRPCRequest.m
@@ -4,6 +4,7 @@
#import "SDLRPCRequest.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLRPCRequest
diff --git a/SmartDeviceLink/SDLRPCResponse.m b/SmartDeviceLink/SDLRPCResponse.m
index 0ac47d95c..99bc961b0 100644
--- a/SmartDeviceLink/SDLRPCResponse.m
+++ b/SmartDeviceLink/SDLRPCResponse.m
@@ -4,6 +4,7 @@
#import "SDLRPCResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLResult.h"
diff --git a/SmartDeviceLink/SDLRPCStruct.h b/SmartDeviceLink/SDLRPCStruct.h
index d56b28800..f69b11dcb 100644
--- a/SmartDeviceLink/SDLRPCStruct.h
+++ b/SmartDeviceLink/SDLRPCStruct.h
@@ -6,8 +6,6 @@
#import "NSNumber+NumberType.h"
-#import "NSMutableDictionary+Store.h"
-
@interface SDLRPCStruct : NSObject {
NSMutableDictionary<NSString *, id> *store;
}
diff --git a/SmartDeviceLink/SDLReadDID.m b/SmartDeviceLink/SDLReadDID.m
index 9cfd12ced..2e66bdf40 100644
--- a/SmartDeviceLink/SDLReadDID.m
+++ b/SmartDeviceLink/SDLReadDID.m
@@ -4,6 +4,7 @@
#import "SDLReadDID.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLReadDID
diff --git a/SmartDeviceLink/SDLReadDIDResponse.m b/SmartDeviceLink/SDLReadDIDResponse.m
index 6f878307f..2e63d97ad 100644
--- a/SmartDeviceLink/SDLReadDIDResponse.m
+++ b/SmartDeviceLink/SDLReadDIDResponse.m
@@ -4,6 +4,7 @@
#import "SDLReadDIDResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLDIDResult.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLRegisterAppInterface.m b/SmartDeviceLink/SDLRegisterAppInterface.m
index 7bfe79e58..880b5c2ae 100644
--- a/SmartDeviceLink/SDLRegisterAppInterface.m
+++ b/SmartDeviceLink/SDLRegisterAppInterface.m
@@ -4,6 +4,7 @@
#import "SDLRegisterAppInterface.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLAppHMIType.h"
#import "SDLAppInfo.h"
#import "SDLDeviceInfo.h"
diff --git a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
index a85bd0d07..95f0fee34 100644
--- a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
+++ b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
@@ -4,6 +4,7 @@
#import "SDLRegisterAppInterfaceResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLAudioPassThruCapabilities.h"
#import "SDLButtonCapabilities.h"
#import "SDLDisplayCapabilities.h"
diff --git a/SmartDeviceLink/SDLResetGlobalProperties.m b/SmartDeviceLink/SDLResetGlobalProperties.m
index 791fa9aad..485f6473e 100644
--- a/SmartDeviceLink/SDLResetGlobalProperties.m
+++ b/SmartDeviceLink/SDLResetGlobalProperties.m
@@ -4,6 +4,7 @@
#import "SDLResetGlobalProperties.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLGlobalProperty.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m
index 0ae8c079d..739fd189b 100644
--- a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m
+++ b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m
@@ -4,6 +4,7 @@
#import "SDLResetGlobalPropertiesResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLResetGlobalPropertiesResponse
diff --git a/SmartDeviceLink/SDLScreenParams.m b/SmartDeviceLink/SDLScreenParams.m
index 4a0efd8cd..cbb27d869 100644
--- a/SmartDeviceLink/SDLScreenParams.m
+++ b/SmartDeviceLink/SDLScreenParams.m
@@ -3,6 +3,7 @@
#import "SDLScreenParams.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLImageResolution.h"
#import "SDLNames.h"
#import "SDLTouchEventCapabilities.h"
diff --git a/SmartDeviceLink/SDLScrollableMessage.m b/SmartDeviceLink/SDLScrollableMessage.m
index 11850b541..c3a06d609 100644
--- a/SmartDeviceLink/SDLScrollableMessage.m
+++ b/SmartDeviceLink/SDLScrollableMessage.m
@@ -4,6 +4,7 @@
#import "SDLScrollableMessage.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLSoftButton.h"
diff --git a/SmartDeviceLink/SDLScrollableMessageResponse.m b/SmartDeviceLink/SDLScrollableMessageResponse.m
index f9b00e33b..0777c3de2 100644
--- a/SmartDeviceLink/SDLScrollableMessageResponse.m
+++ b/SmartDeviceLink/SDLScrollableMessageResponse.m
@@ -4,6 +4,7 @@
#import "SDLScrollableMessageResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLScrollableMessageResponse
diff --git a/SmartDeviceLink/SDLSendLocation.m b/SmartDeviceLink/SDLSendLocation.m
index 693fef9eb..15be8bc86 100644
--- a/SmartDeviceLink/SDLSendLocation.m
+++ b/SmartDeviceLink/SDLSendLocation.m
@@ -4,6 +4,7 @@
#import "SDLSendLocation.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLSendLocationResponse.m b/SmartDeviceLink/SDLSendLocationResponse.m
index 08e47b71f..4cac6e167 100644
--- a/SmartDeviceLink/SDLSendLocationResponse.m
+++ b/SmartDeviceLink/SDLSendLocationResponse.m
@@ -4,6 +4,7 @@
#import "SDLSendLocationResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSendLocationResponse
diff --git a/SmartDeviceLink/SDLSetAppIcon.m b/SmartDeviceLink/SDLSetAppIcon.m
index a2bcbd181..8287d18e8 100644
--- a/SmartDeviceLink/SDLSetAppIcon.m
+++ b/SmartDeviceLink/SDLSetAppIcon.m
@@ -4,6 +4,7 @@
#import "SDLSetAppIcon.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSetAppIcon
diff --git a/SmartDeviceLink/SDLSetAppIconResponse.m b/SmartDeviceLink/SDLSetAppIconResponse.m
index 9469b3b99..d99aa7990 100644
--- a/SmartDeviceLink/SDLSetAppIconResponse.m
+++ b/SmartDeviceLink/SDLSetAppIconResponse.m
@@ -4,6 +4,7 @@
#import "SDLSetAppIconResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSetAppIconResponse
diff --git a/SmartDeviceLink/SDLSetDisplayLayout.m b/SmartDeviceLink/SDLSetDisplayLayout.m
index 9e1950015..b4c802834 100644
--- a/SmartDeviceLink/SDLSetDisplayLayout.m
+++ b/SmartDeviceLink/SDLSetDisplayLayout.m
@@ -4,6 +4,7 @@
#import "SDLSetDisplayLayout.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSetDisplayLayout
diff --git a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
index 20fcd68cb..2e36f70e6 100644
--- a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
+++ b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
@@ -4,6 +4,7 @@
#import "SDLSetDisplayLayoutResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLButtonCapabilities.h"
#import "SDLDisplayCapabilities.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLSetGlobalProperties.m b/SmartDeviceLink/SDLSetGlobalProperties.m
index b7fffc586..f4ed451dd 100644
--- a/SmartDeviceLink/SDLSetGlobalProperties.m
+++ b/SmartDeviceLink/SDLSetGlobalProperties.m
@@ -4,6 +4,7 @@
#import "SDLSetGlobalProperties.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLImage.h"
#import "SDLKeyboardProperties.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m
index 4b56322ac..7b292c071 100644
--- a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m
+++ b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m
@@ -4,6 +4,7 @@
#import "SDLSetGlobalPropertiesResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSetGlobalPropertiesResponse
diff --git a/SmartDeviceLink/SDLSetMediaClockTimer.m b/SmartDeviceLink/SDLSetMediaClockTimer.m
index da2893463..e1051ea51 100644
--- a/SmartDeviceLink/SDLSetMediaClockTimer.m
+++ b/SmartDeviceLink/SDLSetMediaClockTimer.m
@@ -4,6 +4,7 @@
#import "SDLSetMediaClockTimer.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLStartTime.h"
diff --git a/SmartDeviceLink/SDLSetMediaClockTimerResponse.m b/SmartDeviceLink/SDLSetMediaClockTimerResponse.m
index 899fc4926..d851e900b 100644
--- a/SmartDeviceLink/SDLSetMediaClockTimerResponse.m
+++ b/SmartDeviceLink/SDLSetMediaClockTimerResponse.m
@@ -4,6 +4,7 @@
#import "SDLSetMediaClockTimerResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSetMediaClockTimerResponse
diff --git a/SmartDeviceLink/SDLShow.m b/SmartDeviceLink/SDLShow.m
index f41fe3bf7..86f4211f9 100644
--- a/SmartDeviceLink/SDLShow.m
+++ b/SmartDeviceLink/SDLShow.m
@@ -4,6 +4,7 @@
#import "SDLShow.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLImage.h"
#import "SDLNames.h"
#import "SDLSoftButton.h"
diff --git a/SmartDeviceLink/SDLShowConstantTBT.m b/SmartDeviceLink/SDLShowConstantTBT.m
index 40d2e70d2..ba37bf935 100644
--- a/SmartDeviceLink/SDLShowConstantTBT.m
+++ b/SmartDeviceLink/SDLShowConstantTBT.m
@@ -4,6 +4,7 @@
#import "SDLShowConstantTBT.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLImage.h"
#import "SDLNames.h"
#import "SDLSoftButton.h"
diff --git a/SmartDeviceLink/SDLShowConstantTBTResponse.m b/SmartDeviceLink/SDLShowConstantTBTResponse.m
index ee0d4f36e..a68cc5caf 100644
--- a/SmartDeviceLink/SDLShowConstantTBTResponse.m
+++ b/SmartDeviceLink/SDLShowConstantTBTResponse.m
@@ -3,6 +3,8 @@
#import "SDLShowConstantTBTResponse.h"
+
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLShowConstantTBTResponse
diff --git a/SmartDeviceLink/SDLShowResponse.m b/SmartDeviceLink/SDLShowResponse.m
index 40912b163..10ce51834 100644
--- a/SmartDeviceLink/SDLShowResponse.m
+++ b/SmartDeviceLink/SDLShowResponse.m
@@ -4,6 +4,7 @@
#import "SDLShowResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLShowResponse
diff --git a/SmartDeviceLink/SDLSingleTireStatus.m b/SmartDeviceLink/SDLSingleTireStatus.m
index 3dba61936..a43be45b9 100644
--- a/SmartDeviceLink/SDLSingleTireStatus.m
+++ b/SmartDeviceLink/SDLSingleTireStatus.m
@@ -3,6 +3,7 @@
#import "SDLSingleTireStatus.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSingleTireStatus
diff --git a/SmartDeviceLink/SDLSlider.m b/SmartDeviceLink/SDLSlider.m
index c4e8e627e..f9587c774 100644
--- a/SmartDeviceLink/SDLSlider.m
+++ b/SmartDeviceLink/SDLSlider.m
@@ -4,6 +4,7 @@
#import "SDLSlider.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSlider
diff --git a/SmartDeviceLink/SDLSliderResponse.m b/SmartDeviceLink/SDLSliderResponse.m
index 6718470fe..022b6a0a8 100644
--- a/SmartDeviceLink/SDLSliderResponse.m
+++ b/SmartDeviceLink/SDLSliderResponse.m
@@ -4,6 +4,7 @@
#import "SDLSliderResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSliderResponse
diff --git a/SmartDeviceLink/SDLSoftButton.m b/SmartDeviceLink/SDLSoftButton.m
index 1ae82579b..19dd86193 100644
--- a/SmartDeviceLink/SDLSoftButton.m
+++ b/SmartDeviceLink/SDLSoftButton.m
@@ -3,6 +3,7 @@
#import "SDLSoftButton.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLImage.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLSoftButtonCapabilities.m b/SmartDeviceLink/SDLSoftButtonCapabilities.m
index e64f7ffe8..0bad31346 100644
--- a/SmartDeviceLink/SDLSoftButtonCapabilities.m
+++ b/SmartDeviceLink/SDLSoftButtonCapabilities.m
@@ -4,6 +4,7 @@
#import "SDLSoftButtonCapabilities.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSoftButtonCapabilities
diff --git a/SmartDeviceLink/SDLSpeak.m b/SmartDeviceLink/SDLSpeak.m
index 1542dce61..85c3a1915 100644
--- a/SmartDeviceLink/SDLSpeak.m
+++ b/SmartDeviceLink/SDLSpeak.m
@@ -4,6 +4,7 @@
#import "SDLSpeak.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLTTSChunk.h"
diff --git a/SmartDeviceLink/SDLSpeakResponse.m b/SmartDeviceLink/SDLSpeakResponse.m
index fd9899636..db7ec8734 100644
--- a/SmartDeviceLink/SDLSpeakResponse.m
+++ b/SmartDeviceLink/SDLSpeakResponse.m
@@ -4,6 +4,7 @@
#import "SDLSpeakResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSpeakResponse
diff --git a/SmartDeviceLink/SDLStartTime.m b/SmartDeviceLink/SDLStartTime.m
index dea9b40be..c4c4e09e7 100644
--- a/SmartDeviceLink/SDLStartTime.m
+++ b/SmartDeviceLink/SDLStartTime.m
@@ -4,6 +4,7 @@
#import "SDLStartTime.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLStartTime
diff --git a/SmartDeviceLink/SDLSubscribeButton.m b/SmartDeviceLink/SDLSubscribeButton.m
index 6c08bca6c..00dbda2d4 100644
--- a/SmartDeviceLink/SDLSubscribeButton.m
+++ b/SmartDeviceLink/SDLSubscribeButton.m
@@ -4,6 +4,7 @@
#import "SDLSubscribeButton.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLSubscribeButtonResponse.m b/SmartDeviceLink/SDLSubscribeButtonResponse.m
index 80a9b3a85..8b232386a 100644
--- a/SmartDeviceLink/SDLSubscribeButtonResponse.m
+++ b/SmartDeviceLink/SDLSubscribeButtonResponse.m
@@ -4,6 +4,7 @@
#import "SDLSubscribeButtonResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSubscribeButtonResponse
diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.m b/SmartDeviceLink/SDLSubscribeVehicleData.m
index 1ae202715..9c1e29d60 100644
--- a/SmartDeviceLink/SDLSubscribeVehicleData.m
+++ b/SmartDeviceLink/SDLSubscribeVehicleData.m
@@ -4,6 +4,7 @@
#import "SDLSubscribeVehicleData.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSubscribeVehicleData
diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
index bc0bdec75..83f0f4919 100644
--- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
@@ -4,6 +4,7 @@
#import "SDLSubscribeVehicleDataResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLVehicleDataResult.h"
diff --git a/SmartDeviceLink/SDLSubscribeWaypoints.m b/SmartDeviceLink/SDLSubscribeWaypoints.m
index 377c92c8b..1724ab3a4 100644
--- a/SmartDeviceLink/SDLSubscribeWaypoints.m
+++ b/SmartDeviceLink/SDLSubscribeWaypoints.m
@@ -2,6 +2,8 @@
//
#import "SDLSubscribeWaypoints.h"
+
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSubscribeWayPoints
diff --git a/SmartDeviceLink/SDLSubscribeWaypointsResponse.m b/SmartDeviceLink/SDLSubscribeWaypointsResponse.m
index 1c5b51cb1..28f5cfef4 100644
--- a/SmartDeviceLink/SDLSubscribeWaypointsResponse.m
+++ b/SmartDeviceLink/SDLSubscribeWaypointsResponse.m
@@ -3,6 +3,8 @@
//
#import "SDLSubscribeWaypointsResponse.h"
+
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSubscribeWayPointsResponse
diff --git a/SmartDeviceLink/SDLSyncMsgVersion.m b/SmartDeviceLink/SDLSyncMsgVersion.m
index 57a53f385..f9fbe5206 100644
--- a/SmartDeviceLink/SDLSyncMsgVersion.m
+++ b/SmartDeviceLink/SDLSyncMsgVersion.m
@@ -4,6 +4,7 @@
#import "SDLSyncMsgVersion.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSyncMsgVersion
diff --git a/SmartDeviceLink/SDLSyncPData.m b/SmartDeviceLink/SDLSyncPData.m
index a618ab424..174f020f6 100644
--- a/SmartDeviceLink/SDLSyncPData.m
+++ b/SmartDeviceLink/SDLSyncPData.m
@@ -4,6 +4,7 @@
#import "SDLSyncPData.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSyncPData
diff --git a/SmartDeviceLink/SDLSyncPDataResponse.m b/SmartDeviceLink/SDLSyncPDataResponse.m
index 95dbbf905..f2c250c09 100644
--- a/SmartDeviceLink/SDLSyncPDataResponse.m
+++ b/SmartDeviceLink/SDLSyncPDataResponse.m
@@ -4,6 +4,7 @@
#import "SDLSyncPDataResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSyncPDataResponse
diff --git a/SmartDeviceLink/SDLSystemRequest.m b/SmartDeviceLink/SDLSystemRequest.m
index 3f12cbdf4..8e9836f55 100644
--- a/SmartDeviceLink/SDLSystemRequest.m
+++ b/SmartDeviceLink/SDLSystemRequest.m
@@ -4,6 +4,7 @@
#import "SDLSystemRequest.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSystemRequest
diff --git a/SmartDeviceLink/SDLSystemRequestResponse.m b/SmartDeviceLink/SDLSystemRequestResponse.m
index 8d12fe6a8..751e5788f 100644
--- a/SmartDeviceLink/SDLSystemRequestResponse.m
+++ b/SmartDeviceLink/SDLSystemRequestResponse.m
@@ -4,6 +4,7 @@
#import "SDLSystemRequestResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLSystemRequestResponse
diff --git a/SmartDeviceLink/SDLTTSChunk.m b/SmartDeviceLink/SDLTTSChunk.m
index f7553422b..8c56757e4 100644
--- a/SmartDeviceLink/SDLTTSChunk.m
+++ b/SmartDeviceLink/SDLTTSChunk.m
@@ -3,6 +3,7 @@
#import "SDLTTSChunk.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLTTSChunk
diff --git a/SmartDeviceLink/SDLTextField.m b/SmartDeviceLink/SDLTextField.m
index 22c04bb91..03d7a9015 100644
--- a/SmartDeviceLink/SDLTextField.m
+++ b/SmartDeviceLink/SDLTextField.m
@@ -3,6 +3,7 @@
#import "SDLTextField.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLCharacterSet.h"
#import "SDLNames.h"
#import "SDLTextFieldName.h"
diff --git a/SmartDeviceLink/SDLTireStatus.m b/SmartDeviceLink/SDLTireStatus.m
index 3aee276ec..84e8e8bef 100644
--- a/SmartDeviceLink/SDLTireStatus.m
+++ b/SmartDeviceLink/SDLTireStatus.m
@@ -3,6 +3,7 @@
#import "SDLTireStatus.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLSingleTireStatus.h"
#import "SDLWarningLightStatus.h"
diff --git a/SmartDeviceLink/SDLTouchCoord.m b/SmartDeviceLink/SDLTouchCoord.m
index f3dee9c0f..ae0d5fde2 100644
--- a/SmartDeviceLink/SDLTouchCoord.m
+++ b/SmartDeviceLink/SDLTouchCoord.m
@@ -4,6 +4,7 @@
#import "SDLTouchCoord.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLTouchCoord
diff --git a/SmartDeviceLink/SDLTouchEvent.m b/SmartDeviceLink/SDLTouchEvent.m
index 855705fbf..153d44bda 100644
--- a/SmartDeviceLink/SDLTouchEvent.m
+++ b/SmartDeviceLink/SDLTouchEvent.m
@@ -4,6 +4,7 @@
#import "SDLTouchEvent.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLTouchCoord.h"
diff --git a/SmartDeviceLink/SDLTouchEventCapabilities.m b/SmartDeviceLink/SDLTouchEventCapabilities.m
index 3eed2fdfd..d13a6697f 100644
--- a/SmartDeviceLink/SDLTouchEventCapabilities.m
+++ b/SmartDeviceLink/SDLTouchEventCapabilities.m
@@ -4,6 +4,7 @@
#import "SDLTouchEventCapabilities.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLTouchEventCapabilities
diff --git a/SmartDeviceLink/SDLTurn.m b/SmartDeviceLink/SDLTurn.m
index ddf7db1ee..a6bc87244 100644
--- a/SmartDeviceLink/SDLTurn.m
+++ b/SmartDeviceLink/SDLTurn.m
@@ -3,6 +3,7 @@
#import "SDLTurn.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLImage.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLUnregisterAppInterface.m b/SmartDeviceLink/SDLUnregisterAppInterface.m
index 5a19dc885..acdf329f3 100644
--- a/SmartDeviceLink/SDLUnregisterAppInterface.m
+++ b/SmartDeviceLink/SDLUnregisterAppInterface.m
@@ -4,6 +4,7 @@
#import "SDLUnregisterAppInterface.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLUnregisterAppInterface
diff --git a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m
index ca1b8953c..b11f488e0 100644
--- a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m
+++ b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m
@@ -4,6 +4,7 @@
#import "SDLUnregisterAppInterfaceResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLUnregisterAppInterfaceResponse
diff --git a/SmartDeviceLink/SDLUnsubscribeButton.m b/SmartDeviceLink/SDLUnsubscribeButton.m
index 70abb25d6..294ca65c2 100644
--- a/SmartDeviceLink/SDLUnsubscribeButton.m
+++ b/SmartDeviceLink/SDLUnsubscribeButton.m
@@ -4,6 +4,7 @@
#import "SDLUnsubscribeButton.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLButtonName.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SDLUnsubscribeButtonResponse.m b/SmartDeviceLink/SDLUnsubscribeButtonResponse.m
index 2f45d790e..037efdd11 100644
--- a/SmartDeviceLink/SDLUnsubscribeButtonResponse.m
+++ b/SmartDeviceLink/SDLUnsubscribeButtonResponse.m
@@ -4,6 +4,7 @@
#import "SDLUnsubscribeButtonResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLUnsubscribeButtonResponse
diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.m b/SmartDeviceLink/SDLUnsubscribeVehicleData.m
index 7c0b521e7..b4567ca7a 100644
--- a/SmartDeviceLink/SDLUnsubscribeVehicleData.m
+++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.m
@@ -4,6 +4,7 @@
#import "SDLUnsubscribeVehicleData.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLUnsubscribeVehicleData
diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
index a5ccff022..b3af12e22 100644
--- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
@@ -4,6 +4,7 @@
#import "SDLUnsubscribeVehicleDataResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLVehicleDataResult.h"
diff --git a/SmartDeviceLink/SDLUnsubscribeWaypoints.m b/SmartDeviceLink/SDLUnsubscribeWaypoints.m
index a60ec04ab..6dc36fb29 100644
--- a/SmartDeviceLink/SDLUnsubscribeWaypoints.m
+++ b/SmartDeviceLink/SDLUnsubscribeWaypoints.m
@@ -2,6 +2,8 @@
//
#import "SDLUnsubscribeWaypoints.h"
+
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLUnsubscribeWayPoints
diff --git a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m b/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m
index 63e232900..92431bacf 100644
--- a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m
+++ b/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m
@@ -2,6 +2,8 @@
//
#import "SDLUnsubscribeWaypointsResponse.h"
+
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLUnsubscribeWayPointsResponse
diff --git a/SmartDeviceLink/SDLUpdateTurnList.m b/SmartDeviceLink/SDLUpdateTurnList.m
index 7fed41e48..181787e1f 100644
--- a/SmartDeviceLink/SDLUpdateTurnList.m
+++ b/SmartDeviceLink/SDLUpdateTurnList.m
@@ -4,6 +4,7 @@
#import "SDLUpdateTurnList.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
#import "SDLSoftButton.h"
#import "SDLTurn.h"
diff --git a/SmartDeviceLink/SDLUpdateTurnListResponse.m b/SmartDeviceLink/SDLUpdateTurnListResponse.m
index 681e9c38c..584d3105a 100644
--- a/SmartDeviceLink/SDLUpdateTurnListResponse.m
+++ b/SmartDeviceLink/SDLUpdateTurnListResponse.m
@@ -4,6 +4,7 @@
#import "SDLUpdateTurnListResponse.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLUpdateTurnListResponse
diff --git a/SmartDeviceLink/SDLVehicleDataResult.m b/SmartDeviceLink/SDLVehicleDataResult.m
index 280172f7f..60ed41805 100644
--- a/SmartDeviceLink/SDLVehicleDataResult.m
+++ b/SmartDeviceLink/SDLVehicleDataResult.m
@@ -3,6 +3,7 @@
#import "SDLVehicleDataResult.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLVehicleDataResult
diff --git a/SmartDeviceLink/SDLVehicleType.m b/SmartDeviceLink/SDLVehicleType.m
index cdab269bc..b9241cab6 100644
--- a/SmartDeviceLink/SDLVehicleType.m
+++ b/SmartDeviceLink/SDLVehicleType.m
@@ -4,6 +4,7 @@
#import "SDLVehicleType.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLNames.h"
@implementation SDLVehicleType
diff --git a/SmartDeviceLink/SDLVrHelpItem.m b/SmartDeviceLink/SDLVrHelpItem.m
index ef47772a7..d85a31a67 100644
--- a/SmartDeviceLink/SDLVrHelpItem.m
+++ b/SmartDeviceLink/SDLVrHelpItem.m
@@ -4,6 +4,7 @@
#import "SDLVRHelpItem.h"
+#import "NSMutableDictionary+Store.h"
#import "SDLImage.h"
#import "SDLNames.h"
diff --git a/SmartDeviceLink/SmartDeviceLink.h b/SmartDeviceLink/SmartDeviceLink.h
index 9ca9975b4..9a9f7f0f2 100644
--- a/SmartDeviceLink/SmartDeviceLink.h
+++ b/SmartDeviceLink/SmartDeviceLink.h
@@ -306,6 +306,7 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[];
#import "SDLPermissionManager.h"
// Utilities
+#import "NSMutableDictionary+Store.h"
#import "NSNumber+NumberType.h"
#import "SDLErrorConstants.h"
#import "SDLNotificationConstants.h"