diff --git a/src/common/filesystem/include/fs_files.h b/src/common/filesystem/include/fs_files.h
index 8e8f6927f..878122e82 100644
--- a/src/common/filesystem/include/fs_files.h
+++ b/src/common/filesystem/include/fs_files.h
@@ -41,6 +41,7 @@
 #include <stdint.h>
 #include <stdarg.h>
 #include <functional>
+#include <vector>
 #include "fs_swap.h"
 
 #include "tarray.h"
diff --git a/src/common/filesystem/source/fs_findfile.cpp b/src/common/filesystem/source/fs_findfile.cpp
index cf6e69d66..086642bb5 100644
--- a/src/common/filesystem/source/fs_findfile.cpp
+++ b/src/common/filesystem/source/fs_findfile.cpp
@@ -33,6 +33,7 @@
 */
 
 #include "fs_findfile.h"
+#include <string.h>
 #include <vector>
 
 namespace FileSys {
@@ -175,7 +176,7 @@ static int FS_FindAttr(findstate_t *const fileinfo)
 std::string FS_FullPath(const char* directory)
 {
 	// todo
-	return directory
+	return directory;
 }
 
 static size_t FS_GetFileSize(findstate_t* handle, const char* pathname)
diff --git a/src/common/textures/formats/jpegxltexture.cpp b/src/common/textures/formats/jpegxltexture.cpp
index 3019ba929..01e798cbc 100644
--- a/src/common/textures/formats/jpegxltexture.cpp
+++ b/src/common/textures/formats/jpegxltexture.cpp
@@ -66,7 +66,7 @@ FImageSource *JPEGXLImage_TryCreate(FileReader & file, int lumpnum)
     {
         return nullptr;
     }
-    JxlDecoderSetInput(jxlDecoderPtr, array.Data(), array.Size());
+    JxlDecoderSetInput(jxlDecoderPtr, array.data(), array.size());
     JxlDecoderCloseInput(jxlDecoderPtr);
 
     for (;;)
@@ -164,7 +164,7 @@ int FJPEGXLTexture::CopyPixels(FBitmap *bmp, int conversion)
 
     auto lump = fileSystem.OpenFileReader(SourceLump);
 	auto array = lump.Read();
-    JxlDecoderSetInput(jxlDecoderPtr, array.Data(), array.Size());
+    JxlDecoderSetInput(jxlDecoderPtr, array.data(), array.size());
     JxlDecoderCloseInput(jxlDecoderPtr);
 
     for (;;)
diff --git a/src/common/utility/findfile.cpp b/src/common/utility/findfile.cpp
index ff1e53f4f..e2c2ee707 100644
--- a/src/common/utility/findfile.cpp
+++ b/src/common/utility/findfile.cpp
@@ -40,6 +40,9 @@
 #include "i_system.h"
 #include "fs_findfile.h"
 
+#ifdef __unix__
+#include <sys/stat.h>
+#endif // __unix__
 
 //==========================================================================
 //
diff --git a/src/rendering/swrenderer/r_renderer.h b/src/rendering/swrenderer/r_renderer.h
index 2ad6c7900..7d873f5f0 100644
--- a/src/rendering/swrenderer/r_renderer.h
+++ b/src/rendering/swrenderer/r_renderer.h
@@ -11,7 +11,6 @@ class AActor;
 class player_t;
 struct sector_t;
 class FCanvasTexture;
-class FileWriter;
 class DCanvas;
 struct FLevelLocals;
 class PClassActor;