diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h
index 71e785363a2846053c6563efe2143c4a87ddf718..8bc97dee0e9eaca37ce98a1a85a7bc88477af514 100644
--- a/src/Vehicle/Vehicle.h
+++ b/src/Vehicle/Vehicle.h
@@ -1133,7 +1133,7 @@ private:
     void _waitForMavlinkMessageMessageReceived(const mavlink_message_t& message);
 
     // requestMessage handling
-    typedef struct {
+    typedef struct RequestMessageInfo {
         bool                        commandAckReceived; // We keep track of the ack/message being received since the order in which this will come in is random
         bool                        messageReceived;    // We only delete the allocated RequestMessageInfo_t when both happen (or the message wait times out)
         int                         msgId;
@@ -1145,7 +1145,7 @@ private:
     static void _requestMessageCmdResultHandler             (void* resultHandlerData, int compId, MAV_RESULT result, MavCmdResultFailureCode_t failureCode);
     static void _requestMessageWaitForMessageResultHandler  (void* resultHandlerData, bool noResponsefromVehicle, const mavlink_message_t& message);
 
-    typedef struct {
+    typedef struct MavCommandListEntry {
         int                 targetCompId        = MAV_COMP_ID_AUTOPILOT1;
         bool                useCommandInt       = false;
         MAV_CMD             command;
diff --git a/src/Vehicle/VehicleLinkManager.h b/src/Vehicle/VehicleLinkManager.h
index eda8b289996cec166c25bcefe9c34613db9b5710..8bba75af913044bcbfd99ce40ba33c28c7deeaeb 100644
--- a/src/Vehicle/VehicleLinkManager.h
+++ b/src/Vehicle/VehicleLinkManager.h
@@ -77,7 +77,7 @@ private:
     LinkInterface*  _bestActivePrimaryLink  (void);
     void            _commRegainedOnLink     (LinkInterface*  link);
 
-    typedef struct {
+    typedef struct LinkInfo {
         SharedLinkInterfacePtr  link;
         bool                    commLost = false;
         QElapsedTimer           heartbeatElapsedTimer;