6 files changed, 13 insertions, 14 deletions

diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctions.h b/src/api/burn/balutil/inc/BalBaseBAFunctions.h
index 33b71324..df0b7006 100644
--- a/src/api/burn/balutil/inc/BalBaseBAFunctions.h
+++ b/src/api/burn/balutil/inc/BalBaseBAFunctions.h
@@ -4,7 +4,7 @@
 #include <windows.h>
 #include <msiquery.h>
 
-#include <batypes.h>
+#include <BootstrapperApplication.h>
 
 #include "IBAFunctions.h"
 
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
index 30c75fb6..09f1f7a2 100644
--- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
+++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
@@ -3,7 +3,6 @@
 #include <windows.h>
 #include <msiquery.h>
 
-#include "IBootstrapperEngine.h"
 #include "IBootstrapperApplication.h"
 
 #include "balutil.h"
diff --git a/src/api/burn/balutil/inc/IBAFunctions.h b/src/api/burn/balutil/inc/IBAFunctions.h
index b0afabb3..42b64f9b 100644
--- a/src/api/burn/balutil/inc/IBAFunctions.h
+++ b/src/api/burn/balutil/inc/IBAFunctions.h
@@ -3,6 +3,7 @@
 
 
 #include "IBootstrapperApplication.h"
+#include "BAFunctions.h"
 
 DECLARE_INTERFACE_IID_(IBAFunctions, IBootstrapperApplication, "0FB445ED-17BD-49C7-BE19-479776F8AE96")
 {
diff --git a/src/api/burn/balutil/inc/IBootstrapperApplication.h b/src/api/burn/balutil/inc/IBootstrapperApplication.h
index 6eb32ee6..3f57f095 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 <batypes.h>
-
+#include <BootstrapperApplication.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 3c1afb77..ef3b9812 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 <baenginetypes.h>
+#include "BootstrapperEngine.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 4f8cb23d..d77b3599 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
 
 
 /*******************************************************************
- BootstrapperApplicationDebuggerCheck - allows bootstrapper application to
-        explicitly check whether a debugger should be attached to the boostrapper
-        application.
-
- Note: Automatically called in BootstrapperApplicationRun().
-********************************************************************/
-DAPI_(VOID) BootstrapperApplicationDebuggerCheck();
-
-/*******************************************************************
  BootstrapperApplicationRun - runs the IBootstrapperApplication until
                               the application quits.
 
@@ -61,6 +52,14 @@ DAPI_(HRESULT) BootstrapperApplicationRun(
     );
 
 /*******************************************************************
+ BalDebuggerCheck - allows bootstrapper application to explicitly check
+        whether a debugger should be attached to the boostrapper application.
+
+ Note: Automatically called in BootstrapperApplicationRun().
+********************************************************************/
+DAPI_(VOID) BalDebuggerCheck();
+
+/*******************************************************************
  BalInitialize - remembers the engine interface to enable logging and
                  other functions.