Simplify BootstrapperApplication header files

Take this breaking change opportunity to simplify the header files used by
BA devs.

34 files changed, 75 insertions, 154 deletions

diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
index 22099635..4c850cdf 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
@@ -37,8 +37,8 @@
     <file src="v143\x86\mbanative.dll" target="runtimes\win-x86\native" />
 
     <file src="$projectFolder$\..\balutil\inc\*" target="build\native\include" />
-    <file src="$projectFolder$\..\inc\BootstrapperApplication.h" target="build\native\include" />
-    <file src="$projectFolder$\..\inc\BootstrapperEngine.h" target="build\native\include" />
+    <file src="$projectFolder$\..\inc\BootstrapperApplicationTypes.h" target="build\native\include" />
+    <file src="$projectFolder$\..\inc\BootstrapperEngineTypes.h" target="build\native\include" />
     <file src="v141\x86\balutil.lib" target="build\native\v14\x86" />
     <file src="v141\x64\balutil.lib" target="build\native\v14\x64" />
     <file src="v141\ARM64\balutil.lib" target="build\native\v14\ARM64" />
diff --git a/src/api/burn/balutil/balutil.cpp b/src/api/burn/balutil/balutil.cpp
index 7f774b6c..5d8bfa9c 100644
--- a/src/api/burn/balutil/balutil.cpp
+++ b/src/api/burn/balutil/balutil.cpp
@@ -38,7 +38,7 @@ static void MsgProc(
 
 // prototypes
 
-DAPI_(HRESULT) BootstrapperApplicationRun(
+EXTERN_C HRESULT __stdcall BootstrapperApplicationRun(
     __in IBootstrapperApplication* pApplication
     )
 {
diff --git a/src/api/burn/balutil/balutil.vcxproj b/src/api/burn/balutil/balutil.vcxproj
index 7d539b5b..2b0fd23f 100644
--- a/src/api/burn/balutil/balutil.vcxproj
+++ b/src/api/burn/balutil/balutil.vcxproj
@@ -63,7 +63,7 @@
     <ClCompile Include="msg.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="inc\BalBaseBootstrapperApplication.h" />
+    <ClInclude Include="inc\BootstrapperApplicationBase.h" />
     <ClInclude Include="inc\balcondition.h" />
     <ClInclude Include="inc\balinfo.h" />
     <ClInclude Include="inc\balretry.h" />
diff --git a/src/api/burn/balutil/inc/BootstrapperApplication.h b/src/api/burn/balutil/inc/BootstrapperApplication.h
new file mode 100644
index 00000000..d11fccf0
--- /dev/null
+++ b/src/api/burn/balutil/inc/BootstrapperApplication.h
@@ -0,0 +1,21 @@
+#pragma once
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+#include "IBootstrapperApplication.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/*******************************************************************
+ BootstrapperApplicationRun - runs the IBootstrapperApplication until
+                              the application quits.
+
+********************************************************************/
+HRESULT __stdcall BootstrapperApplicationRun(
+    __in IBootstrapperApplication* pApplication
+    );
+
+#if defined(__cplusplus)
+}
+#endif
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h b/src/api/burn/balutil/inc/BootstrapperApplicationBase.h
index 09f1f7a2..a3a3643f 100644
--- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
+++ b/src/api/burn/balutil/inc/BootstrapperApplicationBase.h
@@ -9,9 +9,9 @@
 #include "balinfo.h"
 #include "balretry.h"
 
-#define CBalBaseBootstrapperApplication CBootstrapperApplication
+#define CBalBaseBootstrapperApplication CBootstrapperApplicationBase
 
-class CBootstrapperApplication : public IBootstrapperApplication
+class CBootstrapperApplicationBase : public IBootstrapperApplication
 {
 public: // IUnknown
     virtual STDMETHODIMP QueryInterface(
@@ -1187,7 +1187,7 @@ protected:
         return m_fCanceled;
     }
 
-    CBalBaseBootstrapperApplication(
+    CBootstrapperApplicationBase(
         __in DWORD dwRetryCount = 0,
         __in DWORD dwRetryTimeout = 1000
         )
@@ -1208,7 +1208,7 @@ protected:
         BalRetryInitialize(dwRetryCount, dwRetryTimeout);
     }
 
-    virtual ~CBalBaseBootstrapperApplication()
+    virtual ~CBootstrapperApplicationBase()
     {
         BalInfoUninitializeCommandLine(&m_BalInfoCommand);
         BalRetryUninitialize();
diff --git a/src/api/burn/balutil/inc/IBootstrapperApplication.h b/src/api/burn/balutil/inc/IBootstrapperApplication.h
index 3f57f095..a08f6863 100644
--- a/src/api/burn/balutil/inc/IBootstrapperApplication.h
+++ b/src/api/burn/balutil/inc/IBootstrapperApplication.h
@@ -1,8 +1,8 @@
 #pragma once
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-#include <BootstrapperApplication.h>
-#include <IBootstrapperEngine.h>
+#include "BootstrapperApplicationTypes.h"
+#include "IBootstrapperEngine.h"
 
 DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-AB06-099D717C67FE")
 {
diff --git a/src/api/burn/balutil/inc/IBootstrapperEngine.h b/src/api/burn/balutil/inc/IBootstrapperEngine.h
index ef3b9812..02094aa5 100644
--- a/src/api/burn/balutil/inc/IBootstrapperEngine.h
+++ b/src/api/burn/balutil/inc/IBootstrapperEngine.h
@@ -1,7 +1,7 @@
 #pragma once
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-#include "BootstrapperEngine.h"
+#include "BootstrapperEngineTypes.h"
 
 DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-81512C29C2FB")
 {
diff --git a/src/api/burn/balutil/inc/balutil.h b/src/api/burn/balutil/inc/balutil.h
index d77b3599..32190b56 100644
--- a/src/api/burn/balutil/inc/balutil.h
+++ b/src/api/burn/balutil/inc/balutil.h
@@ -43,15 +43,6 @@ static const HRESULT E_PREREQBA_INFINITE_LOOP = MAKE_HRESULT(SEVERITY_ERROR, FAC
 
 
 /*******************************************************************
- BootstrapperApplicationRun - runs the IBootstrapperApplication until
-                              the application quits.
-
-********************************************************************/
-DAPI_(HRESULT) BootstrapperApplicationRun(
-    __in IBootstrapperApplication* pApplication
-    );
-
-/*******************************************************************
  BalDebuggerCheck - allows bootstrapper application to explicitly check
         whether a debugger should be attached to the boostrapper application.
 
diff --git a/src/api/burn/balutil/precomp.h b/src/api/burn/balutil/precomp.h
index 753bc21f..3123143e 100644
--- a/src/api/burn/balutil/precomp.h
+++ b/src/api/burn/balutil/precomp.h
@@ -30,7 +30,7 @@
 #include <thmutil.h>
 #include <xmlutil.h>
 
-#include "IBootstrapperApplication.h"
+#include "BootstrapperApplication.h"
 
 #include "balutil.h"
 #include "BalBootstrapperEngine.h"
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec
index c710f424..436c0028 100644
--- a/src/api/burn/bextutil/bextutil.nuspec
+++ b/src/api/burn/bextutil/bextutil.nuspec
@@ -21,8 +21,8 @@
     <file src="$projectFolder$\build\$id$.props" target="build\" />
     <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
-    <file src="$projectFolder$\..\inc\BootstrapperExtension.h" target="build\native\include" />
-    <file src="$projectFolder$\..\inc\BootstrapperExtensionEngine.h" target="build\native\include" />
+    <file src="$projectFolder$\..\inc\BootstrapperExtensionTypes.h" target="build\native\include" />
+    <file src="$projectFolder$\..\inc\BootstrapperExtensionEngineTypes.h" target="build\native\include" />
     <file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" />
     <file src="..\..\v141\x64\bextutil.lib" target="build\native\v14\x64" />
     <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
diff --git a/src/api/burn/bextutil/inc/IBootstrapperExtension.h b/src/api/burn/bextutil/inc/IBootstrapperExtension.h
index 4005a9fd..19df0516 100644
--- a/src/api/burn/bextutil/inc/IBootstrapperExtension.h
+++ b/src/api/burn/bextutil/inc/IBootstrapperExtension.h
@@ -1,7 +1,7 @@
 #pragma once
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-#include <BootstrapperExtension.h>
+#include "BootstrapperExtensionTypes.h"
 
 DECLARE_INTERFACE_IID_(IBootstrapperExtension, IUnknown, "93123C9D-796B-4FCD-A507-6EDEF9A925FD")
 {
diff --git a/src/api/burn/bextutil/inc/IBootstrapperExtensionEngine.h b/src/api/burn/bextutil/inc/IBootstrapperExtensionEngine.h
index b23a57b7..a78868f2 100644
--- a/src/api/burn/bextutil/inc/IBootstrapperExtensionEngine.h
+++ b/src/api/burn/bextutil/inc/IBootstrapperExtensionEngine.h
@@ -1,7 +1,7 @@
 #pragma once
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-#include <BootstrapperExtensionEngine.h>
+#include "BootstrapperExtensionEngineTypes.h"
 
 DECLARE_INTERFACE_IID_(IBootstrapperExtensionEngine, IUnknown, "9D027A39-F6B6-42CC-9737-C185089EB263")
 {
diff --git a/src/api/burn/inc/BootstrapperApplication.h b/src/api/burn/inc/BootstrapperApplicationTypes.h
index 8b945b77..c7eaa3d3 100644
--- a/src/api/burn/inc/BootstrapperApplication.h
+++ b/src/api/burn/inc/BootstrapperApplicationTypes.h
@@ -1,7 +1,7 @@
 #pragma once
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-#include "BootstrapperEngine.h"
+#include "BootstrapperEngineTypes.h"
 
 #if defined(__cplusplus)
 extern "C" {
@@ -1535,57 +1535,6 @@ struct BA_ONUNREGISTERCOMPLETE_RESULTS
     DWORD dwApiVersion;
 };
 
-#ifdef TODO_DELETE
-
-extern "C" typedef HRESULT(WINAPI *PFN_BOOTSTRAPPER_APPLICATION_PROC)(
-    __in BOOTSTRAPPER_APPLICATION_MESSAGE message,
-    __in const LPVOID pvArgs,
-    __inout LPVOID pvResults,
-    __in_opt LPVOID pvContext
-    );
-
-struct BOOTSTRAPPER_DESTROY_ARGS
-{
-    DWORD dwApiVersion;
-    BOOL fReload;
-};
-
-struct BOOTSTRAPPER_DESTROY_RESULTS
-{
-    DWORD dwApiVersion;
-    BOOL fDisableUnloading; // indicates the BA dll must not be unloaded after BootstrapperApplicationDestroy.
-};
-
-extern "C" typedef void (WINAPI *PFN_BOOTSTRAPPER_APPLICATION_DESTROY)(
-    __in const BOOTSTRAPPER_DESTROY_ARGS* pArgs,
-    __inout BOOTSTRAPPER_DESTROY_RESULTS* pResults
-    );
-
-
-
-struct BOOTSTRAPPER_CREATE_ARGS
-{
-    DWORD dwApiVersion;
-    DWORD64 qwEngineAPIVersion;
-    PFN_BOOTSTRAPPER_ENGINE_PROC pfnBootstrapperEngineProc;
-    LPVOID pvBootstrapperEngineProcContext;
-    BOOTSTRAPPER_COMMAND* pCommand;
-};
-
-struct BOOTSTRAPPER_CREATE_RESULTS
-{
-    DWORD dwApiVersion;
-    PFN_BOOTSTRAPPER_APPLICATION_PROC pfnBootstrapperApplicationProc;
-    LPVOID pvBootstrapperApplicationProcContext;
-};
-
-extern "C" typedef HRESULT(WINAPI *PFN_BOOTSTRAPPER_APPLICATION_CREATE)(
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
-    );
-
-#endif
-
 #if defined(__cplusplus)
 }
 #endif
diff --git a/src/api/burn/inc/BootstrapperEngine.h b/src/api/burn/inc/BootstrapperEngineTypes.h
index 7af41d97..e2634383 100644
--- a/src/api/burn/inc/BootstrapperEngine.h
+++ b/src/api/burn/inc/BootstrapperEngineTypes.h
@@ -448,13 +448,6 @@ typedef struct _BAENGINE_GETRELATEDBUNDLEVARIABLE_RESULTS
     DWORD cchValue;
 } BAENGINE_GETRELATEDBUNDLEVARIABLE_RESULTS;
 
-// extern "C" typedef HRESULT(WINAPI *PFN_BOOTSTRAPPER_ENGINE_PROC)(
-//     __in BOOTSTRAPPER_ENGINE_MESSAGE message,
-//     __in const LPVOID pvArgs,
-//     __inout LPVOID pvResults,
-//     __in_opt LPVOID pvContext
-//     );
-
 #if defined(__cplusplus)
 }
 #endif
diff --git a/src/api/burn/inc/BootstrapperExtensionEngine.h b/src/api/burn/inc/BootstrapperExtensionEngineTypes.h
index 24c304c6..24c304c6 100644
--- a/src/api/burn/inc/BootstrapperExtensionEngine.h
+++ b/src/api/burn/inc/BootstrapperExtensionEngineTypes.h
diff --git a/src/api/burn/inc/BootstrapperExtension.h b/src/api/burn/inc/BootstrapperExtensionTypes.h
index b1fa6408..4d45b59d 100644
--- a/src/api/burn/inc/BootstrapperExtension.h
+++ b/src/api/burn/inc/BootstrapperExtensionTypes.h
@@ -1,7 +1,7 @@
 #pragma once
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-#include <BootstrapperExtensionEngine.h>
+#include "BootstrapperExtensionEngineTypes.h"
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/src/api/burn/test/BalUtilUnitTest/TestBootstrapperApplication.cpp b/src/api/burn/test/BalUtilUnitTest/TestBootstrapperApplication.cpp
index b345ab9f..d0b38064 100644
--- a/src/api/burn/test/BalUtilUnitTest/TestBootstrapperApplication.cpp
+++ b/src/api/burn/test/BalUtilUnitTest/TestBootstrapperApplication.cpp
@@ -1,12 +1,11 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
 #include "precomp.h"
-#include "BalBaseBootstrapperApplication.h"
 
-class CTestBootstrapperApplication : public CBalBaseBootstrapperApplication
+class CTestBootstrapperApplication : public CBootstrapperApplicationBase
 {
 public:
-    CTestBootstrapperApplication() : CBalBaseBootstrapperApplication()
+    CTestBootstrapperApplication() : CBootstrapperApplicationBase()
     {
     }
 };
diff --git a/src/api/burn/test/BalUtilUnitTest/precomp.h b/src/api/burn/test/BalUtilUnitTest/precomp.h
index 78add593..0edf4664 100644
--- a/src/api/burn/test/BalUtilUnitTest/precomp.h
+++ b/src/api/burn/test/BalUtilUnitTest/precomp.h
@@ -15,9 +15,7 @@
 #include <dutil.h>
 #include <dictutil.h>
 
-#include <IBootstrapperApplication.h>
-#include <balutil.h>
-#include <balretry.h>
+#include <BootstrapperApplicationBase.h>
 
 #include "TestBootstrapperApplication.h"
 
diff --git a/src/burn/engine/engine.vcxproj b/src/burn/engine/engine.vcxproj
index c4b64c36..7e2e80b6 100644
--- a/src/burn/engine/engine.vcxproj
+++ b/src/burn/engine/engine.vcxproj
@@ -101,10 +101,10 @@
   <ItemGroup>
     <ClInclude Include="apply.h" />
     <ClInclude Include="approvedexe.h" />
-    <ClInclude Include="..\..\api\burn\inc\BootstrapperApplication.h" />
-    <ClInclude Include="..\..\api\burn\inc\BootstrapperEngine.h" />
-    <ClInclude Include="..\..\api\burn\inc\BootstrapperExtension.h" />
-    <ClInclude Include="..\..\api\burn\inc\BootstrapperExtensionEngine.h" />
+    <ClInclude Include="..\..\api\burn\inc\BootstrapperApplicationTypes.h" />
+    <ClInclude Include="..\..\api\burn\inc\BootstrapperEngineTypes.h" />
+    <ClInclude Include="..\..\api\burn\inc\BootstrapperExtensionTypes.h" />
+    <ClInclude Include="..\..\api\burn\inc\BootstrapperExtensionEngineTypes.h" />
     <ClInclude Include="ba.h" />
     <ClInclude Include="bacallback.h" />
     <ClInclude Include="bundlepackageengine.h" />
diff --git a/src/burn/engine/precomp.h b/src/burn/engine/precomp.h
index 72c1e789..3ee32fb0 100644
--- a/src/burn/engine/precomp.h
+++ b/src/burn/engine/precomp.h
@@ -61,8 +61,8 @@
 #include <dpiutil.h>
 #include <butil.h>
 
-#include "BootstrapperApplication.h"
-#include "BootstrapperExtension.h"
+#include "BootstrapperApplicationTypes.h"
+#include "BootstrapperExtensionTypes.h"
 
 #include "platform.h"
 #include "variant.h"
diff --git a/src/burn/test/BurnUnitTest/precomp.h b/src/burn/test/BurnUnitTest/precomp.h
index d0105107..f07f5968 100644
--- a/src/burn/test/BurnUnitTest/precomp.h
+++ b/src/burn/test/BurnUnitTest/precomp.h
@@ -37,8 +37,8 @@
 #include <deputil.h>
 #include <butil.h>
 
-#include "BootstrapperApplication.h"
-#include "BootstrapperExtension.h"
+#include "BootstrapperApplicationTypes.h"
+#include "BootstrapperExtensionTypes.h"
 
 #include "platform.h"
 #include "variant.h"
diff --git a/src/ext/Bal/Samples/bafunctions/precomp.h b/src/ext/Bal/Samples/bafunctions/precomp.h
index 542ac606..4e88a4a0 100644
--- a/src/ext/Bal/Samples/bafunctions/precomp.h
+++ b/src/ext/Bal/Samples/bafunctions/precomp.h
@@ -34,12 +34,7 @@
 //#include "xmlutil.h"
 #include "regutil.h"
 
-//#include "IBootstrapperApplication.h"
-
-#include "BalBaseBootstrapperApplication.h"
-//#include "balinfo.h"
-//#include "balcondition.h"
-#include "balutil.h"
+#include "BootstrapperApplicationBase.h"
 
 #include "BAFunctions.h"
 #include "IBAFunctions.h"
diff --git a/src/ext/Bal/stdbas/WixInternalUIBootstrapperApplication.cpp b/src/ext/Bal/stdbas/WixInternalUIBootstrapperApplication.cpp
index a8967a31..23db7c5f 100644
--- a/src/ext/Bal/stdbas/WixInternalUIBootstrapperApplication.cpp
+++ b/src/ext/Bal/stdbas/WixInternalUIBootstrapperApplication.cpp
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
 #include "precomp.h"
-#include "BalBaseBootstrapperApplication.h"
 
 static const LPCWSTR WIXIUIBA_WINDOW_CLASS = L"WixInternalUIBA";
 
@@ -15,10 +14,10 @@ enum WM_WIXIUIBA
 };
 
 
-class CWixInternalUIBootstrapperApplication : public CBalBaseBootstrapperApplication
+class CWixInternalUIBootstrapperApplication : public CBootstrapperApplicationBase
 {
 public: // IBootstrapperApplication
-    STDMETHODIMP OnCreate(
+    virtual STDMETHODIMP OnCreate(
         __in IBootstrapperEngine* pEngine,
         __in BOOTSTRAPPER_COMMAND* pCommand
     )
@@ -26,7 +25,7 @@ public: // IBootstrapperApplication
         HRESULT hr = S_OK;
 
         hr = __super::OnCreate(pEngine, pCommand);
-        BalExitOnFailure(hr, "CBalBaseBootstrapperApplication initialization failed.");
+        BalExitOnFailure(hr, "CBootstrapperApplicationBase initialization failed.");
 
         m_commandAction = pCommand->action;
         m_commandDisplay = pCommand->display;
@@ -794,7 +793,7 @@ public:
     //
     CWixInternalUIBootstrapperApplication(
         __in HMODULE hModule
-        ) : CBalBaseBootstrapperApplication(3, 3000)
+        ) : CBootstrapperApplicationBase(3, 3000)
     {
         m_hModule = hModule;
         m_commandAction = BOOTSTRAPPER_ACTION_UNKNOWN;
diff --git a/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
index 233cabbc..c86a4a1d 100644
--- a/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
+++ b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
 #include "precomp.h"
-#include "BalBaseBootstrapperApplication.h"
 
 static const LPCWSTR WIXBUNDLE_VARIABLE_CANRESTART = L"WixCanRestart";
 static const LPCWSTR WIXBUNDLE_VARIABLE_ELEVATED = L"WixBundleElevated";
@@ -178,10 +177,10 @@ static LPCSTR LoggingMsiFeatureStateToString(
     );
 
 
-class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplication
+class CWixStandardBootstrapperApplication : public CBootstrapperApplicationBase
 {
 public: // IBootstrapperApplication
-    STDMETHODIMP OnCreate(
+    virtual STDMETHODIMP OnCreate(
         __in IBootstrapperEngine* pEngine,
         __in BOOTSTRAPPER_COMMAND* pCommand
     )
@@ -189,7 +188,7 @@ public: // IBootstrapperApplication
         HRESULT hr = S_OK;
 
         hr = __super::OnCreate(pEngine, pCommand);
-        BalExitOnFailure(hr, "CBalBaseBootstrapperApplication initialization failed.");
+        BalExitOnFailure(hr, "CBootstrapperApplicationBase initialization failed.");
 
         m_commandAction = pCommand->action;
         m_commandDisplay = pCommand->display;
@@ -388,7 +387,7 @@ public: // IBootstrapperApplication
         }
 
     LExit:
-        return CBalBaseBootstrapperApplication::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, pfCancel);
+        return CBootstrapperApplicationBase::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, pfCancel);
     }
 
 
@@ -563,7 +562,7 @@ public: // IBootstrapperApplication
             *pRequestedType = BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE_NONE;
         }
 
-        return CBalBaseBootstrapperApplication::OnPlanRelatedBundleType(wzBundleId, recommendedType, pRequestedType, pfCancel);
+        return CBootstrapperApplicationBase::OnPlanRelatedBundleType(wzBundleId, recommendedType, pRequestedType, pfCancel);
     }
 
 
@@ -633,7 +632,7 @@ public: // IBootstrapperApplication
             }
         }
 
-        return CBalBaseBootstrapperApplication::OnPlanPackageBegin(wzPackageId, state, fCached, installCondition, repairCondition, recommendedState, recommendedCacheType, pRequestState, pRequestedCacheType, pfCancel);
+        return CBootstrapperApplicationBase::OnPlanPackageBegin(wzPackageId, state, fCached, installCondition, repairCondition, recommendedState, recommendedCacheType, pRequestState, pRequestedCacheType, pfCancel);
     }
 
 
@@ -4778,7 +4777,7 @@ public:
     CWixStandardBootstrapperApplication(
         __in HMODULE hModule,
         __in BOOL fRunAsPrereqBA
-        ) : CBalBaseBootstrapperApplication(3, 3000)
+        ) : CBootstrapperApplicationBase(3, 3000)
     {
         THEME_ASSIGN_CONTROL_ID* pAssignControl = NULL;
         DWORD dwAutomaticBehaviorType = THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_ENABLED | THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_VISIBLE | THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_ACTION | THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_VALUE;
diff --git a/src/ext/Bal/stdbas/precomp.h b/src/ext/Bal/stdbas/precomp.h
index 00d0d03f..a6c4cfe4 100644
--- a/src/ext/Bal/stdbas/precomp.h
+++ b/src/ext/Bal/stdbas/precomp.h
@@ -36,13 +36,9 @@
 #include <uriutil.h>
 #include <xmlutil.h>
 
-#include <IBootstrapperApplication.h>
-
-#include <balutil.h>
-#include <balinfo.h>
-#include <balcondition.h>
-
+#include <BootstrapperApplicationBase.h>
 #include <BAFunctions.h>
+#include <balcondition.h>
 
 #include "stdbas.messages.h"
 #include "WixStandardBootstrapperApplication.h"
diff --git a/src/ext/Bal/test/WixStdFnUnitTest/TestBootstrapperApplication.cpp b/src/ext/Bal/test/WixStdFnUnitTest/TestBootstrapperApplication.cpp
index b345ab9f..d0b38064 100644
--- a/src/ext/Bal/test/WixStdFnUnitTest/TestBootstrapperApplication.cpp
+++ b/src/ext/Bal/test/WixStdFnUnitTest/TestBootstrapperApplication.cpp
@@ -1,12 +1,11 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
 #include "precomp.h"
-#include "BalBaseBootstrapperApplication.h"
 
-class CTestBootstrapperApplication : public CBalBaseBootstrapperApplication
+class CTestBootstrapperApplication : public CBootstrapperApplicationBase
 {
 public:
-    CTestBootstrapperApplication() : CBalBaseBootstrapperApplication()
+    CTestBootstrapperApplication() : CBootstrapperApplicationBase()
     {
     }
 };
diff --git a/src/ext/Bal/test/WixStdFnUnitTest/precomp.h b/src/ext/Bal/test/WixStdFnUnitTest/precomp.h
index 4cdd262c..23bc7a6c 100644
--- a/src/ext/Bal/test/WixStdFnUnitTest/precomp.h
+++ b/src/ext/Bal/test/WixStdFnUnitTest/precomp.h
@@ -15,10 +15,8 @@
 #include <dutil.h>
 #include <dictutil.h>
 
-#include <IBootstrapperApplication.h>
+#include <BootstrapperApplicationBase.h>
 #include <IBAFunctions.h>
-#include <balutil.h>
-#include <balretry.h>
 
 #include "TestBAFunctions.h"
 #include "TestBootstrapperApplication.h"
diff --git a/src/ext/Bal/wixiuiba/precomp.h b/src/ext/Bal/wixiuiba/precomp.h
index 782c0b1b..a4ce6776 100644
--- a/src/ext/Bal/wixiuiba/precomp.h
+++ b/src/ext/Bal/wixiuiba/precomp.h
@@ -15,10 +15,6 @@
 #include <strutil.h>
 #include <xmlutil.h>
 
-#include <IBootstrapperApplication.h>
-
-#include <balutil.h>
-#include <balinfo.h>
-#include <balcondition.h>
+#include <BootstrapperApplication.h>
 
 #include "WixInternalUIBootstrapperApplication.h"
diff --git a/src/ext/Bal/wixprqba/precomp.h b/src/ext/Bal/wixprqba/precomp.h
index a47f411b..b6178be3 100644
--- a/src/ext/Bal/wixprqba/precomp.h
+++ b/src/ext/Bal/wixprqba/precomp.h
@@ -35,12 +35,7 @@
 #include <uriutil.h>
 #include <xmlutil.h>
 
-#include <IBootstrapperApplication.h>
-
-#include <balutil.h>
-#include <balinfo.h>
-#include <balcondition.h>
-
+#include <BootstrapperApplication.h>
 #include <BAFunctions.h>
 
 #include "WixStandardBootstrapperApplication.h"
diff --git a/src/ext/Bal/wixstdba/precomp.h b/src/ext/Bal/wixstdba/precomp.h
index a47f411b..66c5152d 100644
--- a/src/ext/Bal/wixstdba/precomp.h
+++ b/src/ext/Bal/wixstdba/precomp.h
@@ -35,12 +35,8 @@
 #include <uriutil.h>
 #include <xmlutil.h>
 
-#include <IBootstrapperApplication.h>
-
+#include <BootstrapperApplication.h>
 #include <balutil.h>
-#include <balinfo.h>
-#include <balcondition.h>
-
 #include <BAFunctions.h>
 
 #include "WixStandardBootstrapperApplication.h"
diff --git a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/precomp.h b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/precomp.h
index 2e14786a..95a015ab 100644
--- a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/precomp.h
+++ b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/precomp.h
@@ -30,8 +30,7 @@
 #include "regutil.h"
 #include "xmlutil.h"
 
-#include "BalBaseBootstrapperApplication.h"
-#include "balutil.h"
+#include <BootstrapperApplicationBase.h>
 
 #include "BAFunctions.h"
 #include "IBAFunctions.h"
diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/precomp.h b/src/test/burn/TestData/Manual/BafThmutilTesting/precomp.h
index 2e14786a..95a015ab 100644
--- a/src/test/burn/TestData/Manual/BafThmutilTesting/precomp.h
+++ b/src/test/burn/TestData/Manual/BafThmutilTesting/precomp.h
@@ -30,8 +30,7 @@
 #include "regutil.h"
 #include "xmlutil.h"
 
-#include "BalBaseBootstrapperApplication.h"
-#include "balutil.h"
+#include <BootstrapperApplicationBase.h>
 
 #include "BAFunctions.h"
 #include "IBAFunctions.h"
diff --git a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp
index 5e26faac..1eaebe63 100644
--- a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp
+++ b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp
@@ -9,7 +9,7 @@ class CPrereqBaf : public CBalBaseBAFunctions
 public: // IBAFunctions
 
 public: //IBootstrapperApplication
-    STDMETHODIMP OnCreate(
+    virtual STDMETHODIMP OnCreate(
         __in IBootstrapperEngine* pEngine,
         __in BOOTSTRAPPER_COMMAND* pCommand
     )
@@ -17,7 +17,7 @@ public: //IBootstrapperApplication
         HRESULT hr = S_OK;
 
         hr = __super::OnCreate(pEngine, pCommand);
-        ExitOnFailure(hr, "CBalBaseBootstrapperApplication initialization failed.");
+        ExitOnFailure(hr, "CPrereqBaf initialization failed.");
 
         hr = StrAllocString(&m_sczBARuntimeDirectory, pCommand->wzBootstrapperWorkingFolder, 0);
         ExitOnFailure(hr, "Failed to copy working folder");
diff --git a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/precomp.h b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/precomp.h
index 8320bdd8..f39f9de7 100644
--- a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/precomp.h
+++ b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/precomp.h
@@ -18,8 +18,7 @@
 #include "pathutil.h"
 #include "strutil.h"
 
-#include "BalBaseBootstrapperApplication.h"
-#include "balutil.h"
+#include <BootstrapperApplicationBase.h>
 
 #include "BAFunctions.h"
 #include "IBAFunctions.h"