diff --git a/kernel/cellos/src/sys_net.cpp b/kernel/cellos/src/sys_net.cpp
index c74b7edf8..3b9ba06a1 100644
--- a/kernel/cellos/src/sys_net.cpp
+++ b/kernel/cellos/src/sys_net.cpp
@@ -1336,7 +1336,7 @@ error_code sys_net_bnet_poll(ppu_thread &ppu, vm::ptr<sys_net_pollfd> fds,
         sock->set_connecting(connecting[i]);
 #endif
 
-        rx::EnumBitSet<lv2_socket::poll_t> selected = +lv2_socket::poll_t::error;
+        rx::EnumBitSet<lv2_socket::poll_t> selected = lv2_socket::poll_t::error;
 
         if (fds_buf[i].events & SYS_NET_POLLIN)
           selected += lv2_socket::poll_t::read;
diff --git a/kernel/cellos/src/sys_net/lv2_socket_raw.cpp b/kernel/cellos/src/sys_net/lv2_socket_raw.cpp
index 42e0476d9..1e2404e6e 100644
--- a/kernel/cellos/src/sys_net/lv2_socket_raw.cpp
+++ b/kernel/cellos/src/sys_net/lv2_socket_raw.cpp
@@ -129,9 +129,9 @@ s32 lv2_socket_raw::poll([[maybe_unused]] sys_net_pollfd &sn_pfd,
   return {};
 }
 
-std::tuple<bool, bool, bool>
-lv2_socket_raw::select([[maybe_unused]] rx::EnumBitSet<lv2_socket::poll_t> selected,
-                       [[maybe_unused]] pollfd &native_pfd) {
+std::tuple<bool, bool, bool> lv2_socket_raw::select(
+    [[maybe_unused]] rx::EnumBitSet<lv2_socket::poll_t> selected,
+    [[maybe_unused]] pollfd &native_pfd) {
   LOG_ONCE(raw_select, "lv2_socket_raw::select");
   return {};
 }
diff --git a/rpcs3/Crypto/unpkg.h b/rpcs3/Crypto/unpkg.h
index b0c74e6d4..aeee78f32 100644
--- a/rpcs3/Crypto/unpkg.h
+++ b/rpcs3/Crypto/unpkg.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Loader/PSF.h"
+#include "util/StrFmt.h"
 #include "util/endian.hpp"
 #include "util/types.hpp"
 #include "util/File.h"
diff --git a/rpcs3/Emu/Cell/PPUAnalyser.h b/rpcs3/Emu/Cell/PPUAnalyser.h
index cd8e68c23..6e5fd3341 100644
--- a/rpcs3/Emu/Cell/PPUAnalyser.h
+++ b/rpcs3/Emu/Cell/PPUAnalyser.h
@@ -131,7 +131,7 @@ struct ppu_module : public Type
 	std::string name{};                                                                                   // Filename
 	std::string path{};                                                                                   // Filepath
 	s64 offset = 0;                                                                                       // Offset of file
-	mutable rx::EnumBitSet<ppu_attr> attr{};                                                                        // Shared module attributes
+	mutable rx::EnumBitSet<ppu_attr> attr{};                                                              // Shared module attributes
 	std::string cache{};                                                                                  // Cache file path
 	std::vector<ppu_reloc> relocs{};                                                                      // Relocations
 	std::vector<ppu_segment> segs{};                                                                      // Segments
diff --git a/rpcs3/Loader/PSF.h b/rpcs3/Loader/PSF.h
index bb66a2648..2c5fac2e2 100644
--- a/rpcs3/Loader/PSF.h
+++ b/rpcs3/Loader/PSF.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "util/types.hpp"
+#include <functional>
 #include <map>
 #include <string>
 #include <string_view>