diff --git a/Utilities/File.cpp b/Utilities/File.cpp
index ab89e5b971..0d5d5dd13c 100644
--- a/Utilities/File.cpp
+++ b/Utilities/File.cpp
@@ -1693,7 +1693,8 @@ fs::file fs::file::from_native_handle(void *handle)
 	return result;
 }
 #else
-fs::file fs::file::from_native_handle(int fd) {
+fs::file fs::file::from_native_handle(int fd)
+{
 	fs::file result;
 	result.m_file = std::make_unique<unix_file>(fd);
 	return result;
diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp
index 2fb7d94e66..af4d9128d2 100644
--- a/Utilities/Thread.cpp
+++ b/Utilities/Thread.cpp
@@ -2172,8 +2172,8 @@ void thread_base::start()
 void thread_base::initialize(void (*error_cb)())
 {
 #ifndef _WIN32
-#ifdef  ANDROID
-    m_thread.release(pthread_self());
+#ifdef ANDROID
+	m_thread.release(pthread_self());
 #else
 	m_thread.release(reinterpret_cast<u64>(pthread_self()));
 #endif
@@ -2622,7 +2622,7 @@ thread_base::~thread_base() noexcept
 		WaitForSingleObject(handle0, INFINITE);
 		CloseHandle(handle0);
 #elif defined(ANDROID)
-        pthread_join(m_thread.load(), nullptr);
+		pthread_join(m_thread.load(), nullptr);
 #else
 		pthread_join(reinterpret_cast<pthread_t>(m_thread.load()), nullptr);
 #endif
@@ -2697,11 +2697,10 @@ u64 thread_base::get_cycles()
 #else
 	clockid_t _clock;
 	struct timespec thread_time;
-    pthread_t thread_id;
 #ifdef ANDROID
-    thread_id = handle;
+	pthread_t thread_id = handle;
 #else
-    thread_id = reinterpret_cast<pthread_t>(handle);
+	pthread_t thread_id = reinterpret_cast<pthread_t>(handle);
 #endif
 	if (!pthread_getcpuclockid(thread_id, &_clock) && !clock_gettime(_clock, &thread_time))
 	{
@@ -3326,7 +3325,7 @@ u64 thread_ctrl::get_tid()
 #ifdef _WIN32
 	return GetCurrentThreadId();
 #elif defined(ANDROID)
-    return static_cast<u64>(pthread_self());
+	return static_cast<u64>(pthread_self());
 #elif defined(__linux__)
 	return syscall(SYS_gettid);
 #else
diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp b/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp
index 9125222a66..e2468655a8 100644
--- a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp
+++ b/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp
@@ -155,7 +155,7 @@ namespace aarch64
             return {};
         }
 
-        const cpu_entry_t *lowest_part_info = nullptr; 
+        const cpu_entry_t* lowest_part_info = nullptr; 
         for (const auto& [midr, count] : core_layout)
         {
             const auto implementer_id = (midr >> 24) & 0xff;
@@ -167,12 +167,13 @@ namespace aarch64
                 return {};
             }
 
-            if (lowest_part_info == nullptr || lowest_part_info > part_info) {
+            if (lowest_part_info == nullptr || lowest_part_info > part_info)
+            {
                 lowest_part_info = part_info;
             }
         }
 
-        return lowest_part_info == nullptr ? "" : lowest_part_info->name;
+        return lowest_part_info ? lowest_part_info->name : "";
     }
 
     std::string get_cpu_brand()
diff --git a/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp b/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp
index e11de85007..4650f6bcec 100644
--- a/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp
@@ -133,7 +133,7 @@ sys_net_sockaddr native_addr_to_sys_net_addr(const ::sockaddr_storage& native_ad
 	sys_net_sockaddr sn_addr;
 
 	sys_net_sockaddr_in* paddr = reinterpret_cast<sys_net_sockaddr_in*>(&sn_addr);
-    *paddr = {};
+	*paddr = {};
 
 	paddr->sin_len = sizeof(sys_net_sockaddr_in);
 	paddr->sin_family = SYS_NET_AF_INET;
diff --git a/rpcs3/Emu/IPC_socket.h b/rpcs3/Emu/IPC_socket.h
index 2e4cca549c..d973184c36 100644
--- a/rpcs3/Emu/IPC_socket.h
+++ b/rpcs3/Emu/IPC_socket.h
@@ -3,7 +3,7 @@
 #include "Utilities/Thread.h"
 #include "util/logs.hpp"
 #include "Emu/Memory/vm.h"
-#include "pine/pine_server.h"
+#include "3rdparty/pine/pine_server.h"
 
 LOG_CHANNEL(IPC);
 
diff --git a/rpcs3/Emu/RSX/Program/CgBinaryProgram.h b/rpcs3/Emu/RSX/Program/CgBinaryProgram.h
index d04e85690e..310be35baa 100644
--- a/rpcs3/Emu/RSX/Program/CgBinaryProgram.h
+++ b/rpcs3/Emu/RSX/Program/CgBinaryProgram.h
@@ -8,8 +8,8 @@
 #include "Utilities/File.h"
 
 #ifndef WITHOUT_OPENGL
-	#include "Emu/RSX/GL/GLVertexProgram.h"
-	#include "Emu/RSX/GL/GLFragmentProgram.h"
+#include "Emu/RSX/GL/GLVertexProgram.h"
+#include "Emu/RSX/GL/GLFragmentProgram.h"
 #endif
 
 using CGprofile = u32;
diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h
index 992ccf14a3..2e0849e3c3 100644
--- a/rpcs3/Emu/system_config.h
+++ b/rpcs3/Emu/system_config.h
@@ -121,7 +121,7 @@ struct cfg_root : cfg::node
 
 		cfg::_enum<video_renderer> renderer{ this, "Renderer", 
 #if defined(ANDROID) || defined(__APPLE__)
-		video_renderer::vulkan
+			video_renderer::vulkan
 #else
 			video_renderer::opengl // TODO: Is it still actual?
 #endif
diff --git a/rpcs3/Input/pad_thread.cpp b/rpcs3/Input/pad_thread.cpp
index 8fa79e55dd..a4f020ffd4 100644
--- a/rpcs3/Input/pad_thread.cpp
+++ b/rpcs3/Input/pad_thread.cpp
@@ -180,7 +180,7 @@ void pad_thread::Init()
 				keyptr->SetTargetWindow(static_cast<QWindow*>(m_curwindow));
 				cur_pad_handler = keyptr;
 #else
-                cur_pad_handler = nullpad;
+				cur_pad_handler = nullpad;
 #endif
 			}
 			else
diff --git a/rpcs3/util/atomic.cpp b/rpcs3/util/atomic.cpp
index 6f1adc2da9..cd9a6e37a3 100644
--- a/rpcs3/util/atomic.cpp
+++ b/rpcs3/util/atomic.cpp
@@ -173,7 +173,7 @@ namespace
 #ifdef _WIN32
 			tid = GetCurrentThreadId();
 #elif defined(ANDROID)
-            tid = pthread_self();
+			tid = pthread_self();
 #else
 			tid = reinterpret_cast<u64>(pthread_self());
 #endif
diff --git a/rpcs3/util/vm_native.cpp b/rpcs3/util/vm_native.cpp
index c61708e7cd..8dd069d553 100644
--- a/rpcs3/util/vm_native.cpp
+++ b/rpcs3/util/vm_native.cpp
@@ -687,7 +687,7 @@ namespace utils
 
 #ifdef __linux__
 #ifdef ANDROID
-		if constexpr (char c = '?'; true)
+		if constexpr (constexpr char c = '?')
 #else
 		if (const char c = fs::file("/proc/sys/vm/overcommit_memory").read<char>(); c == '0' || c == '1')
 #endif