diff --git a/src/Cafe/Account/Account.cpp b/src/Cafe/Account/Account.cpp
index 8f8fa8fd..c53ae8d9 100644
--- a/src/Cafe/Account/Account.cpp
+++ b/src/Cafe/Account/Account.cpp
@@ -3,15 +3,12 @@
 #include "gui/CemuApp.h"
 #include "util/helpers/SystemException.h"
 
-#include <random>
-
 #include "config/ActiveSettings.h"
 #include "Cafe/IOSU/legacy/iosu_crypto.h"
 #include "Common/filestream.h"
 
-#ifndef __clang__
+#include <random>
 #include <boost/random/uniform_int.hpp>
-#endif
 
 std::vector<Account> Account::s_account_list;
 
@@ -71,12 +68,7 @@ Account::Account(uint32 persistent_id, std::wstring_view mii_name)
 	static std::mt19937 s_mte(s_random_device());
 
         //Use boost library to escape static asserts in Linux Builds
-        //TODO: Look for fix in libstdc++
-        #ifdef __clang__
         boost::random::uniform_int_distribution<uint16> dist(std::numeric_limits<uint8>::min(), std::numeric_limits<uint8>::max());
-        #else
-        std::uniform_int_distribution<uint16> dist(std::numeric_limits<uint8>::min(), std::numeric_limits<uint8>::max());
-        #endif
         
         std::generate(m_uuid.begin(), m_uuid.end(), [&]() { return (uint8)dist(s_mte); });
 
diff --git a/src/Cemu/nex/prudp.cpp b/src/Cemu/nex/prudp.cpp
index 52d77d5a..4dfdb3f0 100644
--- a/src/Cemu/nex/prudp.cpp
+++ b/src/Cemu/nex/prudp.cpp
@@ -4,9 +4,7 @@
 #include<bitset>
 #include<random>
 
-#ifdef __clang__
 #include <boost/random/uniform_int.hpp>
-#endif
 
 void swap(unsigned char *a, unsigned char *b) 
 {
@@ -116,12 +114,7 @@ void releasePRUDPPort(uint16 port)
 
 std::mt19937_64 prudpRG(GetTickCount());
 //Workaround for static asserts when using uniform_int_distribution
-//TODO: Look for fix in libstdc++
-#ifndef __clang__
-std::uniform_int_distribution<int> prudpDis8(0, 0xFF);
-#else
 boost::random::uniform_int_distribution<int> prudpDis8(0, 0xFF);
-#endif
 
 uint8 prudp_generateRandomU8()
 {
diff --git a/src/util/helpers/helpers.cpp b/src/util/helpers/helpers.cpp
index f51da1a7..cb1fc300 100644
--- a/src/util/helpers/helpers.cpp
+++ b/src/util/helpers/helpers.cpp
@@ -9,9 +9,7 @@
 
 #include "config/ActiveSettings.h"
 
-#ifdef __clang__
 #include <boost/random/uniform_int.hpp>
-#endif
 
 
 #if BOOST_OS_WINDOWS
@@ -431,13 +429,9 @@ std::string GenerateRandomString(size_t length, std::string_view characters)
 
 	std::random_device rd;
 	std::mt19937 gen(rd());
+       
         //Workaround for static asserts using boost
-        //TODO: Wait for fix in libstdc++
-        #ifndef __clang__
-        std::uniform_int_distribution<decltype(characters.size())> index_dist(0, characters.size() - 1);
-        #else
         boost::random::uniform_int_distribution<decltype(characters.size())> index_dist(0, characters.size() - 1);
-        #endif
         for (uint32_t i = 0; i < length; ++i)
 	{
 		result << characters[index_dist(gen)];