diff --git a/src/Etterna/Actor/Base/Actor.cpp b/src/Etterna/Actor/Base/Actor.cpp
index f4ca72a1db..b28b5ea186 100644
--- a/src/Etterna/Actor/Base/Actor.cpp
+++ b/src/Etterna/Actor/Base/Actor.cpp
@@ -974,10 +974,9 @@ Actor::UpdateInternal(float delta_time)
 			}
 			break;
 		case CLOCK_TIMER_GLOBAL:
-			generic_global_timer_update(
-			  RageTimer::GetTimeSinceStart(),
-			  m_fEffectDelta,
-			  m_fSecsIntoEffect);
+			generic_global_timer_update(RageTimer::GetTimeSinceStart(),
+										m_fEffectDelta,
+										m_fSecsIntoEffect);
 			break;
 		case CLOCK_BGM_BEAT:
 			generic_global_timer_update(
diff --git a/src/Etterna/Actor/Base/ActorMultiVertex.cpp b/src/Etterna/Actor/Base/ActorMultiVertex.cpp
index ffc1b38d53..28a0d7ec24 100644
--- a/src/Etterna/Actor/Base/ActorMultiVertex.cpp
+++ b/src/Etterna/Actor/Base/ActorMultiVertex.cpp
@@ -387,7 +387,7 @@ ActorMultiVertex::GetSpline(size_t i)
 }
 
 void
-ActorMultiVertex::SetState(size_t i)
+ActorMultiVertex::SetState(int i)
 {
 	ASSERT(i < _states.size());
 	_cur_state = i;
diff --git a/src/Etterna/Actor/Base/ActorMultiVertex.h b/src/Etterna/Actor/Base/ActorMultiVertex.h
index 8612c4dda0..7bc0c0dc52 100644
--- a/src/Etterna/Actor/Base/ActorMultiVertex.h
+++ b/src/Etterna/Actor/Base/ActorMultiVertex.h
@@ -177,7 +177,7 @@ class ActorMultiVertex : public Actor
 		_states = new_states;
 		SetState(0);
 	}
-	void SetState(size_t i);
+	void SetState(int i) override;
 	void SetAllStateDelays(float delay);
 	[[nodiscard]] float GetAnimationLengthSeconds() const override;
 	void SetSecondsIntoAnimation(float seconds) override;
diff --git a/src/Etterna/Actor/Gameplay/Background.cpp b/src/Etterna/Actor/Gameplay/Background.cpp
index ce39f96afb..69ca7e04c9 100644
--- a/src/Etterna/Actor/Gameplay/Background.cpp
+++ b/src/Etterna/Actor/Gameplay/Background.cpp
@@ -50,9 +50,6 @@ static Preference<RandomBackgroundMode> g_RandomBackgroundMode(
 static Preference<int> g_iNumBackgrounds("NumBackgrounds", 10);
 static Preference<bool> g_bSongBackgrounds("SongBackgrounds", true);
 
-// Width of the region separating the left and right brightness areas:
-static float g_fBackgroundCenterWidth = 40;
-
 class BrightnessOverlay : public ActorFrame
 {
   public:
diff --git a/src/Etterna/Actor/Gameplay/NoteDisplay.cpp b/src/Etterna/Actor/Gameplay/NoteDisplay.cpp
index 09250ac2d9..b3dc171ede 100644
--- a/src/Etterna/Actor/Gameplay/NoteDisplay.cpp
+++ b/src/Etterna/Actor/Gameplay/NoteDisplay.cpp
@@ -21,7 +21,6 @@
 
 using std::map;
 
-static const double PI_180 = PI / 180.0;
 static const double PI_180R = 180.0 / PI;
 
 const std::string&
@@ -1900,7 +1899,6 @@ NoteColumnRenderer::DrawPrimitives()
 	m_column_render_args.zoom_handler = &NCR_current.m_zoom_handler;
 	m_column_render_args.diffuse = m_pTempState->diffuse[0];
 	m_column_render_args.glow = m_pTempState->glow;
-	auto any_upcoming = false;
 	// Build lists of holds and taps for each player number, then pass those
 	// lists to the displays to draw.
 	// The vector in the NUM_PlayerNumber slot should stay empty, not worth
@@ -1941,11 +1939,11 @@ NoteColumnRenderer::DrawPrimitives()
 
 	// Draw holds before taps to make sure taps dont hide behind holds
 	if (!holds.empty())
-		any_upcoming |= m_displays[PLAYER_1]->DrawHoldsInRange(
+		m_displays[PLAYER_1]->DrawHoldsInRange(
 		  *m_field_render_args, m_column_render_args, holds);
 
 	if (!taps.empty())
-		any_upcoming |= m_displays[PLAYER_1]->DrawTapsInRange(
+		m_displays[PLAYER_1]->DrawTapsInRange(
 		  *m_field_render_args, m_column_render_args, taps);
 }
 
diff --git a/src/Etterna/Actor/Gameplay/Player.cpp b/src/Etterna/Actor/Gameplay/Player.cpp
index 30db1f8d7a..7cb39b1a78 100644
--- a/src/Etterna/Actor/Gameplay/Player.cpp
+++ b/src/Etterna/Actor/Gameplay/Player.cpp
@@ -894,7 +894,6 @@ Player::UpdateHoldsAndRolls(float fDeltaTime,
 		}
 
 		std::vector<TrackRowTapNote> vHoldNotesToGradeTogether;
-		auto iRowOfLastHoldNote = -1;
 		auto iter = *m_pIterNeedsHoldJudging; // copy
 		for (; !iter.IsAtEnd() && iter.Row() <= iSongRow; ++iter) {
 			auto& tn = *iter;
@@ -933,7 +932,6 @@ Player::UpdateHoldsAndRolls(float fDeltaTime,
 				  iSongRow, fDeltaTime, vHoldNotesToGradeTogether);
 				vHoldNotesToGradeTogether.clear();
 			}
-			iRowOfLastHoldNote = iRow;
 			vHoldNotesToGradeTogether.push_back(trtn);
 		}
 
@@ -2214,8 +2212,8 @@ Player::Step(int col,
 				// TapNoteScore, so that they can logically match up with
 				// the current timing windows. -aj
 				{
-					auto fWindowW1 = GetWindowSeconds(TW_W1);
-					auto fWindowW2 = GetWindowSeconds(TW_W2);
+					// auto fWindowW1 = GetWindowSeconds(TW_W1);
+					// auto fWindowW2 = GetWindowSeconds(TW_W2);
 					auto fWindowW3 = GetWindowSeconds(TW_W3);
 					auto fWindowW4 = GetWindowSeconds(TW_W4);
 					auto fWindowW5 = GetWindowSeconds(TW_W5);
@@ -2372,8 +2370,6 @@ Player::FlashGhostRow(int iRow)
 {
 	const auto lastTNS =
 	  NoteDataWithScoring::LastTapNoteWithResult(m_NoteData, iRow).result.tns;
-	const auto bBlind =
-	  (m_pPlayerState->m_PlayerOptions.GetCurrent().m_fBlind != 0);
 	const auto bBright =
 	  ((m_pPlayerStageStats != nullptr) &&
 	   m_pPlayerStageStats->m_iCurCombo >
@@ -3366,9 +3362,6 @@ Player::IncrementComboOrMissCombo(const bool bComboOrMissCombo)
 void
 Player::RenderAllNotesIgnoreScores()
 {
-	auto firstRow = 0;
-	auto lastRow = m_NoteData.GetLastRow() + 1;
-
 	// Go over every single non empty row and their tracks
 	FOREACH_NONEMPTY_ROW_ALL_TRACKS(m_NoteData, row)
 	{
diff --git a/src/Etterna/Actor/Gameplay/PlayerReplay.cpp b/src/Etterna/Actor/Gameplay/PlayerReplay.cpp
index 4bfe6f018a..486954100d 100644
--- a/src/Etterna/Actor/Gameplay/PlayerReplay.cpp
+++ b/src/Etterna/Actor/Gameplay/PlayerReplay.cpp
@@ -195,7 +195,6 @@ PlayerReplay::UpdateHoldsAndRolls(
 		}
 
 		std::vector<TrackRowTapNote> vHoldNotesToGradeTogether;
-		auto iRowOfLastHoldNote = -1;
 		auto iter = *m_pIterNeedsHoldJudging; // copy
 		for (; !iter.IsAtEnd() && iter.Row() <= iSongRow; ++iter) {
 			auto& tn = *iter;
@@ -228,7 +227,6 @@ PlayerReplay::UpdateHoldsAndRolls(
 				  iSongRow, fDeltaTime, vHoldNotesToGradeTogether);
 				vHoldNotesToGradeTogether.clear();
 			}
-			iRowOfLastHoldNote = iRow;
 			vHoldNotesToGradeTogether.push_back(trtn);
 		}
 
diff --git a/src/Etterna/Actor/GameplayAndMenus/MeterDisplay.h b/src/Etterna/Actor/GameplayAndMenus/MeterDisplay.h
index 5eae23078a..8efbfe3d79 100644
--- a/src/Etterna/Actor/GameplayAndMenus/MeterDisplay.h
+++ b/src/Etterna/Actor/GameplayAndMenus/MeterDisplay.h
@@ -24,7 +24,6 @@ class MeterDisplay : public ActorFrame
 
   private:
 	float m_fStreamWidth = 0.f;
-	float m_fPercent = 0.5f;
 	AutoActor m_sprStream;
 	AutoActor m_sprTip;
 };
diff --git a/src/Etterna/Actor/Menus/ModIconRow.cpp b/src/Etterna/Actor/Menus/ModIconRow.cpp
index c62c2dbbab..9001157bcd 100644
--- a/src/Etterna/Actor/Menus/ModIconRow.cpp
+++ b/src/Etterna/Actor/Menus/ModIconRow.cpp
@@ -135,8 +135,6 @@ OptionToPreferredColumn(std::string sOptionText)
 void
 ModIconRow::SetFromGameState()
 {
-	PlayerNumber pn = m_pn;
-
 	std::string sOptions =
 	  GAMESTATE->m_pPlayerState->m_PlayerOptions.GetStage().GetString();
 	std::vector<std::string> vsOptions;
diff --git a/src/Etterna/Actor/Menus/MusicWheel.cpp b/src/Etterna/Actor/Menus/MusicWheel.cpp
index 1ad967b2a6..0b93719dbe 100644
--- a/src/Etterna/Actor/Menus/MusicWheel.cpp
+++ b/src/Etterna/Actor/Menus/MusicWheel.cpp
@@ -683,7 +683,7 @@ MusicWheel::FilterByAndAgainstStepKeys(std::vector<Song*>& inv)
 {
 	std::vector<Song*> tmp;
 	const std::function<bool(Song*, std::vector<string>&)> check =
-	  [this](Song* x, std::vector<string>& hl) {
+	  [](Song* x, std::vector<string>& hl) {
 		  for (auto& ck : hl) {
 			  if (x->HasChartByHash(ck)) {
 				  return true;
diff --git a/src/Etterna/Actor/Menus/MusicWheel.h b/src/Etterna/Actor/Menus/MusicWheel.h
index bb27e25b00..f7dd1c56b0 100644
--- a/src/Etterna/Actor/Menus/MusicWheel.h
+++ b/src/Etterna/Actor/Menus/MusicWheel.h
@@ -58,7 +58,7 @@ class MusicWheel : public WheelBase
 		return dynamic_cast<const MusicWheelItemData*>(m_CurWheelItemData[i]);
 	}
 
-	virtual void ReloadSongList(bool searching, const std::string& findme);
+	void ReloadSongList(bool searching, const std::string& findme) override;
 	void SetHashList(const std::vector<string>& newHashList);
 	void SetOutHashList(const std::vector<string>& newOutHashList);
 
diff --git a/src/Etterna/Actor/Menus/MusicWheelItem.cpp b/src/Etterna/Actor/Menus/MusicWheelItem.cpp
index 27ba3fd8de..a2bf09c8d7 100644
--- a/src/Etterna/Actor/Menus/MusicWheelItem.cpp
+++ b/src/Etterna/Actor/Menus/MusicWheelItem.cpp
@@ -295,15 +295,6 @@ MusicWheelItem::RefreshGrades()
 	if (pWID->m_pSong == nullptr)
 		return;
 
-	Difficulty dc;
-	if (GAMESTATE->m_pCurSteps)
-		dc = GAMESTATE->m_pCurSteps->GetDifficulty();
-	else
-		dc = GAMESTATE->m_PreferredDifficulty;
-
-	ProfileSlot ps;
-	ps = static_cast<ProfileSlot>(PLAYER_1);
-
 	StepsType st;
 	if (GAMESTATE->m_pCurSteps)
 		st = GAMESTATE->m_pCurSteps->m_StepsType;
diff --git a/src/Etterna/Actor/Menus/OptionRow.cpp b/src/Etterna/Actor/Menus/OptionRow.cpp
index a80a470a54..bee5ee0a2d 100644
--- a/src/Etterna/Actor/Menus/OptionRow.cpp
+++ b/src/Etterna/Actor/Menus/OptionRow.cpp
@@ -400,15 +400,6 @@ OptionRow::AfterImportOptions(PlayerNumber pn)
 		for (auto& c : m_Underline)
 			c->SetVisible(false);
 
-	// Make all selections the same if bOneChoiceForAllPlayers.
-	// Hack: we only import active players, so if only player 2 is imported,
-	// we need to copy p2 to p1, not p1 to p2.
-	if (m_pHand->m_Def.m_bOneChoiceForAllPlayers) {
-		PlayerNumber pnCopyFrom = GAMESTATE->GetMasterPlayerNumber();
-		if (GAMESTATE->GetMasterPlayerNumber() == PLAYER_INVALID)
-			pnCopyFrom = PLAYER_1;
-	}
-
 	switch (m_pHand->m_Def.m_selectType) {
 		case SELECT_ONE: {
 			// Make sure the row actually has a selection.
@@ -434,9 +425,6 @@ OptionRow::PositionUnderlines(PlayerNumber pn)
 	if (vpUnderlines.empty())
 		return;
 
-	PlayerNumber pnTakeSelectedFrom =
-	  m_pHand->m_Def.m_bOneChoiceForAllPlayers ? PLAYER_1 : pn;
-
 	for (int i = 0; i < static_cast<int>(vpUnderlines.size()); i++) {
 		OptionsCursor& ul = *vpUnderlines[i];
 
@@ -544,9 +532,6 @@ OptionRow::UpdateEnabledDisabled()
 	bool bThisRowHasFocusByAny = false;
 	bThisRowHasFocusByAny |= static_cast<int>(m_bRowHasFocus);
 
-	bool bThisRowHasFocusByAll = true;
-	bThisRowHasFocusByAll &= static_cast<int>(m_bRowHasFocus);
-
 	bool bRowEnabled = !m_pHand->m_Def.m_vEnabledForPlayers.empty();
 
 	// Don't tween selection colors at all.
@@ -570,18 +555,6 @@ OptionRow::UpdateEnabledDisabled()
 	m_textTitle->PlayCommand(sCmdName);
 
 	for (unsigned j = 0; j < m_textItems.size(); j++) {
-		bool bThisItemHasFocusByAny = false;
-		if (m_bRowHasFocus) {
-			if (static_cast<int>(j) == GetChoiceInRowWithFocus()) {
-				bThisItemHasFocusByAny = true;
-				break;
-			}
-		}
-
-		// Logically dead code
-		// if (bThisItemHasFocusByAny)
-		//	m_textItems[j]->PlayCommand("GainFocus");
-		// else
 		m_textItems[j]->PlayCommand("LoseFocus");
 	}
 
@@ -905,8 +878,6 @@ OptionRow::ImportOptions(const PlayerNumber& vpns)
 {
 	ASSERT(!m_pHand->m_Def.m_vsChoices.empty());
 
-	PlayerNumber p = PLAYER_1;
-
 	FOREACH(bool, m_vbSelected, b)
 	*b = false;
 
@@ -926,8 +897,6 @@ OptionRow::ExportOptions(const PlayerNumber& vpns, bool bRowHasFocus)
 	ASSERT(!m_pHand->m_Def.m_vsChoices.empty());
 
 	int iChangeMask = 0;
-
-	PlayerNumber p = PLAYER_1;
 	const bool bFocus = bRowHasFocus;
 
 	VerifySelected(
diff --git a/src/Etterna/Actor/Menus/OptionsCursor.h b/src/Etterna/Actor/Menus/OptionsCursor.h
index 732da17b0e..c5499158f5 100644
--- a/src/Etterna/Actor/Menus/OptionsCursor.h
+++ b/src/Etterna/Actor/Menus/OptionsCursor.h
@@ -18,7 +18,7 @@ class OptionsCursor : public ActorFrame
 	void Load(const std::string& sMetricsGroup, bool bLoadCanGos);
 
 	void StopTweening() override;
-	void BeginTweening(float fSecs, TweenType tt = TWEEN_DECELERATE);
+	void BeginTweening(float fSecs, TweenType tt = TWEEN_DECELERATE) override;
 	void SetBarWidth(int iWidth);
 	int GetBarWidth() const;
 	void SetCanGo(bool bCanGoLeft, bool bCanGoRight);
diff --git a/src/Etterna/Actor/Menus/OptionsList.cpp b/src/Etterna/Actor/Menus/OptionsList.cpp
index e3650aaeb8..3b516b8aa7 100644
--- a/src/Etterna/Actor/Menus/OptionsList.cpp
+++ b/src/Etterna/Actor/Menus/OptionsList.cpp
@@ -478,7 +478,7 @@ OptionsList::Input(const InputEventPlus& input)
 	if (input.MenuI == GAME_BUTTON_SELECT) {
 		if (input.type != IET_FIRST_PRESS)
 			return false;
-		//if( input.type == IET_RELEASE )
+		// if( input.type == IET_RELEASE )
 		{
 			Close();
 			return true;
@@ -641,7 +641,8 @@ OptionsList::SelectionsChanged(const std::string& sRowName)
 	std::vector<bool>& bSelections = m_bSelections[sRowName];
 
 	if (pHandler->m_Def.m_bOneChoiceForAllPlayers && m_pLinked != nullptr) {
-		std::vector<bool>& bLinkedSelections = m_pLinked->m_bSelections[sRowName];
+		std::vector<bool>& bLinkedSelections =
+		  m_pLinked->m_bSelections[sRowName];
 		bLinkedSelections = bSelections;
 
 		if (m_pLinked->IsOpened())
diff --git a/src/Etterna/Actor/Menus/WheelBase.cpp b/src/Etterna/Actor/Menus/WheelBase.cpp
index 19b25e6233..772e440414 100644
--- a/src/Etterna/Actor/Menus/WheelBase.cpp
+++ b/src/Etterna/Actor/Menus/WheelBase.cpp
@@ -433,15 +433,12 @@ WheelBase::RebuildWheelItems(int iDist)
 	// iIndex is now the index of the lowest WheelItem to draw
 
 	int iFirst = 0;
-	int iLast = NUM_WHEEL_ITEMS - 1;
 
 	if (iDist != INT_MAX) {
 		// Shift items and refresh only those that have changed.
 		CircularShift(items, iDist);
 		if (iDist > 0)
 			iFirst = NUM_WHEEL_ITEMS - iDist;
-		else if (iDist < 0)
-			iLast = -iDist - 1;
 	}
 
 	for (size_t i = iFirst; i < items.size(); i++) {
diff --git a/src/Etterna/Actor/Menus/WheelBase.h b/src/Etterna/Actor/Menus/WheelBase.h
index 0e87090aab..262d442b8c 100644
--- a/src/Etterna/Actor/Menus/WheelBase.h
+++ b/src/Etterna/Actor/Menus/WheelBase.h
@@ -70,7 +70,7 @@ class WheelBase : public ActorFrame
 	void RebuildWheelItems(int dist = INT_MAX); // INT_MAX = refresh all
 	// Update the list of songs to match whatever songs are indexed by the song
 	// manager (SONGMAN)
-	virtual void ReloadSongList() {}
+	virtual void ReloadSongList(bool searching, const std::string& findme) {}
 
 	virtual auto GetNumItems() const -> unsigned int
 	{
diff --git a/src/Etterna/Globals/SoloCalc.cpp b/src/Etterna/Globals/SoloCalc.cpp
index 576360124d..cd75c0a09f 100644
--- a/src/Etterna/Globals/SoloCalc.cpp
+++ b/src/Etterna/Globals/SoloCalc.cpp
@@ -15,9 +15,11 @@
 using namespace ::std;
 
 // multipliers to each skillset
+/*
 static const std::array<float, NUM_Skillset> basescalars = {
 	0.F, 1.F, 1.F, 1.F, 1.F, 1.F, 1.F, 1.F
 };
+*/
 
 // global multiplier for baseline standardization
 static constexpr float finalscaler = 2.6f * 1.4f;
diff --git a/src/Etterna/Globals/StepMania.cpp b/src/Etterna/Globals/StepMania.cpp
index 0e83aaefdd..540f4788fd 100644
--- a/src/Etterna/Globals/StepMania.cpp
+++ b/src/Etterna/Globals/StepMania.cpp
@@ -396,7 +396,6 @@ AdjustForChangedSystemCapabilities()
 	 * Actually, Windows lops off a meg or two; cut off a little lower to treat
 	 * 192-meg systems as high-memory. */
 	const bool HighMemory = (Memory >= 190);
-	const bool LowMemory = (Memory < 100); // 64 and 96-meg systems
 
 	/* Two memory-consuming features that we can disable are texture caching and
 	 * preloaded banners. Texture caching can use a lot of memory; disable it
diff --git a/src/Etterna/Globals/global.h b/src/Etterna/Globals/global.h
index 4b7918a123..a5a31f2c15 100644
--- a/src/Etterna/Globals/global.h
+++ b/src/Etterna/Globals/global.h
@@ -109,7 +109,6 @@ ShowWarningOrTrace(const char* file,
 				   const char* message,
 				   bool bWarning); // don't pull in LOG here
 
-
 #ifdef DEBUG
 // No reason to kill the program. A lot of these don't produce a crash in NDEBUG
 // so why stop?
@@ -141,8 +140,21 @@ template<int>
 struct CompileAssertDecl
 {
 };
+
+// Ignore "unused-local-typedef" warnings for COMPILE_ASSERT
+#if defined(__clang__)
+#define COMPILE_ASSERT_PRE                                                     \
+	_Pragma("clang diagnostic push")                                           \
+	  _Pragma("clang diagnostic ignored \"-Wunused-local-typedef\"")
+#define COMPILE_ASSERT_POST _Pragma("clang diagnostic pop")
+#else
+#define COMPILE_ASSERT_PRE
+#define COMPILE_ASSERT_POST
+#endif
 #define COMPILE_ASSERT(COND)                                                   \
-	typedef CompileAssertDecl<sizeof(CompileAssert<!!(COND)>)> CompileAssertInst
+	COMPILE_ASSERT_PRE                                                         \
+	typedef CompileAssertDecl<sizeof(CompileAssert<!!(COND)>)>                 \
+	  CompileAssertInst COMPILE_ASSERT_POST
 
 #include "RageUtil/Misc/RageException.h"
 /* Don't include our own headers here, since they tend to change often. */
diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/CJOHAnchor.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/CJOHAnchor.h
index 8af1d3b45e..7c61918362 100644
--- a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/CJOHAnchor.h
+++ b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/CJOHAnchor.h
@@ -97,7 +97,7 @@ struct CJOHAnchorMod
 		// 11[12]22
 		auto csF = static_cast<float>(max_chain_swaps);
 		// 11[12]11
-		auto cnF = static_cast<float>(max_not_swaps);
+		// auto cnF = static_cast<float>(max_not_swaps);
 		// 111[12]222 = 1[12]2[12]1[12]2
 		auto clF = static_cast<float>(max_total_len);
 		// 1[12]2[12]1[12]2 = small number < 11111111111[12]2222
@@ -111,7 +111,7 @@ struct CJOHAnchorMod
 
 		auto anchor_worth = fastsqrt(anchor_len_worth / tapsF) * len_scaler;
 		auto swap_worth = fastsqrt(csF / tapsF) * swap_scaler;
-		auto not_swap_worth = fastsqrt(cnF / tapsF) * not_swap_scaler;
+		// auto not_swap_worth = fastsqrt(cnF / tapsF) * not_swap_scaler;
 		pmod = std::clamp(base + anchor_worth + swap_worth + not_swap_scaler, min_mod, max_mod);
 	}
 
diff --git a/src/Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h b/src/Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h
index fd4d7e066d..79382c1866 100644
--- a/src/Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h
+++ b/src/Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h
@@ -128,6 +128,7 @@ struct Finger_Sequencing
 	/// returns an adjusted MS average value, not converted to nps
 	inline virtual float get_ms() = 0;
 
+	virtual ~Finger_Sequencing() = default;
 };
 
 /// Individual jacks, rather than anchors, with more nuance.
diff --git a/src/Etterna/MinaCalc/SequencedBaseDiffCalc.h b/src/Etterna/MinaCalc/SequencedBaseDiffCalc.h
index b09698a1c7..f75267e38b 100644
--- a/src/Etterna/MinaCalc/SequencedBaseDiffCalc.h
+++ b/src/Etterna/MinaCalc/SequencedBaseDiffCalc.h
@@ -182,8 +182,7 @@ struct nps
 		}
 
 		if (populated_intervals > 0) {
-			const auto empty_intervals =
-			  static_cast<float>(calc.numitv - populated_intervals);
+			// const auto empty_intervals = static_cast<float>(calc.numitv - populated_intervals);
 			avg_notes /= populated_intervals;
 
 			auto failed_intervals = 0;
diff --git a/src/Etterna/Models/Fonts/Font.cpp b/src/Etterna/Models/Fonts/Font.cpp
index a1d7f9ed2a..134f0af5e1 100644
--- a/src/Etterna/Models/Fonts/Font.cpp
+++ b/src/Etterna/Models/Fonts/Font.cpp
@@ -382,9 +382,16 @@ Font::GetGlyph(wchar_t c) const
 	 * shooting a blank really...DarkLink kept running into the stupid assert
 	 * with non-roman song titles, and looking at it, I'm gonna guess that
 	 * this is how ITG2 prevented crashing with them --infamouspat */
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-constant-out-of-range-compare"
+#endif
 	// ASSERT(c >= 0 && c <= 0xFFFFFF);
 	if (c < 0 || c > 0xFFFFFF)
 		c = 1;
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 
 	// Fast path:
 	if (c < static_cast<int>(ARRAYLEN(m_iCharToGlyphCache)) &&
diff --git a/src/Etterna/Models/HighScore/HighScore.cpp b/src/Etterna/Models/HighScore/HighScore.cpp
index 309d5b0c3c..5c06bcaa8c 100644
--- a/src/Etterna/Models/HighScore/HighScore.cpp
+++ b/src/Etterna/Models/HighScore/HighScore.cpp
@@ -1106,7 +1106,6 @@ Screenshot::LoadFromNode(const XNode* pNode)
 
 	pNode->GetChildValue("FileName", sFileName);
 	pNode->GetChildValue("MD5", sMD5);
-	const auto* pHighScore = pNode->GetChild("HighScore");
 }
 
 auto
diff --git a/src/Etterna/Models/Misc/AdjustSync.cpp b/src/Etterna/Models/Misc/AdjustSync.cpp
index c3305dbcd1..7a7a41999b 100644
--- a/src/Etterna/Models/Misc/AdjustSync.cpp
+++ b/src/Etterna/Models/Misc/AdjustSync.cpp
@@ -239,7 +239,6 @@ void
 AdjustSync::GetSyncChangeTextSong(std::vector<std::string>& vsAddTo)
 {
 	if (!GAMESTATE->isplaylistcourse && GAMESTATE->m_pCurSong.Get()) {
-		unsigned int iOriginalSize = vsAddTo.size();
 		auto& original = s_vpTimingDataOriginal[0];
 		auto& testing = GAMESTATE->m_pCurSong->m_SongTiming;
 
diff --git a/src/Etterna/Models/Misc/DBProfile.cpp b/src/Etterna/Models/Misc/DBProfile.cpp
index adf9b698d0..f1aa22bbd8 100644
--- a/src/Etterna/Models/Misc/DBProfile.cpp
+++ b/src/Etterna/Models/Misc/DBProfile.cpp
@@ -978,8 +978,6 @@ DBProfile::SavePlayerScores(SQLite::Database* db,
 						if (mode == WriteOnlyWebExport)
 							break;
 						if (mode == LocalWithReplayData) {
-							auto scoreID = static_cast<int>(
-							  sqlite3_last_insert_rowid(db->getHandle()));
 							try {
 								// Save Replay Data
 								if (hs->LoadReplayData()) {
diff --git a/src/Etterna/Models/Misc/DisplaySpec.h b/src/Etterna/Models/Misc/DisplaySpec.h
index a379e7ad30..79059546aa 100644
--- a/src/Etterna/Models/Misc/DisplaySpec.h
+++ b/src/Etterna/Models/Misc/DisplaySpec.h
@@ -107,9 +107,9 @@ class DisplaySpec
 	DisplaySpec(std::string id, std::string name, DisplayMode mode)
 	  : m_sId(std::move(std::move(id)))
 	  , m_sName(std::move(std::move(name)))
-	  , m_bIsVirtual(false)
 	  , m_bCurModeActive(true)
 	  , m_CurMode(mode)
+	  , m_bIsVirtual(false)
 	{
 		m_sModes.insert(mode);
 		m_rectBounds = RectI(0, 0, mode.width, mode.height);
diff --git a/src/Etterna/Models/Misc/GameConstantsAndTypes.cpp b/src/Etterna/Models/Misc/GameConstantsAndTypes.cpp
index 01ad9e8b69..254eddc1f8 100644
--- a/src/Etterna/Models/Misc/GameConstantsAndTypes.cpp
+++ b/src/Etterna/Models/Misc/GameConstantsAndTypes.cpp
@@ -329,12 +329,6 @@ static const char* ProfileSlotNames[] = {
 XToString(ProfileSlot);
 LuaXType(ProfileSlot);
 
-static const char* StageAwardNames[] = {
-	"FullComboW3",	 "SingleDigitW3", "OneW3",		 "FullComboW2",
-	"SingleDigitW2", "OneW2",		  "FullComboW1", "80PercentW3",
-	"90PercentW3",	 "100PercentW3",
-};
-
 void
 DisplayBpms::Add(float f)
 {
diff --git a/src/Etterna/Models/Misc/Grade.h b/src/Etterna/Models/Misc/Grade.h
index 3a178dc638..d743ebd33c 100644
--- a/src/Etterna/Models/Misc/Grade.h
+++ b/src/Etterna/Models/Misc/Grade.h
@@ -39,7 +39,7 @@ enum Grade
  * @param g the grade to convert.
  * @return the string reprsentation.
  */
-static auto
+inline auto
 GradeToString(Grade g) -> std::string
 {
 	ASSERT_M((g >= 0 && g < NUM_Grade) || g == Grade_Invalid,
diff --git a/src/Etterna/Models/Misc/OptionRowHandler.cpp b/src/Etterna/Models/Misc/OptionRowHandler.cpp
index 9dfef50ca5..9523c17f42 100644
--- a/src/Etterna/Models/Misc/OptionRowHandler.cpp
+++ b/src/Etterna/Models/Misc/OptionRowHandler.cpp
@@ -1346,7 +1346,6 @@ class OptionRowHandlerConfig : public OptionRowHandler
 					  const PlayerNumber& vpns,
 					  std::vector<bool>& vbSelectedOut) const override
 	{
-		auto p = vpns;
 		auto& vbSelOut = vbSelectedOut;
 
 		const auto iSelection = m_pOpt->Get();
@@ -1359,7 +1358,6 @@ class OptionRowHandlerConfig : public OptionRowHandler
 	{
 		auto bChanged = false;
 
-		auto p = vpns;
 		const auto& vbSel = vbSelected;
 
 		const auto iSel = OptionRowHandlerUtil::GetOneSelection(vbSel);
@@ -1443,7 +1441,6 @@ class OptionRowHandlerStepsType : public OptionRowHandler
 					  const PlayerNumber& vpns,
 					  std::vector<bool>& vbSelectedOut) const override
 	{
-		auto p = vpns;
 		auto& vbSelOut = vbSelectedOut;
 
 		if (GAMESTATE->m_pCurSteps != nullptr) {
@@ -1463,7 +1460,6 @@ class OptionRowHandlerStepsType : public OptionRowHandler
 									const std::vector<bool>& vbSelected) const
 	  -> int override
 	{
-		auto p = vpns;
 		const auto& vbSel = vbSelected;
 
 		const auto index = OptionRowHandlerUtil::GetOneSelection(vbSel);
diff --git a/src/Etterna/Models/Misc/Profile.cpp b/src/Etterna/Models/Misc/Profile.cpp
index 78534ade8f..8c60240850 100644
--- a/src/Etterna/Models/Misc/Profile.cpp
+++ b/src/Etterna/Models/Misc/Profile.cpp
@@ -432,9 +432,6 @@ Profile::LoadEditableDataFromDir(const std::string& sDir)
 {
 	const auto fn = sDir + EDITABLE_INI;
 
-	// Don't load unreasonably large editable.xml files.
-	auto iBytes = FILEMAN->GetFileSizeInBytes(fn);
-
 	if (!IsAFile(fn))
 		return ProfileLoadResult_FailedNoProfile;
 
@@ -804,23 +801,22 @@ class LunaProfile : public Luna<Profile>
 	// TODO: SCOREMAN
 	static int GetMostPopularSong(T* p, lua_State* L)
 	{
-
 		lua_pushnil(L);
 		return 1;
 	}
 	// USE SCOREMAN FOR THIS
+	// TODO: Remove?
 	static int GetSongNumTimesPlayed(T* p, lua_State* L)
 	{
 		ASSERT(!lua_isnil(L, 1));
-		auto* pS = Luna<Song>::check(L, 1);
 		lua_pushnumber(L, 0);
 		return 1;
 	}
 	// USE SCOREMAN FOR THIS
+	// TODO: Remove?
 	static int HasPassedAnyStepsInSong(T* p, lua_State* L)
 	{
 		ASSERT(!lua_isnil(L, 1));
-		auto* pS = Luna<Song>::check(L, 1);
 		lua_pushboolean(L, false);
 		return 1;
 	}
diff --git a/src/Etterna/Models/Misc/TimingData.cpp b/src/Etterna/Models/Misc/TimingData.cpp
index abf24be111..01023b782d 100644
--- a/src/Etterna/Models/Misc/TimingData.cpp
+++ b/src/Etterna/Models/Misc/TimingData.cpp
@@ -1063,16 +1063,6 @@ TimingData::DeleteRows(int iStartRow, int iRowsToDelete)
 float
 TimingData::GetDisplayedSpeedPercent(float fBeat, float fMusicSeconds) const
 {
-	/* HACK: Somehow we get called into this function when there is no
-	 * TimingData to work with. This seems to happen the most upon
-	 * leaving the editor. Still, cover our butts in case this instance
-	 * isn't existing. */
-	/* ...but force a crash, so debuggers will catch it and stop here.
-	 * That'll make us keep this bug in mind. -- vyhd */
-	if (this == nullptr) {
-		DEBUG_ASSERT(this);
-		return 1.0f;
-	}
 
 	const auto& speeds = GetTimingSegments(SEGMENT_SPEED);
 	if (speeds.empty()) {
diff --git a/src/Etterna/Models/NoteData/NoteDataUtil.cpp b/src/Etterna/Models/NoteData/NoteDataUtil.cpp
index 90714e45a2..cdfbfc0ff2 100644
--- a/src/Etterna/Models/NoteData/NoteDataUtil.cpp
+++ b/src/Etterna/Models/NoteData/NoteDataUtil.cpp
@@ -128,7 +128,6 @@ LoadFromSMNoteDataStringWithPlayer(NoteData& out,
 
 		for (unsigned l = 0; l < aMeasureLines.size(); l++) {
 			const auto* p = aMeasureLines[l].first;
-			const auto* const beginLine = p;
 			const auto* const endLine = aMeasureLines[l].second;
 
 			const auto fPercentIntoMeasure =
@@ -172,7 +171,7 @@ LoadFromSMNoteDataStringWithPlayer(NoteData& out,
 						// This is the end of a hold. Search for the beginning.
 						int iHeadRow;
 						if (!out.IsHoldNoteAtRow(iTrack, iIndex, &iHeadRow)) {
-							int n = intptr_t(endLine) - intptr_t(beginLine);
+							//int n = intptr_t(endLine) - intptr_t(beginLine);
 						} else {
 							out.FindTapNote(iTrack, iHeadRow)
 							  ->second.iDuration = iIndex - iHeadRow;
diff --git a/src/Etterna/Models/NoteData/NoteDataWithScoring.cpp b/src/Etterna/Models/NoteData/NoteDataWithScoring.cpp
index 214846454d..a69635c3d7 100644
--- a/src/Etterna/Models/NoteData/NoteDataWithScoring.cpp
+++ b/src/Etterna/Models/NoteData/NoteDataWithScoring.cpp
@@ -193,7 +193,6 @@ NoteDataWithScoring::GetActualRadarValues(const NoteData& in,
 	// Some of this logic is similar or identical to
 	// NoteDataUtil::CalculateRadarValues because I couldn't figure out a good
 	// way to combine them into one. -Kyz
-	auto pn = pss.m_player_number;
 	garv_state state;
 
 	auto curr_note = in.GetTapNoteRangeAllTracks(0, MAX_NOTE_ROW);
diff --git a/src/Etterna/Models/NoteLoaders/NotesLoaderKSF.cpp b/src/Etterna/Models/NoteLoaders/NotesLoaderKSF.cpp
index e241ff2a75..17b0c1a4d2 100644
--- a/src/Etterna/Models/NoteLoaders/NotesLoaderKSF.cpp
+++ b/src/Etterna/Models/NoteLoaders/NotesLoaderKSF.cpp
@@ -255,7 +255,6 @@ LoadFromKSFFile(const std::string& sPath,
 	for (t = 0; t < 13; t++)
 		iHoldStartRow[t] = -1;
 
-	auto newTick = -1;
 	auto fCurBeat = 0.0f;
 	auto prevBeat = 0.0f; // Used for hold tails.
 
@@ -601,7 +600,6 @@ LoadGlobalData(const std::string& sPath, Song& out, bool& bKIUCompliant)
 			HandleBunki(out.m_SongTiming, BPM2, BPM3, SMGap2, BPMPos3);
 		}
 	} else {
-		auto fCurBeat = 0.0f;
 		auto bDMRequired = false;
 
 		for (auto& NoteRowString : vNoteRows) {
@@ -627,8 +625,6 @@ LoadGlobalData(const std::string& sPath, Song& out, bool& bKIUCompliant)
 				// ignore whatever else...
 				// continue;
 			}
-
-			fCurBeat += 1.0f / iTickCount;
 		}
 	}
 
diff --git a/src/Etterna/Models/NoteLoaders/NotesLoaderSSC.h b/src/Etterna/Models/NoteLoaders/NotesLoaderSSC.h
index e32d89ba16..213add9d5b 100644
--- a/src/Etterna/Models/NoteLoaders/NotesLoaderSSC.h
+++ b/src/Etterna/Models/NoteLoaders/NotesLoaderSSC.h
@@ -53,13 +53,13 @@ struct StepsTagInfo
 	StepsTagInfo(SSCLoader* l, Song* s, const std::string& p, bool fc)
 	  : loader(l)
 	  , song(s)
+	  , steps(nullptr)
+	  , timing(nullptr)
 	  , path(p)
 	  , has_own_timing(false)
 	  , ssc_format(false)
 	  , from_cache(fc)
-	  , steps(nullptr)
 	  , for_load_edit(false)
-	  , timing(nullptr)
 	{
 		params = nullptr;
 	}
diff --git a/src/Etterna/Models/Songs/SongCacheIndex.cpp b/src/Etterna/Models/Songs/SongCacheIndex.cpp
index 92853246d7..4de2215dfa 100644
--- a/src/Etterna/Models/Songs/SongCacheIndex.cpp
+++ b/src/Etterna/Models/Songs/SongCacheIndex.cpp
@@ -568,7 +568,7 @@ SongCacheIndex::CacheSong(Song& song, const std::string& dir) const
 						  dir.c_str());
 				continue;
 			}
-			auto stepsID = InsertSteps(steps, songID);
+			InsertSteps(steps, songID);
 		}
 		return true;
 	} catch (std::exception& e) {
@@ -1166,7 +1166,7 @@ SongCacheIndex::SongFromStatement(Song* song, SQLite::Statement& query) const
 			auto stepsIndex = 0;
 
 			pNewNotes = song->CreateSteps();
-			int stepsID = qSteps.getColumn(stepsIndex++);
+			qSteps.getColumn(stepsIndex++);// stepsID
 			std::string chartName =
 			  static_cast<const char*>(qSteps.getColumn(stepsIndex++));
 			pNewNotes->SetChartName(chartName);
diff --git a/src/Etterna/Models/StepsAndStyles/Style.cpp b/src/Etterna/Models/StepsAndStyles/Style.cpp
index d03a573a14..d004478707 100644
--- a/src/Etterna/Models/StepsAndStyles/Style.cpp
+++ b/src/Etterna/Models/StepsAndStyles/Style.cpp
@@ -54,7 +54,7 @@ Style::StyleInputToGameInput(int iCol,
 {
 	ASSERT_M(iCol < MAX_COLS_PER_PLAYER,
 			 ssprintf("C%i", iCol));
-	auto bUsingOneSide = true;
+	// auto bUsingOneSide = true;
 
 	FOREACH_ENUM(GameController, gc)
 	{
@@ -172,13 +172,11 @@ class LunaStyle : public Luna<Style>
 	}
 	static int GetWidth(T* p, lua_State* L)
 	{
-		auto pn = PLAYER_1;
-		lua_pushnumber(L, p->GetWidth(pn));
+		lua_pushnumber(L, p->GetWidth(PLAYER_1));
 		return 1;
 	}
 	static int GetColumnInfo(T* p, lua_State* L)
 	{
-		auto pn = PLAYER_1;
 		auto iCol = IArg(2) - 1;
 		if (iCol < 0 || iCol >= p->m_iColsPerPlayer) {
 			LuaHelpers::ReportScriptErrorFmt(
diff --git a/src/Etterna/Screen/Gameplay/ScreenGameplay.cpp b/src/Etterna/Screen/Gameplay/ScreenGameplay.cpp
index 51bef1f881..a394e5b6be 100644
--- a/src/Etterna/Screen/Gameplay/ScreenGameplay.cpp
+++ b/src/Etterna/Screen/Gameplay/ScreenGameplay.cpp
@@ -412,7 +412,7 @@ ScreenGameplay::~ScreenGameplay()
 }
 
 void
-ScreenGameplay::SetupNoteDataFromRow(Steps* pSteps, int row)
+ScreenGameplay::SetupNoteDataFromRow(Steps* pSteps, int row, int maxrow)
 {
 	NoteData originalNoteData;
 	pSteps->GetNoteData(originalNoteData);
@@ -424,7 +424,7 @@ ScreenGameplay::SetupNoteDataFromRow(Steps* pSteps, int row)
 
 	m_vPlayerInfo.GetPlayerState()->Update(0);
 
-	NoteDataUtil::RemoveAllButRange(ndTransformed, row, MAX_NOTE_ROW);
+	NoteDataUtil::RemoveAllButRange(ndTransformed, row, maxrow);
 
 	// load player
 	{
@@ -790,8 +790,6 @@ ScreenGameplay::UpdateSongPosition()
 		return;
 	}
 
-	const auto rate = GAMESTATE->m_SongOptions.GetSong().m_fMusicRate;
-
 	RageTimer tm = RageZeroTimer;
 	const auto fSeconds = m_pSoundMusic->GetPositionSeconds(nullptr, &tm);
 	GAMESTATE->UpdateSongPosition(
@@ -1743,12 +1741,6 @@ ScreenGameplay::HandleScreenMessage(const ScreenMessage& SM)
 
 		const auto syncing =
 		  !GAMESTATE->IsPlaylistCourse() && AdjustSync::IsSyncDataChanged();
-		auto replaying = false;
-		if (m_vPlayerInfo.GetPlayerState()->m_PlayerController ==
-			PC_REPLAY) // don't duplicate replay saves
-		{
-			replaying = true;
-		}
 
 		if (syncing) {
 			ScreenSaveSync::PromptSaveSync(SM_GoToPrevScreen);
diff --git a/src/Etterna/Screen/Gameplay/ScreenGameplay.h b/src/Etterna/Screen/Gameplay/ScreenGameplay.h
index 52c147e7e7..0be36925d2 100644
--- a/src/Etterna/Screen/Gameplay/ScreenGameplay.h
+++ b/src/Etterna/Screen/Gameplay/ScreenGameplay.h
@@ -110,7 +110,8 @@ class ScreenGameplay : public ScreenWithMenuElements
 
 	virtual void RestartGameplay();
 
-	virtual void SetupNoteDataFromRow(Steps* pSteps, int row);
+	virtual void SetupNoteDataFromRow(Steps* pSteps, int minRow = 0,
+							  int maxrow = MAX_NOTE_ROW);
 
 	virtual void InitSongQueues();
 
diff --git a/src/Etterna/Screen/Gameplay/ScreenGameplayPractice.h b/src/Etterna/Screen/Gameplay/ScreenGameplayPractice.h
index 80f80a2398..cfc301f89c 100644
--- a/src/Etterna/Screen/Gameplay/ScreenGameplayPractice.h
+++ b/src/Etterna/Screen/Gameplay/ScreenGameplayPractice.h
@@ -42,7 +42,7 @@ class ScreenGameplayPractice : public ScreenGameplay
   protected:
 	void SetupNoteDataFromRow(Steps* pSteps,
 							  int minRow = 0,
-							  int maxrow = MAX_NOTE_ROW);
+							  int maxrow = MAX_NOTE_ROW) override;
 
   private:
 	float loopStart = ARBITRARY_MIN_GAMEPLAY_NUMBER;
diff --git a/src/Etterna/Screen/Network/ScreenNetEvaluation.cpp b/src/Etterna/Screen/Network/ScreenNetEvaluation.cpp
index a1aa4e6219..6fd2d06a78 100644
--- a/src/Etterna/Screen/Network/ScreenNetEvaluation.cpp
+++ b/src/Etterna/Screen/Network/ScreenNetEvaluation.cpp
@@ -125,7 +125,6 @@ class LunaScreenNetEvaluation : public Luna<ScreenNetEvaluation>
 	}
 	static int SetCurrentPlayerByName(T* p, lua_State* L)
 	{
-		int theNumber = 0;
 		std::string given = make_lower(SArg(1));
 		for (size_t i = 0; i < NSMAN->m_EvalPlayerData.size(); i++) {
 			EndOfGame_PlayerData& pd = NSMAN->m_EvalPlayerData[i];
diff --git a/src/Etterna/Screen/Network/ScreenNetSelectMusic.cpp b/src/Etterna/Screen/Network/ScreenNetSelectMusic.cpp
index 1b3262bb87..ef5f7cf309 100644
--- a/src/Etterna/Screen/Network/ScreenNetSelectMusic.cpp
+++ b/src/Etterna/Screen/Network/ScreenNetSelectMusic.cpp
@@ -199,8 +199,6 @@ ScreenNetSelectMusic::~ScreenNetSelectMusic()
 bool
 ScreenNetSelectMusic::MenuLeft(const InputEventPlus& input)
 {
-	PlayerNumber pn = input.pn;
-
 	m_MusicWheel.Move(-1);
 	return true;
 }
@@ -208,8 +206,6 @@ ScreenNetSelectMusic::MenuLeft(const InputEventPlus& input)
 bool
 ScreenNetSelectMusic::MenuRight(const InputEventPlus& input)
 {
-	PlayerNumber pn = input.pn;
-
 	m_MusicWheel.Move(+1);
 	return true;
 }
diff --git a/src/Etterna/Screen/Options/ScreenOptionsEditProfile.cpp b/src/Etterna/Screen/Options/ScreenOptionsEditProfile.cpp
index 6c576fc4dd..4e1798f5ba 100644
--- a/src/Etterna/Screen/Options/ScreenOptionsEditProfile.cpp
+++ b/src/Etterna/Screen/Options/ScreenOptionsEditProfile.cpp
@@ -60,12 +60,6 @@ ScreenOptionsEditProfile::ImportOptions(int iRow, const PlayerNumber& vpns)
 	Profile* pProfile =
 	  PROFILEMAN->GetLocalProfile(GAMESTATE->m_sEditLocalProfileID);
 	ASSERT(pProfile != NULL);
-	OptionRow& row = *m_pRows[iRow];
-
-	switch (iRow) {
-		case ROW_NOTHING:
-			break;
-	}
 }
 
 void
diff --git a/src/Etterna/Screen/Options/ScreenOptionsMasterPrefs.cpp b/src/Etterna/Screen/Options/ScreenOptionsMasterPrefs.cpp
index ef20d0dddb..5d337e9cb1 100644
--- a/src/Etterna/Screen/Options/ScreenOptionsMasterPrefs.cpp
+++ b/src/Etterna/Screen/Options/ScreenOptionsMasterPrefs.cpp
@@ -476,7 +476,6 @@ LuaFunction(GetTimingDifficulty, GetTimingDifficulty());
 static int
 SetTimingDifficulty(float judge)
 {
-	int iTimingDifficulty = static_cast<int>(judge);
 	auto opt = ConfOption::Find("TimingWindowScale");
 	IPreference* pPref = IPreference::GetPreferenceByName(opt->m_sPrefName);
 	pPref->FromString(ToString(judge));
diff --git a/src/Etterna/Screen/Others/ScreenServiceAction.cpp b/src/Etterna/Screen/Others/ScreenServiceAction.cpp
index 4d4bb9b824..9a91f75382 100644
--- a/src/Etterna/Screen/Others/ScreenServiceAction.cpp
+++ b/src/Etterna/Screen/Others/ScreenServiceAction.cpp
@@ -24,37 +24,6 @@ static LocalizedString PROFILE_CORRUPT(
   "ScreenServiceAction",
   "The profile on P%d card contains corrupt or tampered data.");
 
-static void
-CopyEdits(const std::string& sFromProfileDir,
-		  const std::string& sToProfileDir,
-		  int& iNumSucceeded,
-		  int& iNumOverwritten,
-		  int& iNumIgnored,
-		  int& iNumErrored)
-{
-	iNumSucceeded = 0;
-	iNumOverwritten = 0;
-	iNumIgnored = 0;
-	iNumErrored = 0;
-
-	{
-		std::string sFromDir = sFromProfileDir + EDIT_STEPS_SUBDIR;
-		std::string sToDir = sToProfileDir + EDIT_STEPS_SUBDIR;
-
-		std::vector<std::string> vsFiles;
-		GetDirListing(sFromDir + "*.edit", vsFiles, false, false);
-		for (auto& i : vsFiles) {
-			if (DoesFileExist(sToDir + i))
-				iNumOverwritten++;
-			bool bSuccess = FileCopy(sFromDir + i, sToDir + i);
-			if (bSuccess)
-				iNumSucceeded++;
-			else
-				iNumErrored++;
-		}
-	}
-}
-
 static LocalizedString EDITS_NOT_COPIED(
   "ScreenServiceAction",
   "Edits not copied - No memory cards ready.");
diff --git a/src/Etterna/Screen/Others/ScreenSongOptions.cpp b/src/Etterna/Screen/Others/ScreenSongOptions.cpp
index 397d3c77f1..c238cfff3a 100644
--- a/src/Etterna/Screen/Others/ScreenSongOptions.cpp
+++ b/src/Etterna/Screen/Others/ScreenSongOptions.cpp
@@ -23,7 +23,6 @@ ScreenSongOptions::Init()
 void
 ScreenSongOptions::ExportOptions(int iRow, const PlayerNumber& vpns)
 {
-	PlayerNumber pn = GAMESTATE->GetMasterPlayerNumber();
 	PlayerState* pPS = GAMESTATE->m_pPlayerState;
 	const FailType ft = pPS->m_PlayerOptions.GetPreferred().m_FailType;
 
diff --git a/src/Etterna/Screen/Others/ScreenWithMenuElements.cpp b/src/Etterna/Screen/Others/ScreenWithMenuElements.cpp
index 12bb64d735..aa59f21492 100644
--- a/src/Etterna/Screen/Others/ScreenWithMenuElements.cpp
+++ b/src/Etterna/Screen/Others/ScreenWithMenuElements.cpp
@@ -237,13 +237,6 @@ ScreenWithMenuElements::StartTransitioningScreen(ScreenMessage smSendWhenDone)
 	TweenOffScreen();
 
 	m_Out.StartTransitioning(std::move(smSendWhenDone));
-	if (WAIT_FOR_CHILDREN_BEFORE_TWEENING_OUT) {
-		// Time the transition so that it finishes exactly when all actors have
-		// finished tweening.
-		float fSecondsUntilFinished = GetTweenTimeLeft();
-		float fSecondsUntilBeginOff =
-		  std::max(fSecondsUntilFinished - m_Out.GetTweenTimeLeft(), 0.F);
-	}
 }
 
 void
diff --git a/src/Etterna/Singletons/DownloadManager.cpp b/src/Etterna/Singletons/DownloadManager.cpp
index b68a5402b1..035f2cd4eb 100644
--- a/src/Etterna/Singletons/DownloadManager.cpp
+++ b/src/Etterna/Singletons/DownloadManager.cpp
@@ -974,7 +974,7 @@ DownloadManager::UploadScore(HighScore* hs,
 	SetCURLURL(curlHandle, url);
 	curl_easy_setopt_log_err(curlHandle, CURLOPT_POST, 1L);
 	curl_easy_setopt_log_err(curlHandle, CURLOPT_HTTPPOST, form);
-	auto done = [this, hs, callback, load_from_disk](HTTPRequest& req) {
+	auto done = [hs, callback, load_from_disk](HTTPRequest& req) {
 		long response_code;
 		curl_easy_getinfo(req.handle, CURLINFO_RESPONSE_CODE, &response_code);
 		Document d;
diff --git a/src/Etterna/Singletons/FilterManager.cpp b/src/Etterna/Singletons/FilterManager.cpp
index eacf6515aa..f4dee473c5 100644
--- a/src/Etterna/Singletons/FilterManager.cpp
+++ b/src/Etterna/Singletons/FilterManager.cpp
@@ -168,7 +168,6 @@ class LunaFilterManager : public Luna<FilterManager>
 	}
 	static int GetMinFilterRate(T* p, lua_State* L)
 	{
-		auto loot = p->m_pPlayerState;
 		lua_pushnumber(L, p->MinFilterRate);
 		return 1;
 	}
diff --git a/src/Etterna/Singletons/GameState.cpp b/src/Etterna/Singletons/GameState.cpp
index 836f47ff0a..7d7981f5d8 100644
--- a/src/Etterna/Singletons/GameState.cpp
+++ b/src/Etterna/Singletons/GameState.cpp
@@ -686,21 +686,10 @@ GameState::ForceOtherPlayersToCompatibleSteps(PlayerNumber main)
 	if (steps_to_match == nullptr) {
 		return;
 	}
-	int num_players = GAMESTATE->GetNumPlayersEnabled();
-	StyleType styletype_to_match =
-	  GAMEMAN
-		->GetFirstCompatibleStyle(
-		  GAMESTATE->GetCurrentGame(), num_players, steps_to_match->m_StepsType)
-		->m_StyleType;
 	std::string music_to_match = steps_to_match->GetMusicFile();
 	Steps* pn_steps = m_pCurSteps.Get();
 	bool match_failed = pn_steps == nullptr;
 	if (steps_to_match != pn_steps && pn_steps != nullptr) {
-		StyleType pn_styletype =
-		  GAMEMAN
-			->GetFirstCompatibleStyle(
-			  GAMESTATE->GetCurrentGame(), num_players, pn_steps->m_StepsType)
-			->m_StyleType;
 		if (music_to_match != pn_steps->GetMusicFile()) {
 			match_failed = true;
 		}
@@ -1084,7 +1073,6 @@ setmax(T& a, const T& b)
 FailType
 GameState::GetPlayerFailType(const PlayerState* pPlayerState) const
 {
-	PlayerNumber pn = pPlayerState->m_PlayerNumber;
 	FailType ft = pPlayerState->m_PlayerOptions.GetCurrent().m_FailType;
 	return ft;
 }
diff --git a/src/Etterna/Singletons/InputFilter.cpp b/src/Etterna/Singletons/InputFilter.cpp
index 5a4f10c083..5d46a46351 100644
--- a/src/Etterna/Singletons/InputFilter.cpp
+++ b/src/Etterna/Singletons/InputFilter.cpp
@@ -272,8 +272,6 @@ InputFilter::CheckButtonChange(ButtonState& bs,
 	if (bs.m_BeingHeld == bs.m_bLastReportedHeld)
 		return;
 
-	GameInput gi;
-
 	// Possibly apply debounce
 	std::chrono::duration<float> timeDelta = now - bs.m_LastReportTime;
 	float delta = timeDelta.count();
diff --git a/src/Etterna/Singletons/NetworkSyncManager.cpp b/src/Etterna/Singletons/NetworkSyncManager.cpp
index b89eb2f1b0..59519b2582 100644
--- a/src/Etterna/Singletons/NetworkSyncManager.cpp
+++ b/src/Etterna/Singletons/NetworkSyncManager.cpp
@@ -524,7 +524,7 @@ ETTProtocol::Connect(NetworkSyncManager* n,
 		n->isSMOnline = true;
 		Locator::getLogger()->info("Connected to ett server: {}", address.c_str());
 	};
-	auto failHandler = [n, this, address, &finished_connecting](
+	auto failHandler = [n, address, &finished_connecting](
 						 websocketpp::connection_hdl hdl) {
 		if (NSMAN == nullptr)
 			return;
@@ -1232,7 +1232,6 @@ ETTProtocol::Update(NetworkSyncManager* n, float fDeltaTime)
 				} break;
 				case ettps_lobbyuserlistupdate: {
 					auto& payload = d["payload"];
-					auto& vec = NSMAN->lobbyuserlist;
 					if (payload.HasMember("on") && payload["on"].IsArray()) {
 						auto& newUsers = payload["on"];
 						for (auto& user : newUsers.GetArray()) {
@@ -2100,7 +2099,6 @@ LuaFunction(IsSMOnlineLoggedIn, NSMAN->loggedIn)
 	}
 	static int GetMPLeaderboard(T* p, lua_State* L)
 	{
-		auto& lbd = NSMAN->mpleaderboard;
 		NSMAN->PushMPLeaderboard(L);
 		return 1;
 	}
diff --git a/src/Etterna/Singletons/PrefsManager.cpp b/src/Etterna/Singletons/PrefsManager.cpp
index d66442690f..0c0b19f61f 100644
--- a/src/Etterna/Singletons/PrefsManager.cpp
+++ b/src/Etterna/Singletons/PrefsManager.cpp
@@ -97,10 +97,11 @@ ValidateDisplayAspectRatio(float& val)
 PrefsManager::PrefsManager()
   : m_sCurrentGame("CurrentGame", "")
   , m_sAnnouncer("Announcer", "")
-  , m_sTheme("Theme", SpecialFiles::BASE_THEME_NAME)
   , m_sDefaultModifiers("DefaultModifiers", "")
+  , m_sTheme("Theme", SpecialFiles::BASE_THEME_NAME)
   , m_bFullscreenIsBorderlessWindow("FullscreenIsBorderlessWindow", false)
 
+
   , m_bWindowed("Windowed", true)
   , m_sDisplayId("DisplayId", "")
   , m_iDisplayWidth("DisplayWidth", 800)
@@ -109,96 +110,104 @@ PrefsManager::PrefsManager()
 						  16 / 9.f,
 						  ValidateDisplayAspectRatio)
   , m_iDisplayColorDepth("DisplayColorDepth", 32)
-  , m_sLastSeenVideoDriver("LastSeenVideoDriver", "")
-  , m_sVideoRenderers("VideoRenderers", "")
-
-  , m_bInterlaced("Interlaced", false)
-  , m_bPAL("PAL", false)
+  , m_iTextureColorDepth("TextureColorDepth", 32)
+  , m_iMovieColorDepth("MovieColorDepth", 32)
+  , m_bStretchBackgrounds("StretchBackgrounds", false)
+  , m_BGFitMode("BackgroundFitMode", BFM_CoverPreserve)
+  , m_HighResolutionTextures("HighResolutionTextures",
+							 HighResolutionTextures_Auto)
+  , m_iMaxTextureResolution("MaxTextureResolution", 1024)
   , m_iRefreshRate("RefreshRate", REFRESH_DEFAULT)
+  , m_bAllowMultitexture("AllowMultitexture", true)
+  , m_bAllowedLag("AllowedLag", 0.001f)
+  , m_bShowStats("ShowStats", TRUE_IF_DEBUG)
+  , m_bShowSkips("ShowSkips", true)
+  , m_bShowMouseCursor("ShowMouseCursor", true)
   , m_bVsync("Vsync", false)
+  , m_FastNoteRendering("FastNoteRendering", true)
+  , m_bInterlaced("Interlaced", false)
+  , m_bPAL("PAL", false)
+  , m_bDelayedTextureDelete("DelayedTextureDeletion", true)
+  , m_bDelayedModelDelete("DelayedModelDelete", false)
+  , m_ImageCache("CacheImages", IMGCACHE_OFF)
+  , m_bFastLoad("FastLoad", true)
+  , m_bBlindlyTrustCache("BlindlyTrustCache", true)
+  , m_bShrinkSongCache("RemoveCacheEntriesForDeletedSongs", false)
+  , m_NeverCacheList("NeverCacheList", "")
+
+  , m_bOnlyDedicatedMenuButtons("OnlyDedicatedMenuButtons", false)
+  , m_bMenuTimer("MenuTimer", false)
+
+  , m_fLifeDifficultyScale("LifeDifficultyScale", 1.0f)
+  , m_fBGBrightness("BGBrightness", 0.2f)
+  , m_bShowBackgrounds("ShowBackgrounds", true)
+
+  , m_bDelayedBack("DelayedBack", false)
+  , m_AllowStartToGiveUp("AllowStartToGiveUp", true)
+  , m_AllowHoldForOptions("AllowHoldForOptions", true)
+  , m_bShowNativeLanguage("ShowNativeLanguage", true)
+  , m_bFullTapExplosions("FullTapExplosions", true)
+  , m_bNoGlow("NoGlow", false)
+  , m_bReplaysUseScoreMods("ReplaysUseScoreMods", true)
+  , m_iArcadeOptionsNavigation("ArcadeOptionsNavigation", 0)
+  , m_ThreeKeyNavigation("ThreeKeyNavigation", false)
+  , m_MusicWheelUsesSections("MusicWheelUsesSections",
+							 MusicWheelUsesSections_ALWAYS)
+  , m_iMusicWheelSwitchSpeed("MusicWheelSwitchSpeed", 15)
+  , m_bSortBySSRNorm("SortBySSRNormPercent", false)
+  , m_bPackProgressInWheel("PackProgressInWheel", false)
+  , m_bEventMode("EventMode", true)
+  , m_MinTNSToHideNotes("MinTNSToHideNotes", TNS_W3)
+
+  , m_ShowSongOptions("ShowSongOptions", Maybe_NO)
+  , m_fMinPercentToSaveScores("MinPercentToSaveScores", -1.0f)
+  , m_fGlobalOffsetSeconds("GlobalOffsetSeconds", 0)
+  , m_sLanguage("Language", "")
   , m_iCenterImageTranslateX("CenterImageTranslateX", 0)
   , m_iCenterImageTranslateY("CenterImageTranslateY", 0)
   , m_fCenterImageAddWidth("CenterImageAddWidth", 0)
   , m_fCenterImageAddHeight("CenterImageAddHeight", 0)
+  , EnablePitchRates("EnablePitchRates", true)
+  , LiftsOnOsuHolds("LiftsOnOsuHolds", false)
+  , m_bEasterEggs("EasterEggs", true)
+  , m_AllowMultipleToasties("MultiToasty", false)
+  , m_bUseMidGrades("UseMidGrades", false)
+
+  , m_fPadStickSeconds("PadStickSeconds", 0)
+
+  , m_bForceMipMaps("ForceMipMaps", false)
+  , m_bTrilinearFiltering("TrilinearFiltering", false)
+  , m_bAnisotropicFiltering("AnisotropicFiltering", false)
 
-  , m_fGlobalOffsetSeconds("GlobalOffsetSeconds", 0)
   , m_sAdditionalSongFolders("AdditionalSongFolders", "")
   , m_sAdditionalFolders("AdditionalFolders", "")
 
-  , m_bAllowedLag("AllowedLag", 0.001f)
-  , m_AllowHoldForOptions("AllowHoldForOptions", true)
-  , m_AllowStartToGiveUp("AllowStartToGiveUp", true)
-  , m_bAllowMultitexture("AllowMultitexture", true)
-  , m_bAllowUnacceleratedRenderer("AllowUnacceleratedRenderer", false)
-  , m_bAnisotropicFiltering("AnisotropicFiltering", false)
-  , m_iArcadeOptionsNavigation("ArcadeOptionsNavigation", 0)
-  , m_BGFitMode("BackgroundFitMode", BFM_CoverPreserve)
-  , m_bBlindlyTrustCache("BlindlyTrustCache", true)
-  , m_ImageCache("CacheImages", IMGCACHE_OFF)
   , m_sDefaultTheme("DefaultTheme", "Rebirth")
-  , m_bDelayedBack("DelayedBack", false)
-  , m_bDelayedModelDelete("DelayedModelDelete", false)
-  , m_bDelayedTextureDelete("DelayedTextureDeletion", true)
-  , m_bEasterEggs("EasterEggs", true)
-  , m_AllowMultipleToasties("MultiToasty", false)
-  , EnablePitchRates("EnablePitchRates", true)
-  , m_bEnableScoreboard("EnableScoreboard", true)
-  , m_bEventMode("EventMode", true)
-  , m_bFastLoad("FastLoad", true)
-  , m_FastNoteRendering("FastNoteRendering", true)
-  , m_bForceMipMaps("ForceMipMaps", false)
-  , m_bFullTapExplosions("FullTapExplosions", true)
-  , m_HighResolutionTextures("HighResolutionTextures",
-							 HighResolutionTextures_Auto)
-  , m_sLanguage("Language", "")
-  , m_fLifeDifficultyScale("LifeDifficultyScale", 1.0f)
-  , LiftsOnOsuHolds("LiftsOnOsuHolds", false)
-  , m_bLogToDisk("LogToDisk", true)
-  , m_iMaxTextureResolution("MaxTextureResolution", 1024)
-  , m_bMenuTimer("MenuTimer", false)
-  , m_fMinPercentToSaveScores("MinPercentToSaveScores", -1.0f)
-  , m_MinTNSToHideNotes("MinTNSToHideNotes", TNS_W3)
-  , m_iMovieColorDepth("MovieColorDepth", 32)
-  , m_MusicWheelUsesSections("MusicWheelUsesSections",
-							 MusicWheelUsesSections_ALWAYS)
-  , m_iMusicWheelSwitchSpeed("MusicWheelSwitchSpeed", 15)
-  , m_MuteActions("MuteActions", false)
-  , m_NeverCacheList("NeverCacheList", "")
-  , m_bNoGlow("NoGlow", false)
-  , m_bOnlyDedicatedMenuButtons("OnlyDedicatedMenuButtons", false)
-  , m_fPadStickSeconds("PadStickSeconds", 0)
-  , m_bPseudoLocalize("PseudoLocalize", false)
-  , m_bShrinkSongCache("RemoveCacheEntriesForDeletedSongs", false)
-  , m_bReplaysUseScoreMods("ReplaysUseScoreMods", true)
-  , m_bShowMouseCursor("ShowMouseCursor", true)
-  , m_bShowLoadingWindow("ShowLoadingWindow", true)
-  , m_bShowNativeLanguage("ShowNativeLanguage", true)
-  , m_bShowStats("ShowStats", TRUE_IF_DEBUG)
-  , m_bShowSkips("ShowSkips", true)
-  , m_ShowSongOptions("ShowSongOptions", Maybe_NO)
+
+  , m_sLastSeenVideoDriver("LastSeenVideoDriver", "")
+  , m_sVideoRenderers("VideoRenderers", "")
+
   , m_bSmoothLines("SmoothLines", false)
-  , m_bSortBySSRNorm("SortBySSRNormPercent", false)
-  , m_bPackProgressInWheel("PackProgressInWheel", false)
+  , m_iSoundWriteAhead("SoundWriteAhead", 0)
   , m_iSoundDevice("SoundDevice", "")
   , m_iSoundPreferredSampleRate("SoundPreferredSampleRate", 0)
-  , m_iSoundWriteAhead("SoundWriteAhead", 0)
-  , m_bStretchBackgrounds("StretchBackgrounds", false)
-  , m_fBGBrightness("BGBrightness", 0.2f)
-  , m_bShowBackgrounds("ShowBackgrounds", true)
-  , m_iTextureColorDepth("TextureColorDepth", 32)
+  , m_bAllowUnacceleratedRenderer("AllowUnacceleratedRenderer", false)
   , m_bThreadedInput("ThreadedInput", true)
   , m_bThreadedMovieDecode("ThreadedMovieDecode", true)
+  , m_MuteActions("MuteActions", false)
   , ThreadsToUse("ThreadsToUse", 0)
-  , m_ThreeKeyNavigation("ThreeKeyNavigation", false)
-  , m_bTrilinearFiltering("TrilinearFiltering", false)
-  , m_bUseMidGrades("UseMidGrades", false)
-  , m_logging_level("LoggingLevel", 2)
-  , m_UnfocusedSleepMillisecs("UnfocusedSleepMilliseconds", 10)
+  , m_bLogToDisk("LogToDisk", true)
+
   , m_bForceLogFlush("ForceLogFlush", TRUE_IF_DEBUG)
   , m_bShowLogOutput("ShowLogOutput", TRUE_IF_DEBUG)
   , m_bLogSkips("LogSkips", false)
+  , m_bShowLoadingWindow("ShowLoadingWindow", true)
+  , m_bPseudoLocalize("PseudoLocalize", false)
   , m_show_theme_errors("ShowThemeErrors", false)
   , m_bAlwaysLoadCalcParams("AlwaysLoadCalcParams", false)
+  , m_UnfocusedSleepMillisecs("UnfocusedSleepMilliseconds", 10)
+  , m_logging_level("LoggingLevel", 2)
+  , m_bEnableScoreboard("EnableScoreboard", true)
   , m_bEnableCrashUpload("EnableMinidumpUpload", false)
   , m_bShowMinidumpUploadDialogue("ShowMinidumpUploadDialogue", true)
 
diff --git a/src/Etterna/Singletons/PrefsManager.h b/src/Etterna/Singletons/PrefsManager.h
index ebcff43412..ff4ec4b5f0 100644
--- a/src/Etterna/Singletons/PrefsManager.h
+++ b/src/Etterna/Singletons/PrefsManager.h
@@ -116,6 +116,7 @@ class PrefsManager
 
   public:
 	Preference<std::string> m_sTheme;
+	Preference<bool> m_bFullscreenIsBorderlessWindow;
 	Preference<bool> m_bWindowed;
 	Preference<std::string> m_sDisplayId;
 	Preference<int> m_iDisplayWidth;
@@ -131,7 +132,6 @@ class PrefsManager
 	Preference<int> m_iRefreshRate;
 	Preference<bool> m_bAllowMultitexture;
 	Preference<float> m_bAllowedLag;
-	Preference<bool> m_bFullscreenIsBorderlessWindow;
 	Preference<bool> m_bShowStats;
 	Preference<bool> m_bShowSkips;
 	Preference<bool> m_bShowMouseCursor;
diff --git a/src/Etterna/Singletons/ProfileManager.cpp b/src/Etterna/Singletons/ProfileManager.cpp
index 58e590dbd1..9eb7488678 100644
--- a/src/Etterna/Singletons/ProfileManager.cpp
+++ b/src/Etterna/Singletons/ProfileManager.cpp
@@ -366,6 +366,7 @@ InsertProfileIntoList(DirAndProfile& derp)
 	bool inserted = false;
 	derp.profile.m_ListPriority = 0;
 	for (auto& curr : g_vLocalProfile) {
+		std::ignore = curr;
 		++derp.profile.m_ListPriority;
 	}
 
diff --git a/src/Etterna/Singletons/ScoreManager.cpp b/src/Etterna/Singletons/ScoreManager.cpp
index df41e60bb0..fa7b424e9d 100644
--- a/src/Etterna/Singletons/ScoreManager.cpp
+++ b/src/Etterna/Singletons/ScoreManager.cpp
@@ -430,7 +430,6 @@ ScoreManager::RecalculateSSRs(LoadingWindow* ld)
 					" scores");
 	}
 	auto onePercent = std::max(static_cast<int>(scores.size() / 100 * 5), 1);
-	auto scoreindex = 0;
 
 	mutex songVectorPtrMutex;
 	std::vector<std::uintptr_t> currentlyLockedSongs;
@@ -443,8 +442,8 @@ ScoreManager::RecalculateSSRs(LoadingWindow* ld)
 		  currentlyLockedSongs; // Vector of currently locked songs
 		std::uintptr_t song;	// The song for this lock
 		SongLock(std::vector<std::uintptr_t>& vec, mutex& mut, std::uintptr_t k)
-		  : currentlyLockedSongs(vec)
-		  , songVectorPtrMutex(mut)
+		  : songVectorPtrMutex(mut)
+		  , currentlyLockedSongs(vec)
 		  , song(k)
 		{
 			auto active = true;
@@ -659,8 +658,8 @@ ScoreManager::RecalculateSSRs(const string& profileID)
 		  currentlyLockedSongs; // Vector of currently locked songs
 		std::uintptr_t song;	// The song for this lock
 		SongLock(std::vector<std::uintptr_t>& vec, mutex& mut, std::uintptr_t k)
-		  : currentlyLockedSongs(vec)
-		  , songVectorPtrMutex(mut)
+		  : songVectorPtrMutex(mut)
+		  , currentlyLockedSongs(vec)
 		  , song(k)
 		{
 			auto active = true;
diff --git a/src/Etterna/Singletons/SongManager.cpp b/src/Etterna/Singletons/SongManager.cpp
index 235cc7848e..8741b978d5 100644
--- a/src/Etterna/Singletons/SongManager.cpp
+++ b/src/Etterna/Singletons/SongManager.cpp
@@ -156,11 +156,9 @@ SongManager::DifferentialReloadDir(string dir) -> int
 
 	std::vector<Group> groups;
 	Group unknownGroup("Unknown Group");
-	int groupIndex;
 	int songCount;
 	int songIndex;
 
-	groupIndex = 0;
 	songCount = 0;
 	for (const auto& folder : folders) {
 		if (IsSongDir(dir + folder)) {
@@ -187,7 +185,6 @@ SongManager::DifferentialReloadDir(string dir) -> int
 		return 0;
 	}
 
-	groupIndex = 0;
 	songIndex = 0;
 
 	for (auto& group : groups) {
@@ -328,7 +325,6 @@ SongManager::InitSongsFromDisk(LoadingWindow* ld)
 			auto pair =
 			  static_cast<std::pair<int, LoadingWindow*>*>(data->data);
 			auto onePercent = pair->first;
-			auto ld = pair->second;
 			auto cacheIndex = 0;
 			auto lastUpdate = 0;
 			for (auto it = workload.first; it != workload.second; it++) {
@@ -805,7 +801,6 @@ SongManager::LoadStepManiaSongDir(std::string sDir, LoadingWindow* ld)
 	Locator::getLogger()->info("LoadStepmaniaSongDir Starting: {}", sDir);
 	std::vector<std::string> songFolders;
 	GetDirListing(sDir + "*", songFolders, true);
-	auto songCount = 0;
 	if (ld != nullptr) {
 		ld->SetIndeterminate(false);
 		ld->SetTotalWork(songFolders.size());
@@ -813,7 +808,6 @@ SongManager::LoadStepManiaSongDir(std::string sDir, LoadingWindow* ld)
 	}
 	std::vector<Group> groups;
 	auto unknownGroup = Group(std::string("Unknown Group"));
-	auto foldersChecked = 0;
 	auto onePercent = std::max(static_cast<int>(songFolders.size() / 100), 1);
 	for (const auto& folder : songFolders) {
 		auto burp = sDir + folder;
@@ -822,7 +816,6 @@ SongManager::LoadStepManiaSongDir(std::string sDir, LoadingWindow* ld)
 		} else {
 			auto group = Group(folder);
 			GetDirListing(sDir + folder + "/*", group.songs, true, true);
-			songCount += group.songs.size();
 			groups.emplace_back(group);
 		}
 	}
@@ -836,7 +829,6 @@ SongManager::LoadStepManiaSongDir(std::string sDir, LoadingWindow* ld)
 		ld->SetText("Loading Songs From Disk\n");
 		ld->SetProgress(0);
 	}
-	auto groupIndex = 0;
 	onePercent = std::max(static_cast<int>(groups.size() / 100), 1);
 
 	auto callback = [&sDir](
@@ -846,7 +838,6 @@ SongManager::LoadStepManiaSongDir(std::string sDir, LoadingWindow* ld)
 
 		auto pair = static_cast<std::pair<int, LoadingWindow*>*>(data->data);
 		auto onePercent = pair->first;
-		auto ld = pair->second;
 		auto counter = 0;
 		auto lastUpdate = 0;
 		for (auto it = workload.first; it != workload.second; it++) {
@@ -861,7 +852,6 @@ SongManager::LoadStepManiaSongDir(std::string sDir, LoadingWindow* ld)
 			}
 			auto loaded = 0;
 			SongPointerVector& index_entry = SONGMAN->m_mapSongGroupIndex[sGroupName];
-			const auto& group_base_name = sGroupName;
 			for (auto& sSongDirName : arraySongDirs) {
 				auto hur = make_lower(sSongDirName + "/");
 				if (SONGMAN->m_SongsByDir.count(hur) != 0u) {
@@ -1721,14 +1711,14 @@ class LunaPlaylist : public Luna<Playlist>
 	{
 		p->AddChart(SArg(1));
 		PROFILEMAN->SaveProfile(PLAYER_1);
-		return 1;
+		return 0;
 	}
 
 	static auto DeleteChart(T* p, lua_State* L) -> int
 	{
 		p->DeleteChart(IArg(1) - 1);
 		PROFILEMAN->SaveProfile(PLAYER_1);
-		return 1;
+		return 0;
 	}
 
 	static auto GetNumCharts(T* p, lua_State* L) -> int
diff --git a/src/Etterna/Singletons/StatsManager.cpp b/src/Etterna/Singletons/StatsManager.cpp
index 4fb45102ce..950ec9e8c7 100644
--- a/src/Etterna/Singletons/StatsManager.cpp
+++ b/src/Etterna/Singletons/StatsManager.cpp
@@ -253,14 +253,6 @@ class LunaStatsManager : public Luna<StatsManager>
 		auto top_grade = Grade_Failed;
 		StageStats stats;
 		t->GetFinalEvalStageStats(stats);
-		// If this player failed any stage, then their final grade is an F.
-		auto bPlayerFailedOneStage = false;
-		for (auto& ss : STATSMAN->m_vPlayedStageStats) {
-			if (ss.m_player.m_bFailed) {
-				bPlayerFailedOneStage = true;
-				break;
-			}
-		}
 
 		top_grade = std::min(top_grade, stats.m_player.GetGrade());
 
diff --git a/src/RageUtil/File/RageFileManager.cpp b/src/RageUtil/File/RageFileManager.cpp
index 8fd1aaafa3..67c6a66539 100644
--- a/src/RageUtil/File/RageFileManager.cpp
+++ b/src/RageUtil/File/RageFileManager.cpp
@@ -197,10 +197,10 @@ ExtractDirectory(std::string sPath)
 	return sPath;
 }
 
+#if defined(__unix__) || defined(__APPLE__)
 static std::string
 ReadlinkRecursive(std::string sPath)
 {
-#if defined(__unix__) || defined(__APPLE__)
 	// unices support symbolic links; dereference them
 	std::string dereferenced = sPath;
 	do {
@@ -217,10 +217,10 @@ ReadlinkRecursive(std::string sPath)
 			}
 		}
 	} while (sPath != dereferenced);
-#endif
 
 	return sPath;
 }
+#endif
 
 static std::string
 GetDirOfExecutable(std::string argv0)
diff --git a/src/RageUtil/Graphics/RageDisplay_D3D.cpp b/src/RageUtil/Graphics/RageDisplay_D3D.cpp
index 8966f9f140..e389f1de4c 100644
--- a/src/RageUtil/Graphics/RageDisplay_D3D.cpp
+++ b/src/RageUtil/Graphics/RageDisplay_D3D.cpp
@@ -17,8 +17,18 @@
 #include <map>
 #include <list>
 #include <chrono>
-#include <D3dx9tex.h>
+
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnew-returns-null"
+#pragma clang diagnostic ignored "-Wcomment"
+#endif
+#include <d3dx9tex.h>
 #include <d3d9.h>
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 
 // Static libraries
 // load Windows D3D9 dynamically
@@ -1472,6 +1482,8 @@ RageDisplay_D3D::SetTextureMode(TextureUnit tu, TextureMode tm)
 			g_pd3dDevice->SetTextureStageState(
 			  tu, D3DTSS_ALPHAOP, D3DTOP_MODULATE);
 			break;
+		default:
+			Locator::getLogger()->warn("RageDisplay_D3D::SetTextureMode called with invalid TextureMode");
 	}
 }
 
diff --git a/src/RageUtil/Graphics/RageSurfaceUtils.cpp b/src/RageUtil/Graphics/RageSurfaceUtils.cpp
index d169abc3e7..baa1316f92 100644
--- a/src/RageUtil/Graphics/RageSurfaceUtils.cpp
+++ b/src/RageUtil/Graphics/RageSurfaceUtils.cpp
@@ -251,7 +251,7 @@ RageSurfaceUtils::GetAverageRGB(const RageSurface* img, unsigned pixelIncrement)
 	if (pixelCount <= 0)
 		return RageColor(0,0,0,1.F);
 	
-	return RageColor(rt / pixelCount / 255.F, gt / pixelCount / 255.F, gt / pixelCount / 255.F, 1.F);
+	return RageColor(rt / pixelCount / 255.F, gt / pixelCount / 255.F, bt / pixelCount / 255.F, 1.F);
 }
 
 // Local helper for FixHiddenAlpha.
diff --git a/src/RageUtil/Misc/RageMath.cpp b/src/RageUtil/Misc/RageMath.cpp
index 25905290b9..0db3b55ebe 100644
--- a/src/RageUtil/Misc/RageMath.cpp
+++ b/src/RageUtil/Misc/RageMath.cpp
@@ -12,7 +12,19 @@
 #include <algorithm>
 
 #ifdef _WIN32
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnew-returns-null"
+#pragma clang diagnostic ignored "-Wcomment"
+#endif
+
 #include <d3dx9math.h>
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
 #endif
 
 void
diff --git a/src/RageUtil/Misc/RageThreads.cpp b/src/RageUtil/Misc/RageThreads.cpp
index c5ecb97db2..c97c005a3d 100644
--- a/src/RageUtil/Misc/RageThreads.cpp
+++ b/src/RageUtil/Misc/RageThreads.cpp
@@ -208,18 +208,6 @@ GetThreadSlotFromID(uint64_t iID)
 	return NULL;
 }
 
-static ThreadSlot*
-GetCurThreadSlot()
-{
-	return GetThreadSlotFromID(RageThread::GetCurrentThreadID());
-}
-
-static ThreadSlot*
-GetUnknownThreadSlot()
-{
-	return g_pUnknownThreadSlot;
-}
-
 RageThread::RageThread()
   : m_pSlot(NULL)
   , m_sName("unnamed")
diff --git a/src/RageUtil/Misc/RageUnicode.cpp b/src/RageUtil/Misc/RageUnicode.cpp
index bcaca22738..3fcd664184 100644
--- a/src/RageUtil/Misc/RageUnicode.cpp
+++ b/src/RageUtil/Misc/RageUnicode.cpp
@@ -158,6 +158,10 @@ Rage::wchar_to_utf8(wchar_t ch, std::string& out)
 		return;
 	}
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-constant-out-of-range-compare"
+#endif
 	int cbytes = 0;
 	if (ch < 0x800)
 		cbytes = 1;
@@ -180,6 +184,9 @@ Rage::wchar_to_utf8(wchar_t ch, std::string& out)
 		const int shift = (cbytes - i - 1) * 6;
 		out.append(1, static_cast<char>(0x80 | ((ch >> shift) & 0x3F)));
 	}
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 }
 
 wchar_t
diff --git a/src/RageUtil/Utils/RageUtil.cpp b/src/RageUtil/Utils/RageUtil.cpp
index 2e4ed5d8ef..4b426a93b3 100644
--- a/src/RageUtil/Utils/RageUtil.cpp
+++ b/src/RageUtil/Utils/RageUtil.cpp
@@ -1710,6 +1710,10 @@ wchar_to_utf8(wchar_t ch, std::string& out)
 		return;
 	}
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-constant-out-of-range-compare"
+#endif
 	auto cbytes = 0;
 	if (ch < 0x800)
 		cbytes = 1;
@@ -1732,6 +1736,9 @@ wchar_to_utf8(wchar_t ch, std::string& out)
 		const auto shift = (cbytes - i - 1) * 6;
 		out.append(1, static_cast<char>(0x80 | (ch >> shift & 0x3F)));
 	}
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 }
 
 wchar_t
diff --git a/src/RageUtil/Utils/RageUtil.h b/src/RageUtil/Utils/RageUtil.h
index 2d011c6d5f..c5e982e991 100644
--- a/src/RageUtil/Utils/RageUtil.h
+++ b/src/RageUtil/Utils/RageUtil.h
@@ -221,13 +221,13 @@ ssicmp(const CT* pA1, const CT* pA2) -> int
 	return static_cast<int>(f - l);
 }
 
-static auto
+inline auto
 CompareNoCase(const std::string& a, const std::string& b) -> int
 {
 	return ssicmp(a.c_str(), b.c_str());
 }
 
-static auto
+inline auto
 EqualsNoCase(const std::string& a, const std::string& b) -> bool
 {
 	return CompareNoCase(a, b) == 0;
@@ -236,7 +236,7 @@ EqualsNoCase(const std::string& a, const std::string& b) -> bool
 void
 s_replace(std::string& target, std::string const& from, std::string const& to);
 
-static inline void
+inline void
 ensure_slash_at_end(std::string& s)
 {
 	if (s.back() != '/') {
@@ -567,7 +567,7 @@ ssprintf(const char* format, Args... args) -> std::string
 	return std::string(buf.get(), buf.get() + size - 1);
 }
 #if defined(__clang__)
-#pragma clang pop
+#pragma clang diagnostic pop
 #elif defined(__GNUC__)
 #pragma GCC pop
 #elif defined(_MSC_VER)
diff --git a/src/arch/Dialog/DialogDriver_Win32.cpp b/src/arch/Dialog/DialogDriver_Win32.cpp
index 244e45b97a..bc2987ec98 100644
--- a/src/arch/Dialog/DialogDriver_Win32.cpp
+++ b/src/arch/Dialog/DialogDriver_Win32.cpp
@@ -7,13 +7,13 @@
 #include "Core/Platform/Platform.hpp"
 #include "Core/Misc/AppInfo.hpp"
 
-#include "archutils/win32/AppInstance.h"
-#include "archutils/win32/ErrorStrings.h"
+#include "archutils/Win32/AppInstance.h"
+#include "archutils/Win32/ErrorStrings.h"
 #if !defined(SMPACKAGE)
-#include "archutils/win32/WindowsResources.h"
-#include "archutils/win32/GraphicsWindow.h"
+#include "archutils/Win32/WindowsResources.h"
+#include "archutils/Win32/GraphicsWindow.h"
 #endif
-#include "archutils/win32/DialogUtil.h"
+#include "archutils/Win32/DialogUtil.h"
 
 #if defined(SMPACKAGE)
 int __stdcall AfxMessageBox(LPCTSTR lpszText, UINT nType, UINT nIDHelp);
diff --git a/src/arch/InputHandler/InputHandler_DirectInput.cpp b/src/arch/InputHandler/InputHandler_DirectInput.cpp
index 511de29bba..c0a09d9838 100644
--- a/src/arch/InputHandler/InputHandler_DirectInput.cpp
+++ b/src/arch/InputHandler/InputHandler_DirectInput.cpp
@@ -421,6 +421,8 @@ InputHandler_DInput::UpdatePolled(
 						}
 
 						break;
+
+					case input_t::KEY: break;
 				}
 			}
 		} break;
@@ -496,6 +498,9 @@ InputHandler_DInput::UpdatePolled(
 										device.m_sName.c_str(), in.ofs);
 						break;
 					}
+					case input_t::KEY:
+					case input_t::HAT:
+						break;
 				}
 			}
 			break;
@@ -924,6 +929,7 @@ InputHandler_DInput::DeviceButtonToChar(DeviceButton button,
 		case KEY_ENTER:
 		case KEY_BACK:
 			return '\0';
+		default: break;
 	}
 
 	for (auto& d : Devices) {
diff --git a/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp b/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp
index 10cfbdfe7c..f54978bed5 100644
--- a/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp
+++ b/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp
@@ -256,6 +256,8 @@ DIJoystick_EnumDevObjectsProc(LPCDIDEVICEOBJECTINSTANCE dev, LPVOID data)
 			case input_t::HAT:
 				++device->hats;
 				break;
+
+			case input_t::KEY: break;
 		}
 	}
 
diff --git a/src/arch/InputHandler/InputHandler_Win32_MIDI.cpp b/src/arch/InputHandler/InputHandler_Win32_MIDI.cpp
index 25473ac094..6ad74b0194 100644
--- a/src/arch/InputHandler/InputHandler_Win32_MIDI.cpp
+++ b/src/arch/InputHandler/InputHandler_Win32_MIDI.cpp
@@ -44,13 +44,15 @@ InputHandler_Win32_MIDI::InputHandler_Win32_MIDI()
 								 (DWORD_PTR)this,
 								 CALLBACK_FUNCTION);
 	if (result != MMSYSERR_NOERROR) {
-		Locator::getLogger()->warn("Error opening MIDI device: {}", GetMidiError(result).c_str());
+		Locator::getLogger()->warn("Error opening MIDI device: {}",
+								   GetMidiError(result).c_str());
 		return;
 	}
 
 	result = midiInStart(g_device);
 	if (result != MMSYSERR_NOERROR) {
-		Locator::getLogger()->warn("Error starting MIDI device: {}", GetMidiError(result).c_str());
+		Locator::getLogger()->warn("Error starting MIDI device: {}",
+								   GetMidiError(result).c_str());
 		return;
 	}
 }
@@ -61,13 +63,15 @@ InputHandler_Win32_MIDI::~InputHandler_Win32_MIDI()
 
 	result = midiInReset(g_device);
 	if (result != MMSYSERR_NOERROR) {
-		Locator::getLogger()->warn("Error resetting MIDI device: {}", GetMidiError(result).c_str());
+		Locator::getLogger()->warn("Error resetting MIDI device: {}",
+								   GetMidiError(result).c_str());
 		return;
 	}
 
 	result = midiInClose(g_device);
 	if (result != MMSYSERR_NOERROR) {
-		Locator::getLogger()->warn("Error closing MIDI device: {}", GetMidiError(result).c_str());
+		Locator::getLogger()->warn("Error closing MIDI device: {}",
+								   GetMidiError(result).c_str());
 		return;
 	}
 }
diff --git a/src/arch/InputHandler/InputHandler_Win32_Para.cpp b/src/arch/InputHandler/InputHandler_Win32_Para.cpp
index a44fe48883..ae26ed0145 100644
--- a/src/arch/InputHandler/InputHandler_Win32_Para.cpp
+++ b/src/arch/InputHandler/InputHandler_Win32_Para.cpp
@@ -7,11 +7,18 @@
 #include "archutils/Win32/USB.h"
 
 // TODO: Abstract this windows-specific stuff into USBDevice.
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpragma-pack"
+#endif
 extern "C" {
 #include "archutils/Win32/ddk/setupapi.h"
 /* Quiet header warning: */
 #include "archutils/Win32/ddk/hidsdi.h"
 }
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 
 REGISTER_INPUT_HANDLER_CLASS2(Para, Win32_Para);
 
diff --git a/src/arch/InputHandler/InputHandler_Win32_Pump.cpp b/src/arch/InputHandler/InputHandler_Win32_Pump.cpp
index 766e490727..d4d93c0ade 100644
--- a/src/arch/InputHandler/InputHandler_Win32_Pump.cpp
+++ b/src/arch/InputHandler/InputHandler_Win32_Pump.cpp
@@ -104,6 +104,7 @@ InputHandler_Win32_Pump::GetDeviceSpecificInputString(const DeviceInput& di)
 			return "P2 DL";
 		case JOY_BUTTON_11:
 			return "P2 DR";
+		default: break;
 	}
 
 	return InputHandler::GetDeviceSpecificInputString(di);
diff --git a/src/arch/LoadingWindow/LoadingWindow_Win32.cpp b/src/arch/LoadingWindow/LoadingWindow_Win32.cpp
index 873cf7e184..fe57546c19 100644
--- a/src/arch/LoadingWindow/LoadingWindow_Win32.cpp
+++ b/src/arch/LoadingWindow/LoadingWindow_Win32.cpp
@@ -2,9 +2,9 @@
 #include "RageUtil/Utils/RageUtil.h"
 #include "LoadingWindow_Win32.h"
 #include "RageUtil/File/RageFileManager.h"
-#include "archutils/win32/WindowsResources.h"
-#include "archutils/win32/WindowIcon.h"
-#include "archutils/win32/ErrorStrings.h"
+#include "archutils/Win32/WindowsResources.h"
+#include "archutils/Win32/WindowIcon.h"
+#include "archutils/Win32/ErrorStrings.h"
 #include <windows.h>
 #include <wchar.h>
 #include <Commdlg.h>
@@ -181,7 +181,7 @@ LoadingWindow_Win32::LoadingWindow_Win32()
 	  RageFileManagerUtil::sDirOfExecutable.substr(
 		0, RageFileManagerUtil::sDirOfExecutable.length() - 7) +
 	  FONT_FILE;
-	int nResults = AddFontResourceEx(szFontFile.c_str(), // font file name
+	AddFontResourceEx(szFontFile.c_str(), // font file name
 									 FR_PRIVATE,		 // font flags
 									 nullptr);
 
@@ -242,8 +242,8 @@ LoadingWindow_Win32::InternalPaint()
 	RECT textRect;
 	GetClientRect(hwnd, &textRect);
 	textRect.left = FONT_X;
-	auto oldColor = SetTextColor(hDCMem, FONT_COLOR);
-	auto oldMode = SetBkMode(hDCMem, TRANSPARENT);
+	SetTextColor(hDCMem, FONT_COLOR);
+	SetBkMode(hDCMem, TRANSPARENT);
 	auto oldF = SelectObject(hDCMem, f);
 	for (unsigned i = 0; i < 3; ++i) {
 		textRect.top = static_cast<long>(FONT_Y + (FONT_HEIGHT + 3) * i);
@@ -299,9 +299,6 @@ LoadingWindow_Win32::SetTextInternal()
 	while (asMessageLines.size() < 3)
 		asMessageLines.push_back("");
 
-	const int msgid[] = { IDC_STATIC_MESSAGE1,
-						  IDC_STATIC_MESSAGE2,
-						  IDC_STATIC_MESSAGE3 };
 	for (unsigned i = 0; i < 3; ++i) {
 		if (text[i] == asMessageLines[i])
 			continue;
diff --git a/src/arch/Sound/RageSoundDriver_WDMKS.cpp b/src/arch/Sound/RageSoundDriver_WDMKS.cpp
index ea7fd05740..9c78dc132d 100644
--- a/src/arch/Sound/RageSoundDriver_WDMKS.cpp
+++ b/src/arch/Sound/RageSoundDriver_WDMKS.cpp
@@ -451,6 +451,7 @@ WinWdmFilter::CreatePin(unsigned long iPinId, std::string& sError)
 
 	/* Get DATARANGEs */
 	KSMULTIPLE_ITEM* pDataRangesItem;
+	KSDATARANGE* pDataRanges;
 	if (!WdmGetPinPropertyMulti(m_hHandle,
 								iPinId,
 								&KSPROPSETID_Pin,
@@ -461,8 +462,8 @@ WinWdmFilter::CreatePin(unsigned long iPinId, std::string& sError)
         delete pPin;
 	    return nullptr;
 	}
+	pDataRanges = (KSDATARANGE*)(pDataRangesItem + 1);
 
-	KSDATARANGE* pDataRanges = (KSDATARANGE*)(pDataRangesItem + 1);
 
 	/* Find audio DATARANGEs */
 	{
@@ -614,7 +615,14 @@ WinWdmPin::MakeFormat(const WAVEFORMATEX* pFormat) const
 bool
 WinWdmPin::IsFormatSupported(const WAVEFORMATEX* pFormat) const
 {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmissing-braces"
+#endif
 	GUID guid = { DEFINE_WAVEFORMATEX_GUID(pFormat->wFormatTag) };
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 
 	if (pFormat->wFormatTag == WAVE_FORMAT_EXTENSIBLE)
 		guid = ((WAVEFORMATEXTENSIBLE*)pFormat)->SubFormat;
@@ -811,6 +819,10 @@ FillWFEXT(WAVEFORMATEXTENSIBLE* pwfext,
 		case DeviceSampleFormat_Int16:
 			pwfext->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
 			break;
+		case DeviceSampleFormat_Invalid:
+		case NUM_DeviceSampleFormat:
+			Locator::getLogger()->warn("Invalid sampleFormat in WDMKS FillWFEXT");
+			break;
 	}
 
 	pwfext->Format.nBlockAlign = GetBytesPerSample(sampleFormat);
@@ -1319,6 +1331,12 @@ MapSampleFormatFromInt16(const int16_t* pIn,
 			}
 			break;
 		}
+		case DeviceSampleFormat_Invalid:
+		case DeviceSampleFormat_Int16:
+		case NUM_DeviceSampleFormat: {
+			Locator::getLogger()->warn("Invalid DeviceSampleFormat in WDMKS MapSampleFormatFromInt16");
+			break;
+		}
 	}
 }
 }
diff --git a/src/arch/Sound/RageSoundDriver_WaveOut.cpp b/src/arch/Sound/RageSoundDriver_WaveOut.cpp
index 8f28004b20..36b240b206 100644
--- a/src/arch/Sound/RageSoundDriver_WaveOut.cpp
+++ b/src/arch/Sound/RageSoundDriver_WaveOut.cpp
@@ -78,11 +78,12 @@ RageSoundDriver_WaveOut::GetData()
 
 	MMRESULT ret =
 	  waveOutWrite(m_hWaveOut, &m_aBuffers[b], sizeof(m_aBuffers[b]));
-	if (ret != MMSYSERR_NOERROR)
+	if (ret != MMSYSERR_NOERROR) {
 		if (ret == WAVERR_STILLPLAYING)
 			return false;
 		else
 			FAIL_M(wo_ssprintf(ret, "waveOutWrite failed"));
+	}
 
 	/* Increment m_iLastCursorPos. */
 	m_iLastCursorPos += chunksize_frames;
diff --git a/src/archutils/Win32/DirectXHelpers.cpp b/src/archutils/Win32/DirectXHelpers.cpp
index 88184ef61c..ab84c38985 100644
--- a/src/archutils/Win32/DirectXHelpers.cpp
+++ b/src/archutils/Win32/DirectXHelpers.cpp
@@ -6,7 +6,7 @@
 #if defined(USE_DXERR9)
 #include <dxerr9.h>
 #else
-#include <dxerr.h>
+#include <DxErr.h>
 #endif
 #if defined(_MSC_VER)
 #pragma comment(lib, "dxerr.lib")
diff --git a/src/archutils/Win32/USB.cpp b/src/archutils/Win32/USB.cpp
index caf495290e..fad2008774 100644
--- a/src/archutils/Win32/USB.cpp
+++ b/src/archutils/Win32/USB.cpp
@@ -9,12 +9,21 @@
 #pragma comment(lib, "hid.lib")
 #endif
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpragma-pack"
+#endif
+
 extern "C" {
 #include "archutils/Win32/ddk/setupapi.h"
 /* Quiet header warning: */
 #include "archutils/Win32/ddk/hidsdi.h"
 }
 
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
 static std::string
 GetUSBDevicePath(int iNum)
 {