6 files changed, 15 insertions, 15 deletions
diff --git a/src/input_common/drivers/mouse.cpp b/src/input_common/drivers/mouse.cpp
index 4af2dd36f5..34bf877bf5 100644
--- a/src/input_common/drivers/mouse.cpp
+++ b/src/input_common/drivers/mouse.cpp
@@ -102,11 +102,11 @@ void Mouse::UpdateStickInput() {
     SetAxis(identifier, mouse_axis_y, -last_mouse_change.y);
 
     // Decay input over time
-    const float clamped_length = std::min(1.0f, length);
+    const float clamped_length = (std::min)(1.0f, length);
     const float decay_strength = Settings::values.mouse_panning_decay_strength.GetValue();
     const float decay = 1 - clamped_length * clamped_length * decay_strength * 0.01f;
     const float min_decay = Settings::values.mouse_panning_min_decay.GetValue();
-    const float clamped_decay = std::min(1 - min_decay / 100.0f, decay);
+    const float clamped_decay = (std::min)(1 - min_decay / 100.0f, decay);
     last_mouse_change *= clamped_decay;
 }
 
diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp
index 51169c6f2b..972abec9fe 100644
--- a/src/input_common/drivers/sdl_driver.cpp
+++ b/src/input_common/drivers/sdl_driver.cpp
@@ -120,7 +120,7 @@ public:
         f32 low_frequency_scale = 1.0f;
         if (vibration.low_frequency > low_start_sensitivity_limit) {
             low_frequency_scale =
-                std::max(1.0f - (vibration.low_frequency - low_start_sensitivity_limit) /
+                (std::max)(1.0f - (vibration.low_frequency - low_start_sensitivity_limit) /
                                     low_width_sensitivity_limit,
                          0.3f);
         }
@@ -129,7 +129,7 @@ public:
         f32 high_frequency_scale = 1.0f;
         if (vibration.high_frequency > high_start_sensitivity_limit) {
             high_frequency_scale =
-                std::max(1.0f - (vibration.high_frequency - high_start_sensitivity_limit) /
+                (std::max)(1.0f - (vibration.high_frequency - high_start_sensitivity_limit) /
                                     high_width_sensitivity_limit,
                          0.3f);
         }
diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp
index d483cd3490..df1819904b 100644
--- a/src/input_common/drivers/udp_client.cpp
+++ b/src/input_common/drivers/udp_client.cpp
@@ -615,8 +615,8 @@ CalibrationConfigurationJob::CalibrationConfigurationJob(
                                     }
                                     LOG_DEBUG(Input, "Current touch: {} {}", data.touch[0].x,
                                               data.touch[0].y);
-                                    min_x = std::min(min_x, static_cast<u16>(data.touch[0].x));
-                                    min_y = std::min(min_y, static_cast<u16>(data.touch[0].y));
+                                    min_x = (std::min)(min_x, static_cast<u16>(data.touch[0].x));
+                                    min_y = (std::min)(min_y, static_cast<u16>(data.touch[0].y));
                                     if (current_status == Status::Ready) {
                                         // First touch - min data (min_x/min_y)
                                         current_status = Status::Stage1Completed;
diff --git a/src/input_common/helpers/joycon_protocol/calibration.cpp b/src/input_common/helpers/joycon_protocol/calibration.cpp
index 1300ecaf53..057bf29f71 100644
--- a/src/input_common/helpers/joycon_protocol/calibration.cpp
+++ b/src/input_common/helpers/joycon_protocol/calibration.cpp
@@ -140,8 +140,8 @@ Common::Input::DriverResult CalibrationProtocol::GetRingCalibration(RingCalibrat
         ring_data_min = current_value - DefaultRingRange;
         ring_data_default = current_value;
     }
-    ring_data_max = std::max(ring_data_max, current_value);
-    ring_data_min = std::min(ring_data_min, current_value);
+    ring_data_max = (std::max)(ring_data_max, current_value);
+    ring_data_min = (std::min)(ring_data_min, current_value);
     calibration = {
         .default_value = ring_data_default,
         .max_value = ring_data_max,
diff --git a/src/input_common/helpers/joycon_protocol/nfc.cpp b/src/input_common/helpers/joycon_protocol/nfc.cpp
index db83f9ef48..bfdaa74a62 100644
--- a/src/input_common/helpers/joycon_protocol/nfc.cpp
+++ b/src/input_common/helpers/joycon_protocol/nfc.cpp
@@ -327,7 +327,7 @@ Common::Input::DriverResult NfcProtocol::IsTagInRange(TagFoundData& data,
              (output.mcu_data[6] != 0x09 && output.mcu_data[6] != 0x04));
 
     data.type = output.mcu_data[12];
-    data.uuid_size = std::min(output.mcu_data[14], static_cast<u8>(sizeof(TagUUID)));
+    data.uuid_size = (std::min)(output.mcu_data[14], static_cast<u8>(sizeof(TagUUID)));
     memcpy(data.uuid.data(), output.mcu_data.data() + 15, data.uuid.size());
 
     return Common::Input::DriverResult::Success;
@@ -433,7 +433,7 @@ Common::Input::DriverResult NfcProtocol::WriteAmiiboData(const TagUUID& tag_uuid
     // Send Data. Nfc buffer size is 31, Send the data in smaller packages
     while (current_position < buffer.size() && tries++ < timeout_limit) {
         const std::size_t next_position =
-            std::min(current_position + sizeof(NFCRequestState::raw_data), buffer.size());
+            (std::min)(current_position + sizeof(NFCRequestState::raw_data), buffer.size());
         const std::size_t block_size = next_position - current_position;
         const bool is_last_packet = block_size < sizeof(NFCRequestState::raw_data);
 
@@ -479,7 +479,7 @@ Common::Input::DriverResult NfcProtocol::GetMifareData(
     // Send data request. Nfc buffer size is 31, Send the data in smaller packages
     while (current_position < buffer.size() && tries++ < timeout_limit) {
         const std::size_t next_position =
-            std::min(current_position + sizeof(NFCRequestState::raw_data), buffer.size());
+            (std::min)(current_position + sizeof(NFCRequestState::raw_data), buffer.size());
         const std::size_t block_size = next_position - current_position;
         const bool is_last_packet = block_size < sizeof(NFCRequestState::raw_data);
 
@@ -559,7 +559,7 @@ Common::Input::DriverResult NfcProtocol::WriteMifareData(
     // Send data request. Nfc buffer size is 31, Send the data in smaller packages
     while (current_position < buffer.size() && tries++ < timeout_limit) {
         const std::size_t next_position =
-            std::min(current_position + sizeof(NFCRequestState::raw_data), buffer.size());
+            (std::min)(current_position + sizeof(NFCRequestState::raw_data), buffer.size());
         const std::size_t block_size = next_position - current_position;
         const bool is_last_packet = block_size < sizeof(NFCRequestState::raw_data);
 
@@ -731,7 +731,7 @@ Common::Input::DriverResult NfcProtocol::SendWriteDataAmiiboRequest(MCUCommandRe
                                                                     u8 block_id,
                                                                     bool is_last_packet,
                                                                     std::span<const u8> data) {
-    const auto data_size = std::min(data.size(), sizeof(NFCRequestState::raw_data));
+    const auto data_size = (std::min)(data.size(), sizeof(NFCRequestState::raw_data));
     NFCRequestState request{
         .command_argument = NFCCommand::WriteNtag,
         .block_id = block_id,
@@ -754,7 +754,7 @@ Common::Input::DriverResult NfcProtocol::SendWriteDataAmiiboRequest(MCUCommandRe
 Common::Input::DriverResult NfcProtocol::SendReadDataMifareRequest(MCUCommandResponse& output,
                                                                    u8 block_id, bool is_last_packet,
                                                                    std::span<const u8> data) {
-    const auto data_size = std::min(data.size(), sizeof(NFCRequestState::raw_data));
+    const auto data_size = (std::min)(data.size(), sizeof(NFCRequestState::raw_data));
     NFCRequestState request{
         .command_argument = NFCCommand::Mifare,
         .block_id = block_id,
diff --git a/src/input_common/helpers/joycon_protocol/rumble.cpp b/src/input_common/helpers/joycon_protocol/rumble.cpp
index 9fd0b84708..db3420dc0b 100644
--- a/src/input_common/helpers/joycon_protocol/rumble.cpp
+++ b/src/input_common/helpers/joycon_protocol/rumble.cpp
@@ -29,7 +29,7 @@ Common::Input::DriverResult RumbleProtocol::SendVibration(const VibrationValue&
 
     // Protect joycons from damage from strong vibrations
     const f32 clamp_amplitude =
-        1.0f / std::max(1.0f, vibration.high_amplitude + vibration.low_amplitude);
+        1.0f / (std::max)(1.0f, vibration.high_amplitude + vibration.low_amplitude);
 
     const u16 encoded_high_frequency = EncodeHighFrequency(vibration.high_frequency);
     const u8 encoded_high_amplitude =