diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp
index 68a017cbb0..129fcd27d8 100644
--- a/src/openrct2-ui/windows/MazeConstruction.cpp
+++ b/src/openrct2-ui/windows/MazeConstruction.cpp
@@ -33,6 +33,7 @@
 #include <openrct2/world/tile_element/EntranceElement.h>
 
 using OpenRCT2::GameActions::CommandFlag;
+using OpenRCT2::GameActions::CommandFlags;
 
 namespace OpenRCT2::Ui::Windows
 {
diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp
index 0d0fcdeca0..ed30e23859 100644
--- a/src/openrct2-ui/windows/RideConstruction.cpp
+++ b/src/openrct2-ui/windows/RideConstruction.cpp
@@ -66,6 +66,7 @@ constexpr uint8_t kVerticalDropButtonStart = 6;
 using namespace OpenRCT2::Numerics;
 using namespace OpenRCT2::TrackMetaData;
 using OpenRCT2::GameActions::CommandFlag;
+using OpenRCT2::GameActions::CommandFlags;
 
 namespace OpenRCT2::Ui::Windows
 {
diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp
index 8521d01700..08c4278ed9 100644
--- a/src/openrct2-ui/windows/TrackDesignPlace.cpp
+++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp
@@ -41,6 +41,7 @@
 using namespace OpenRCT2::Numerics;
 using namespace OpenRCT2::TrackMetaData;
 using OpenRCT2::GameActions::CommandFlag;
+using OpenRCT2::GameActions::CommandFlags;
 
 namespace OpenRCT2::Ui::Windows
 {
diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp
index ae43b75cb9..ec854a4903 100644
--- a/src/openrct2/management/Finance.cpp
+++ b/src/openrct2/management/Finance.cpp
@@ -29,6 +29,7 @@
 
 using namespace OpenRCT2;
 using OpenRCT2::GameActions::CommandFlag;
+using OpenRCT2::GameActions::CommandFlags;
 
 // Monthly research funding costs
 const money64 kResearchCosts[RESEARCH_FUNDING_COUNT] = {
diff --git a/src/openrct2/management/Finance.h b/src/openrct2/management/Finance.h
index 88c2329964..7cf390a1c3 100644
--- a/src/openrct2/management/Finance.h
+++ b/src/openrct2/management/Finance.h
@@ -13,8 +13,6 @@
 #include "../core/Money.hpp"
 #include "Research.h"
 
-using OpenRCT2::GameActions::CommandFlags;
-
 enum class ExpenditureType : int32_t
 {
     rideConstruction = 0,
@@ -41,8 +39,8 @@ constexpr uint8_t kMaxBankLoanInterestRate = 255;
 
 extern const money64 kResearchCosts[RESEARCH_FUNDING_COUNT];
 
-bool FinanceCheckMoneyRequired(CommandFlags flags);
-bool FinanceCheckAffordability(money64 cost, CommandFlags flags);
+bool FinanceCheckMoneyRequired(OpenRCT2::GameActions::CommandFlags flags);
+bool FinanceCheckAffordability(money64 cost, OpenRCT2::GameActions::CommandFlags flags);
 void FinancePayment(money64 amount, ExpenditureType type);
 void FinancePayWages();
 void FinancePayResearch();
diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp
index 808df4930e..9846311e7e 100644
--- a/src/openrct2/ride/RideConstruction.cpp
+++ b/src/openrct2/ride/RideConstruction.cpp
@@ -51,6 +51,7 @@
 using namespace OpenRCT2;
 using namespace OpenRCT2::TrackMetaData;
 using OpenRCT2::GameActions::CommandFlag;
+using OpenRCT2::GameActions::CommandFlags;
 
 money64 _currentTrackPrice;
 
diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp
index 930e8cda1c..a7583fceb3 100644
--- a/src/openrct2/ride/TrackDesign.cpp
+++ b/src/openrct2/ride/TrackDesign.cpp
@@ -77,6 +77,7 @@
 
 using namespace OpenRCT2;
 using OpenRCT2::GameActions::CommandFlag;
+using OpenRCT2::GameActions::CommandFlags;
 
 namespace OpenRCT2::TrackDesignSceneryElementFlags
 {
diff --git a/src/openrct2/ride/TrackDesign.h b/src/openrct2/ride/TrackDesign.h
index ab17d53b4e..a4ec9fb4ab 100644
--- a/src/openrct2/ride/TrackDesign.h
+++ b/src/openrct2/ride/TrackDesign.h
@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../Limits.h"
+#include "../actions/CommandFlag.h"
 #include "../actions/GameActionResult.h"
 #include "../core/EnumUtils.hpp"
 #include "../object/Object.h"
@@ -238,7 +239,7 @@ extern RideId gTrackDesignSaveRideIndex;
 void TrackDesignMirror(TrackDesign& td);
 
 OpenRCT2::GameActions::Result TrackDesignPlace(
-    const TrackDesign& td, CommandFlags flags, bool placeScenery, Ride& ride, const CoordsXYZD& coords);
+    const TrackDesign& td, OpenRCT2::GameActions::CommandFlags flags, bool placeScenery, Ride& ride, const CoordsXYZD& coords);
 void TrackDesignPreviewRemoveGhosts(const TrackDesign& td, Ride& ride, const CoordsXYZD& coords);
 void TrackDesignPreviewDrawOutlines(
     TrackDesignState& tds, const TrackDesign& td, Ride& ride, const CoordsXYZD& coords, bool placeScenery);
diff --git a/src/openrct2/world/ConstructionClearance.cpp b/src/openrct2/world/ConstructionClearance.cpp
index cae70b1a07..9dbcdaa78d 100644
--- a/src/openrct2/world/ConstructionClearance.cpp
+++ b/src/openrct2/world/ConstructionClearance.cpp
@@ -35,6 +35,7 @@
 
 using namespace OpenRCT2;
 using OpenRCT2::GameActions::CommandFlag;
+using OpenRCT2::GameActions::CommandFlags;
 
 static bool MapPlaceClearFunc(
     TileElement** tile_element, const CoordsXY& coords, CommandFlags flags, money64* price, bool is_scenery)
diff --git a/src/openrct2/world/ConstructionClearance.h b/src/openrct2/world/ConstructionClearance.h
index c993f5b57b..8b0a06b2e3 100644
--- a/src/openrct2/world/ConstructionClearance.h
+++ b/src/openrct2/world/ConstructionClearance.h
@@ -25,7 +25,7 @@ struct CoordsXYRangedZ;
 class QuarterTile;
 
 using ClearingFunction = bool (&)(
-    OpenRCT2::TileElement** tile_element, const CoordsXY& coords, CommandFlags flags, money64* price);
+    OpenRCT2::TileElement** tile_element, const CoordsXY& coords, OpenRCT2::GameActions::CommandFlags flags, money64* price);
 
 enum
 {
@@ -45,8 +45,9 @@ enum class CreateCrossingMode
 };
 
 bool MapPlaceNonSceneryClearFunc(
-    OpenRCT2::TileElement** tile_element, const CoordsXY& coords, CommandFlags flags, money64* price);
-bool MapPlaceSceneryClearFunc(OpenRCT2::TileElement** tile_element, const CoordsXY& coords, CommandFlags flags, money64* price);
+    OpenRCT2::TileElement** tile_element, const CoordsXY& coords, OpenRCT2::GameActions::CommandFlags flags, money64* price);
+bool MapPlaceSceneryClearFunc(
+    OpenRCT2::TileElement** tile_element, const CoordsXY& coords, OpenRCT2::GameActions::CommandFlags flags, money64* price);
 
 struct ConstructClearResult
 {
@@ -54,8 +55,8 @@ struct ConstructClearResult
 };
 
 [[nodiscard]] OpenRCT2::GameActions::Result MapCanConstructWithClearAt(
-    const CoordsXYRangedZ& pos, ClearingFunction clearFunc, QuarterTile quarterTile, CommandFlags flags, uint8_t slope,
-    CreateCrossingMode crossingMode = CreateCrossingMode::none, bool isTree = false);
+    const CoordsXYRangedZ& pos, ClearingFunction clearFunc, QuarterTile quarterTile, OpenRCT2::GameActions::CommandFlags flags,
+    uint8_t slope, CreateCrossingMode crossingMode = CreateCrossingMode::none, bool isTree = false);
 
 [[nodiscard]] OpenRCT2::GameActions::Result MapCanConstructAt(const CoordsXYRangedZ& pos, QuarterTile bl);
 
diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp
index 0cb8acde16..fa03190db0 100644
--- a/src/openrct2/world/Footpath.cpp
+++ b/src/openrct2/world/Footpath.cpp
@@ -50,6 +50,7 @@
 using namespace OpenRCT2;
 using namespace OpenRCT2::TrackMetaData;
 using OpenRCT2::GameActions::CommandFlag;
+using OpenRCT2::GameActions::CommandFlags;
 
 void FootpathUpdateQueueEntranceBanner(const CoordsXY& footpathPos, TileElement* tileElement);