diff --git a/src/CalcManager/CalculatorManager.h b/src/CalcManager/CalculatorManager.h
index a0efffa..f66664e 100644
--- a/src/CalcManager/CalculatorManager.h
+++ b/src/CalcManager/CalculatorManager.h
@@ -2,8 +2,11 @@
 // Licensed under the MIT License.
 
 #pragma once
+
 #include "CalculatorHistory.h"
-#include "Header Files\Rational.h"
+#include "Header Files/CalcEngine.h"
+#include "Header Files/Rational.h"
+#include "Header Files/ICalcDisplay.h"
 
 namespace CalculationManager
 {
diff --git a/src/CalcManager/Header Files/CalcEngine.h b/src/CalcManager/Header Files/CalcEngine.h
index 7c42b39..72e21ac 100644
--- a/src/CalcManager/Header Files/CalcEngine.h	
+++ b/src/CalcManager/Header Files/CalcEngine.h	
@@ -17,9 +17,9 @@
 #include "scimath.h"
 #include "CCommand.h"
 #include "EngineStrings.h"
-#include "Command.h"
-#include "CalculatorVector.h"
-#include "ExpressionCommand.h"
+#include "../Command.h"
+#include "../CalculatorVector.h"
+#include "../ExpressionCommand.h"
 #include "History.h"  // for History Collector
 #include "CalcInput.h"
 #include "ICalcDisplay.h"
diff --git a/src/CalcManager/Header Files/ICalcDisplay.h b/src/CalcManager/Header Files/ICalcDisplay.h
index cc420a4..abafbc3 100644
--- a/src/CalcManager/Header Files/ICalcDisplay.h	
+++ b/src/CalcManager/Header Files/ICalcDisplay.h	
@@ -1,8 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "../CalculatorVector.h"
+#include "../ExpressionCommandInterface.h"
+
 // Callback interface to be implemented by the clients of CCalcEngine
 class ICalcDisplay {
 public:
diff --git a/src/CalcManager/Header Files/scimath.h b/src/CalcManager/Header Files/scimath.h
index 300e36b..673b050 100644
--- a/src/CalcManager/Header Files/scimath.h	
+++ b/src/CalcManager/Header Files/scimath.h	
@@ -22,7 +22,7 @@
 //
 // RETAIL version of NUMOBJ math that uses Infinite Precision
 //
-#include "Ratpack/ratpak.h"
+#include "../Ratpack/ratpak.h"
 
 //
 // Unary functions
diff --git a/src/CalcViewModel/ApplicationViewModel.cpp b/src/CalcViewModel/ApplicationViewModel.cpp
index 9d11419..9c1aa38 100644
--- a/src/CalcViewModel/ApplicationViewModel.cpp
+++ b/src/CalcViewModel/ApplicationViewModel.cpp
@@ -1,11 +1,12 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
 #include "ApplicationViewModel.h"
+#include "Common\TraceLogger.h"
+#include "Common\AppResourceProvider.h"
 #include "StandardCalculatorViewModel.h"
 #include "DateCalculatorViewModel.h"
-#include "Common\AppResourceProvider.h"
 #include "DataLoaders\CurrencyHttpClient.h"
 #include "DataLoaders\CurrencyDataLoader.h"
 #include "DataLoaders\UnitConverterDataLoader.h"
diff --git a/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.h b/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.h
index b197479..69f0fee 100644
--- a/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.h
+++ b/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.h
@@ -1,8 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalculatorButtonUser.h"
+#include "Utils.h"
+
 namespace CalculatorApp
 {
     namespace Common
diff --git a/src/CalcViewModel/Common/CalculatorButtonUser.h b/src/CalcViewModel/Common/CalculatorButtonUser.h
index 75b2c3f..cd602c6 100644
--- a/src/CalcViewModel/Common/CalculatorButtonUser.h
+++ b/src/CalcViewModel/Common/CalculatorButtonUser.h
@@ -1,8 +1,10 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcManager/Command.h"
+
 namespace CalculatorApp
 {
     namespace CM = CalculationManager;
diff --git a/src/CalcViewModel/Common/CalculatorDisplay.h b/src/CalcViewModel/Common/CalculatorDisplay.h
index 39b5a9c..692af37 100644
--- a/src/CalcViewModel/Common/CalculatorDisplay.h
+++ b/src/CalcViewModel/Common/CalculatorDisplay.h
@@ -1,8 +1,10 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcManager/Header Files/ICalcDisplay.h"
+
 namespace CalculatorApp
 {
     // Callback interface to be implemented by the CalculatorManager
diff --git a/src/CalcViewModel/Common/CopyPasteManager.cpp b/src/CalcViewModel/Common/CopyPasteManager.cpp
index 0695ec5..31e36d4 100644
--- a/src/CalcViewModel/Common/CopyPasteManager.cpp
+++ b/src/CalcViewModel/Common/CopyPasteManager.cpp
@@ -1,8 +1,9 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
 #include "CopyPasteManager.h"
+#include "Common\TraceLogger.h"
 #include "Common\LocalizationSettings.h"
 
 using namespace std;
diff --git a/src/CalcViewModel/Common/CopyPasteManager.h b/src/CalcViewModel/Common/CopyPasteManager.h
index 24caa81..1da4af4 100644
--- a/src/CalcViewModel/Common/CopyPasteManager.h
+++ b/src/CalcViewModel/Common/CopyPasteManager.h
@@ -1,8 +1,10 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
+
 #include "AppResourceProvider.h"
+#include "NavCategory.h"
 
 namespace CalculatorUnitTests
 {
diff --git a/src/CalcViewModel/Common/DisplayExpressionToken.h b/src/CalcViewModel/Common/DisplayExpressionToken.h
index ea10762..7ba811c 100644
--- a/src/CalcViewModel/Common/DisplayExpressionToken.h
+++ b/src/CalcViewModel/Common/DisplayExpressionToken.h
@@ -1,8 +1,10 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "Utils.h"
+
 namespace CalculatorApp::Common
 {
     public enum class TokenType
diff --git a/src/CalcViewModel/Common/EngineResourceProvider.h b/src/CalcViewModel/Common/EngineResourceProvider.h
index b7d735d..1bcb93f 100644
--- a/src/CalcViewModel/Common/EngineResourceProvider.h
+++ b/src/CalcViewModel/Common/EngineResourceProvider.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include "CalcManager\CalculatorResource.h"
+
 namespace CalculatorApp
 {
     class EngineResourceProvider : public CalculationManager::IResourceProvider
diff --git a/src/CalcViewModel/Common/ExpressionCommandDeserializer.h b/src/CalcViewModel/Common/ExpressionCommandDeserializer.h
index 988017b..d48f7e2 100644
--- a/src/CalcViewModel/Common/ExpressionCommandDeserializer.h
+++ b/src/CalcViewModel/Common/ExpressionCommandDeserializer.h
@@ -1,8 +1,10 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcManager/ExpressionCommand.h"
+
 namespace CalculatorApp
 {
     namespace Common
diff --git a/src/CalcViewModel/Common/ExpressionCommandSerializer.h b/src/CalcViewModel/Common/ExpressionCommandSerializer.h
index 344a4f6..36203cb 100644
--- a/src/CalcViewModel/Common/ExpressionCommandSerializer.h
+++ b/src/CalcViewModel/Common/ExpressionCommandSerializer.h
@@ -1,8 +1,10 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcManager/ExpressionCommand.h"
+
 namespace CalculatorApp
 {
     namespace Common
diff --git a/src/CalcViewModel/Common/KeyboardShortcutManager.h b/src/CalcViewModel/Common/KeyboardShortcutManager.h
index 28c3b61..d747655 100644
--- a/src/CalcViewModel/Common/KeyboardShortcutManager.h
+++ b/src/CalcViewModel/Common/KeyboardShortcutManager.h
@@ -1,8 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "Utils.h"
+#include "MyVirtualKey.h"
+
 namespace CalculatorApp
 {
     namespace Common
diff --git a/src/CalcViewModel/Common/LocalizationService.h b/src/CalcViewModel/Common/LocalizationService.h
index 1afdbb9..7560682 100644
--- a/src/CalcViewModel/Common/LocalizationService.h
+++ b/src/CalcViewModel/Common/LocalizationService.h
@@ -1,8 +1,10 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "Utils.h"
+
 namespace CalculatorApp { namespace Common
 {
     namespace LocalizationServiceProperties
diff --git a/src/CalcViewModel/Common/NavCategory.h b/src/CalcViewModel/Common/NavCategory.h
index b8f544f..a463833 100644
--- a/src/CalcViewModel/Common/NavCategory.h
+++ b/src/CalcViewModel/Common/NavCategory.h
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 /* The NavCategory group of classes and enumerations is intended to serve
@@ -14,6 +14,9 @@
 
 #pragma once
 
+#include "Utils.h"
+#include "MyVirtualKey.h"
+
 namespace CalculatorApp
 {
     namespace Common
@@ -59,7 +62,7 @@ namespace CalculatorApp
                 wchar_t const * nameKey,
                 wchar_t const * glyph,
                 CategoryGroupType group,
-                CalculatorApp::Common::MyVirtualKey vKey,
+                MyVirtualKey vKey,
                 bool categorySupportsNegative)
                 :
                 viewMode(mode),
@@ -78,7 +81,7 @@ namespace CalculatorApp
             const wchar_t * const nameResourceKey;
             const wchar_t * const glyph;
             const CategoryGroupType groupType;
-            const CalculatorApp::Common::MyVirtualKey virtualKey;
+            const MyVirtualKey virtualKey;
             const bool supportsNegative;
         };
 
@@ -173,7 +176,7 @@ namespace CalculatorApp
             static int GetIndexInGroup(ViewMode mode, CategoryGroupType type);
             static int GetPosition(ViewMode mode);
 
-            static ViewMode GetViewModeForVirtualKey(CalculatorApp::Common::MyVirtualKey virtualKey);
+            static ViewMode GetViewModeForVirtualKey(MyVirtualKey virtualKey);
 
         internal:
             NavCategory(Platform::String^ name, Platform::String^ automationName, Platform::String^ glyph, Platform::String^ accessKey, Platform::String^ mode, ViewMode viewMode, bool supportsNegative) :
@@ -188,7 +191,7 @@ namespace CalculatorApp
                 m_position = NavCategory::GetPosition(m_viewMode);
             }
 
-            static std::vector<CalculatorApp::Common::MyVirtualKey> GetCategoryAcceleratorKeys();
+            static std::vector<MyVirtualKey> GetCategoryAcceleratorKeys();
 
         private:
             static bool IsModeInCategoryGroup(ViewMode mode, CategoryGroupType groupType);
diff --git a/src/CalcViewModel/Common/TraceLogger.cpp b/src/CalcViewModel/Common/TraceLogger.cpp
index 7f1e5a2..4be72ab 100644
--- a/src/CalcViewModel/Common/TraceLogger.cpp
+++ b/src/CalcViewModel/Common/TraceLogger.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
@@ -6,6 +6,7 @@
 #include "pch.h"
 #include "TraceLogger.h"
 #include "NetworkManager.h"
+#include "CalculatorButtonUser.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/CalcViewModel/Common/TraceLogger.h b/src/CalcViewModel/Common/TraceLogger.h
index c6bfc3d..c995b98 100644
--- a/src/CalcViewModel/Common/TraceLogger.h
+++ b/src/CalcViewModel/Common/TraceLogger.h
@@ -1,9 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcManager/Command.h"
 #include "TraceActivity.h"
+#include "NavCategory.h"
 
 static const int maxFunctionSize = (int)CalculationManager::Command::CommandBINEDITEND;
 
diff --git a/src/CalcViewModel/Common/Utils.h b/src/CalcViewModel/Common/Utils.h
index b666b6b..949ba0f 100644
--- a/src/CalcViewModel/Common/Utils.h
+++ b/src/CalcViewModel/Common/Utils.h
@@ -1,8 +1,12 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcManager/CalculatorVector.h"
+#include "CalcManager/ExpressionCommandInterface.h"
+#include "DelegateCommand.h"
+
 // Utility macros to make Models easier to write
 // generates a member variable called m_<n>
 #define PROPERTY_R(t, n)\
diff --git a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp
index aea3761..434cc6f 100644
--- a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp
+++ b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp
@@ -1,13 +1,14 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
 #include "CurrencyDataLoader.h"
-#include "UnitConverterDataConstants.h"
 #include "Common\AppResourceProvider.h"
 #include "Common\LocalizationStringUtil.h"
 #include "Common\LocalizationService.h"
 #include "Common\LocalizationSettings.h"
+#include "Common\TraceLogger.h"
+#include "UnitConverterDataConstants.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h
index e7e9738..917fa21 100644
--- a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h
+++ b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h
@@ -1,8 +1,9 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcManager\UnitConverter.h"
 #include "Common\NetworkManager.h"
 #include "ICurrencyHttpClient.h"
 
diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h
index 07f2beb..b48b8e0 100644
--- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h
+++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h
@@ -1,8 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcManager\UnitConverter.h"
+#include "Common/NavCategory.h"
+
 namespace CalculatorApp
 {
     namespace ViewModel
diff --git a/src/CalcViewModel/DateCalculatorViewModel.cpp b/src/CalcViewModel/DateCalculatorViewModel.cpp
index 764db23..e905d76 100644
--- a/src/CalcViewModel/DateCalculatorViewModel.cpp
+++ b/src/CalcViewModel/DateCalculatorViewModel.cpp
@@ -3,6 +3,7 @@
 
 #include "pch.h"
 #include "DateCalculatorViewModel.h"
+#include "Common\TraceLogger.h"
 #include "Common\LocalizationStringUtil.h"
 #include "Common\LocalizationService.h"
 #include "Common\LocalizationSettings.h"
diff --git a/src/CalcViewModel/DateCalculatorViewModel.h b/src/CalcViewModel/DateCalculatorViewModel.h
index de1dc7e..1dffe51 100644
--- a/src/CalcViewModel/DateCalculatorViewModel.h
+++ b/src/CalcViewModel/DateCalculatorViewModel.h
@@ -1,9 +1,10 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
-#include "Common\DateCalculator.h"
+#include "Common/Utils.h"
+#include "Common/DateCalculator.h"
 
 const int c_maxOffsetValue = 999;
 
diff --git a/src/CalcViewModel/HistoryItemViewModel.h b/src/CalcViewModel/HistoryItemViewModel.h
index 25cb4ab..ab22f5d 100644
--- a/src/CalcViewModel/HistoryItemViewModel.h
+++ b/src/CalcViewModel/HistoryItemViewModel.h
@@ -1,8 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcManager/CalculatorVector.h"
+#include "CalcManager/ExpressionCommandInterface.h"
+
 namespace CalculatorApp
 {
     namespace ViewModel
diff --git a/src/CalcViewModel/HistoryViewModel.cpp b/src/CalcViewModel/HistoryViewModel.cpp
index a0b5d90..822aab0 100644
--- a/src/CalcViewModel/HistoryViewModel.cpp
+++ b/src/CalcViewModel/HistoryViewModel.cpp
@@ -3,6 +3,7 @@
 
 #include "pch.h"
 #include "HistoryViewModel.h"
+#include "Common\TraceLogger.h"
 #include "Common\LocalizationStringUtil.h"
 #include "Common\LocalizationSettings.h"
 
@@ -17,7 +18,6 @@ using namespace Windows::Storage;
 using namespace Windows::Storage::Streams;
 using namespace Windows::Security::Cryptography;
 using namespace Windows::Foundation::Collections;
-using CalculatorApp::TraceLogger;
 
 static StringReference HistoryVectorLengthKey{ L"HistoryVectorLength" };
 
diff --git a/src/CalcViewModel/HistoryViewModel.h b/src/CalcViewModel/HistoryViewModel.h
index eb5d654..6913fa8 100644
--- a/src/CalcViewModel/HistoryViewModel.h
+++ b/src/CalcViewModel/HistoryViewModel.h
@@ -1,9 +1,12 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
-#include "Common\Automation\NarratorAnnouncement.h"
-#include "Common\CalculatorDisplay.h"
+
+#include "CalcManager/CalculatorManager.h"
+#include "Common/Automation/NarratorAnnouncement.h"
+#include "Common/CalculatorDisplay.h"
+#include "Common/NavCategory.h"
 #include "HistoryItemViewModel.h"
 
 namespace CalculatorApp
diff --git a/src/CalcViewModel/MemoryItemViewModel.h b/src/CalcViewModel/MemoryItemViewModel.h
index 1b7b633..948053e 100644
--- a/src/CalcViewModel/MemoryItemViewModel.h
+++ b/src/CalcViewModel/MemoryItemViewModel.h
@@ -1,8 +1,10 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "Common/Utils.h"
+
 namespace CalculatorApp
 {
     namespace ViewModel
diff --git a/src/CalcViewModel/StandardCalculatorViewModel.cpp b/src/CalcViewModel/StandardCalculatorViewModel.cpp
index 19409f3..12d74ea 100644
--- a/src/CalcViewModel/StandardCalculatorViewModel.cpp
+++ b/src/CalcViewModel/StandardCalculatorViewModel.cpp
@@ -7,6 +7,7 @@
 #include "Common\LocalizationStringUtil.h"
 #include "Common\LocalizationSettings.h"
 #include "Common\CopyPasteManager.h"
+#include "Common\TraceLogger.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/CalcViewModel/StandardCalculatorViewModel.h b/src/CalcViewModel/StandardCalculatorViewModel.h
index df19571..1a95a23 100644
--- a/src/CalcViewModel/StandardCalculatorViewModel.h
+++ b/src/CalcViewModel/StandardCalculatorViewModel.h
@@ -1,13 +1,14 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 #include "Common\Automation\NarratorAnnouncement.h"
 #include "Common\DisplayExpressionToken.h"
 #include "Common\CalculatorDisplay.h"
+#include "Common\EngineResourceProvider.h"
+#include "Common\CalculatorButtonUser.h"
 #include "HistoryViewModel.h"
 #include "MemoryItemViewModel.h"
-#include "Common\EngineResourceProvider.h"
 
 namespace CalculatorFunctionalTests
 {
diff --git a/src/CalcViewModel/UnitConverterViewModel.cpp b/src/CalcViewModel/UnitConverterViewModel.cpp
index 9fef230..9360530 100644
--- a/src/CalcViewModel/UnitConverterViewModel.cpp
+++ b/src/CalcViewModel/UnitConverterViewModel.cpp
@@ -1,13 +1,15 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
 #include "UnitConverterViewModel.h"
+#include "CalcManager/Header Files/EngineStrings.h"
 #include "Common\CalculatorButtonPressedEventArgs.h"
 #include "Common\CopyPasteManager.h"
 #include "Common\LocalizationStringUtil.h"
 #include "Common\LocalizationService.h"
 #include "Common\LocalizationSettings.h"
+#include "Common\TraceLogger.h"
 #include "DataLoaders\CurrencyHttpClient.h"
 #include "DataLoaders\CurrencyDataLoader.h"
 #include "DataLoaders\UnitConverterDataLoader.h"
diff --git a/src/CalcViewModel/UnitConverterViewModel.h b/src/CalcViewModel/UnitConverterViewModel.h
index 2405c7f..3b0987d 100644
--- a/src/CalcViewModel/UnitConverterViewModel.h
+++ b/src/CalcViewModel/UnitConverterViewModel.h
@@ -1,11 +1,15 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
-#include "Common\NetworkManager.h"
-#include "Common\Automation\NarratorAnnouncement.h"
-#include "Common\ConversionResultTaskHelper.h"
+#include "CalcManager/UnitConverter.h"
+#include "Common/Utils.h"
+#include "Common/NetworkManager.h"
+#include "Common/Automation/NarratorAnnouncement.h"
+#include "Common/ConversionResultTaskHelper.h"
+#include "Common/CalculatorButtonUser.h"
+#include "Common/NavCategory.h"
 
 namespace CalculatorApp
 {
diff --git a/src/CalcViewModel/pch.h b/src/CalcViewModel/pch.h
index 33dba54..01a40fa 100644
--- a/src/CalcViewModel/pch.h
+++ b/src/CalcViewModel/pch.h
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
@@ -43,19 +43,3 @@
 namespace StandardPeers = Windows::UI::Xaml::Automation::Peers;
 namespace CalculatorApp::Common::Automation {}
 namespace CustomPeers = CalculatorApp::Common::Automation;
-
-// CalcManager Headers
-#include "CalcManager\CalculatorVector.h"
-#include "CalcManager\ExpressionCommand.h"
-#include "CalcManager\CalculatorResource.h"
-#include "CalcManager\CalculatorManager.h"
-#include "CalcManager\UnitConverter.h"
-
-// Project Headers
-#include "Common\DelegateCommand.h"
-#include "Common\Utils.h"
-#include "Common\MyVirtualKey.h"
-#include "Common\NavCategory.h"
-#include "Common\TraceLogger.h"
-#include "Common\CalculatorButtonUser.h"
-
diff --git a/src/Calculator/AboutFlyout.xaml.cpp b/src/Calculator/AboutFlyout.xaml.cpp
index 7c5c006..e645252 100644
--- a/src/Calculator/AboutFlyout.xaml.cpp
+++ b/src/Calculator/AboutFlyout.xaml.cpp
@@ -1,11 +1,12 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
 #include "AboutFlyout.xaml.h"
-#include "CalcViewModel\Common\AppResourceProvider.h"
-#include "CalcViewModel\Common\LocalizationService.h"
-#include "CalcViewModel\Common\LocalizationStringUtil.h"
+#include "CalcViewModel/Common/AppResourceProvider.h"
+#include "CalcViewModel/Common/LocalizationService.h"
+#include "CalcViewModel/Common/LocalizationStringUtil.h"
+#include "CalcViewModel/Common/TraceLogger.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/App.xaml.cpp b/src/Calculator/App.xaml.cpp
index 74cf2a9..1a83fdb 100644
--- a/src/Calculator/App.xaml.cpp
+++ b/src/Calculator/App.xaml.cpp
@@ -8,11 +8,12 @@
 
 #include "pch.h"
 #include "App.xaml.h"
-#include "CalcViewModel\ViewState.h"
-#include "CalcViewModel\Common\Automation\NarratorNotifier.h"
-#include "CalcViewModel\Common\AppResourceProvider.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
-#include "Views\MainPage.xaml.h"
+#include "CalcViewModel/Common/TraceLogger.h"
+#include "CalcViewModel/Common/Automation/NarratorNotifier.h"
+#include "CalcViewModel/Common/AppResourceProvider.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
+#include "CalcViewModel/ViewState.h"
+#include "Views/MainPage.xaml.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/Controls/CalculationResult.h b/src/Calculator/Controls/CalculationResult.h
index 1dfd1e3..3e059a2 100644
--- a/src/Calculator/Controls/CalculationResult.h
+++ b/src/Calculator/Controls/CalculationResult.h
@@ -1,8 +1,10 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcViewModel/Common/Utils.h"
+
 namespace CalculatorApp
 {
     namespace Controls
diff --git a/src/Calculator/Controls/CalculatorButton.h b/src/Calculator/Controls/CalculatorButton.h
index 92549e5..71c29a9 100644
--- a/src/Calculator/Controls/CalculatorButton.h
+++ b/src/Calculator/Controls/CalculatorButton.h
@@ -1,8 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcViewModel/Common/Utils.h"
+#include "CalcViewModel/Common/CalculatorButtonUser.h"
+
 namespace CalculatorApp
 {
     namespace Controls
diff --git a/src/Calculator/Controls/FlipButtons.h b/src/Calculator/Controls/FlipButtons.h
index d599468..ab3ef8e 100644
--- a/src/Calculator/Controls/FlipButtons.h
+++ b/src/Calculator/Controls/FlipButtons.h
@@ -1,8 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcViewModel/Common/Utils.h"
+#include "CalcViewModel/Common/CalculatorButtonUser.h"
+
 namespace CalculatorApp
 {
     namespace Controls
diff --git a/src/Calculator/Controls/OverflowTextBlock.h b/src/Calculator/Controls/OverflowTextBlock.h
index b003a9f..1fe3dd9 100644
--- a/src/Calculator/Controls/OverflowTextBlock.h
+++ b/src/Calculator/Controls/OverflowTextBlock.h
@@ -1,8 +1,10 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcViewModel/Common/Utils.h"
+
 namespace CalculatorApp
 {
     namespace Controls
diff --git a/src/Calculator/Converters/RadixToStringConverter.cpp b/src/Calculator/Converters/RadixToStringConverter.cpp
index 76e9efe..053800e 100644
--- a/src/Calculator/Converters/RadixToStringConverter.cpp
+++ b/src/Calculator/Converters/RadixToStringConverter.cpp
@@ -1,16 +1,16 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
-#include "CalcViewModel\Common\AppResourceProvider.h"
 #include "RadixToStringConverter.h"
-
-using namespace CalculatorApp::Common;
+#include "CalcManager/Header Files/CalcEngine.h"
+#include "CalcViewModel/Common/AppResourceProvider.h"
 
 using namespace Platform;
 using namespace Windows::Foundation;
 using namespace Windows::UI::Xaml::Interop;
 using namespace Windows::ApplicationModel::Resources;
+
 namespace CalculatorApp
 {
     namespace Converters
diff --git a/src/Calculator/Views/Calculator.xaml.cpp b/src/Calculator/Views/Calculator.xaml.cpp
index 397b361..d8ae99c 100644
--- a/src/Calculator/Views/Calculator.xaml.cpp
+++ b/src/Calculator/Views/Calculator.xaml.cpp
@@ -4,10 +4,11 @@
 #include "pch.h"
 #include "Calculator.xaml.h"
 #include "CalculatorStandardOperators.xaml.h"
-#include "CalcViewModel\Common\CopyPasteManager.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
-#include "CalcViewModel\ViewState.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
+#include "CalcViewModel/Common/TraceLogger.h"
+#include "CalcViewModel/Common/CopyPasteManager.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
+#include "CalcViewModel/ViewState.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
 #include "Memory.xaml.h"
 #include "HistoryList.xaml.h"
 
diff --git a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp
index bfef27e..4c83ba5 100644
--- a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp
+++ b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp
@@ -8,8 +8,9 @@
 
 #include "pch.h"
 #include "CalculatorProgrammerBitFlipPanel.xaml.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
-#include "Converters\BooleanToVisibilityConverter.h"
+#include "CalcViewModel/Common/TraceLogger.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
+#include "Converters/BooleanToVisibilityConverter.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cpp
index 081b9ca..935731e 100644
--- a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cpp
+++ b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cpp
@@ -1,8 +1,9 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
 #include "CalculatorProgrammerDisplayPanel.xaml.h"
+#include "CalcViewModel/Common/TraceLogger.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::ViewModel;
diff --git a/src/Calculator/Views/CalculatorProgrammerOperators.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerOperators.xaml.cpp
index 8a07a45..19b2c08 100644
--- a/src/Calculator/Views/CalculatorProgrammerOperators.xaml.cpp
+++ b/src/Calculator/Views/CalculatorProgrammerOperators.xaml.cpp
@@ -1,10 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
 #include "CalculatorProgrammerOperators.xaml.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
-#include "CalcViewModel\Common\CopyPasteManager.h"
+#include "CalcViewModel/Common/TraceLogger.h"
+#include "CalcViewModel/Common/CopyPasteManager.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp
index a766e33..981b216 100644
--- a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp
+++ b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 //
@@ -8,7 +8,8 @@
 
 #include "pch.h"
 #include "CalculatorScientificAngleButtons.xaml.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "CalcViewModel/Common/TraceLogger.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::ViewModel;
diff --git a/src/Calculator/Views/DateCalculator.xaml.cpp b/src/Calculator/Views/DateCalculator.xaml.cpp
index 8a0b977..be7b737 100644
--- a/src/Calculator/Views/DateCalculator.xaml.cpp
+++ b/src/Calculator/Views/DateCalculator.xaml.cpp
@@ -8,9 +8,10 @@
 
 #include "pch.h"
 #include "DateCalculator.xaml.h"
-#include "CalcViewModel\Common\CopyPasteManager.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
-#include "CalcViewModel\DateCalculatorViewModel.h"
+#include "CalcViewModel/Common/TraceLogger.h"
+#include "CalcViewModel/Common/CopyPasteManager.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
+#include "CalcViewModel/DateCalculatorViewModel.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/Views/MainPage.xaml.cpp b/src/Calculator/Views/MainPage.xaml.cpp
index 4cf229b..a0079dc 100644
--- a/src/Calculator/Views/MainPage.xaml.cpp
+++ b/src/Calculator/Views/MainPage.xaml.cpp
@@ -3,13 +3,14 @@
 
 #include "pch.h"
 #include "MainPage.xaml.h"
-#include "Views\Memory.xaml.h"
-#include "Converters\BooleanToVisibilityConverter.h"
-#include "CalcViewModel\Common\KeyboardShortcutManager.h"
-#include "CalcViewModel\Common\LocalizationService.h"
-#include "CalcViewModel\Common\Automation\NarratorNotifier.h"
-#include "CalcViewModel\Common\AppResourceProvider.h"
-#include "Common\AppLifecycleLogger.h"
+#include "CalcViewModel/Common/TraceLogger.h"
+#include "CalcViewModel/Common/KeyboardShortcutManager.h"
+#include "CalcViewModel/Common/LocalizationService.h"
+#include "CalcViewModel/Common/Automation/NarratorNotifier.h"
+#include "CalcViewModel/Common/AppResourceProvider.h"
+#include "Views/Memory.xaml.h"
+#include "Converters/BooleanToVisibilityConverter.h"
+#include "Common/AppLifecycleLogger.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/Views/StateTriggers/AspectRatioTrigger.h b/src/Calculator/Views/StateTriggers/AspectRatioTrigger.h
index 6ef5ce0..c342dbc 100644
--- a/src/Calculator/Views/StateTriggers/AspectRatioTrigger.h
+++ b/src/Calculator/Views/StateTriggers/AspectRatioTrigger.h
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 /* The AspectRatioTrigger class is a custom trigger for use with a VisualState. The trigger is designed to fire when the
@@ -9,6 +9,8 @@
 
 #pragma once
 
+#include "CalcViewModel/Common/Utils.h"
+
 namespace CalculatorApp::Views::StateTriggers
 {
     public enum class Aspect
diff --git a/src/Calculator/WindowFrameService.cpp b/src/Calculator/WindowFrameService.cpp
index 387a958..0d5339e 100644
--- a/src/Calculator/WindowFrameService.cpp
+++ b/src/Calculator/WindowFrameService.cpp
@@ -3,7 +3,8 @@
 
 #include "pch.h"
 #include "WindowFrameService.h"
-#include "CalcViewModel\Common\KeyboardShortcutManager.h"
+#include "CalcViewModel/Common/KeyboardShortcutManager.h"
+#include "CalcViewModel/Common/TraceLogger.h"
 
 using namespace concurrency;
 using namespace Platform;
diff --git a/src/Calculator/pch.h b/src/Calculator/pch.h
index 06606fa..c393e82 100644
--- a/src/Calculator/pch.h
+++ b/src/Calculator/pch.h
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 //
@@ -42,21 +42,5 @@ namespace StandardPeers = Windows::UI::Xaml::Automation::Peers;
 namespace CalculatorApp::Common::Automation {}
 namespace CustomPeers = CalculatorApp::Common::Automation;
 
-// CalcManager Headers
-#include "CalcManager\CalculatorVector.h"
-#include "CalcManager\ExpressionCommand.h"
-#include "CalcManager\CalculatorResource.h"
-#include "CalcManager\CalculatorManager.h"
-#include "CalcManager\UnitConverter.h"
-
-//CalcViewModel Headers
-#include "CalcViewModel\Common\DelegateCommand.h"
-#include "CalcViewModel\Common\Utils.h"
-#include "CalcViewModel\Common\CalculatorButtonUser.h"
-#include "CalcViewModel\Common\MyVirtualKey.h"
-#include "CalcViewModel\Common\NavCategory.h"
-#include "CalcViewModel\Common\TraceLogger.h"
-
 // Project Headers
-
 #include "App.xaml.h"