diff --git a/src/files.h b/src/files.h
index 9424fd031..096452269 100644
--- a/src/files.h
+++ b/src/files.h
@@ -37,9 +37,7 @@
 #define FILES_H
 
 #include <stdio.h>
-#include <zlib.h>
 #include <functional>
-#include "bzlib.h"
 #include "doomtype.h"
 #include "m_swap.h"
 
diff --git a/src/files_decompress.cpp b/src/files_decompress.cpp
index 56d11a99f..b6ba8fbcb 100644
--- a/src/files_decompress.cpp
+++ b/src/files_decompress.cpp
@@ -35,6 +35,8 @@
 
 // This also pulls in windows.h
 #include "LzmaDec.h"
+#include <zlib.h>
+#include <bzlib.h>
 
 #include "files.h"
 #include "i_system.h"
diff --git a/src/g_pch.h b/src/g_pch.h
index cad5a8409..bf2833cf8 100644
--- a/src/g_pch.h
+++ b/src/g_pch.h
@@ -23,6 +23,7 @@
 #include <tuple>
 #include <vector>
 #include <utility>
+#include <functional>
 
 // These two headers get included nearly everywhere so it doesn't matter if changing them forces a few more recompiles.
 // The overall savings from PCHing them are more significant.
diff --git a/src/r_data/r_translate.cpp b/src/r_data/r_translate.cpp
index ad07840f8..f122745a0 100644
--- a/src/r_data/r_translate.cpp
+++ b/src/r_data/r_translate.cpp
@@ -743,6 +743,7 @@ bool FRemapTable::AddToTranslation(const char *range)
 	catch (CRecoverableError &err)
 	{
 		Printf("Error in translation '%s':\n%s\n", range, err.GetMessage());
+		return false;
 	}
 }
 
diff --git a/src/sound/timiditypp/reverb.cpp b/src/sound/timiditypp/reverb.cpp
index c0446c8c6..c83e1f568 100644
--- a/src/sound/timiditypp/reverb.cpp
+++ b/src/sound/timiditypp/reverb.cpp
@@ -29,6 +29,7 @@
  */
 
 #include <string.h>
+#include <stdint.h>
 #include "timidity.h"
 #include "tables.h"
 #include "common.h"
diff --git a/src/sound/timiditypp/timidity.h b/src/sound/timiditypp/timidity.h
index cc6b8a22f..0c7850568 100644
--- a/src/sound/timiditypp/timidity.h
+++ b/src/sound/timiditypp/timidity.h
@@ -28,7 +28,6 @@
 #ifndef TIMIDITY_H_INCLUDED
 #define TIMIDITY_H_INCLUDED 1
 
-#include "c_cvars.h"
 #include "controls.h"
 #include "mblock.h"