diff --git a/Source/capture.cpp b/Source/capture.cpp
index e105d008a..19cdebac5 100644
--- a/Source/capture.cpp
+++ b/Source/capture.cpp
@@ -20,7 +20,6 @@ DEVILUTION_BEGIN_NAMESPACE
  */
 static BOOL CaptureHdr(short width, short height, std::ofstream *out)
 {
-	DWORD lpNumBytes;
 	PCXHEADER Buffer;
 
 	memset(&Buffer, 0, sizeof(Buffer));
@@ -92,7 +91,6 @@ static BYTE *CaptureEnc(BYTE *src, BYTE *dst, int width)
 static bool CapturePix(WORD width, WORD height, WORD stride, BYTE *pixels, std::ofstream *out)
 {
 	int writeSize;
-	DWORD lpNumBytes;
 	BYTE *pBuffer, *pBufferEnd;
 
 	pBuffer = (BYTE *)DiabloAllocPtr(2 * width);
diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index 76f069275..ebfb01afe 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -169,7 +169,6 @@ static bool ProcessInput()
 
 void run_game_loop(unsigned int uMsg)
 {
-	BOOL bLoop;
 	WNDPROC saveProc;
 	MSG msg;
 
@@ -449,8 +448,6 @@ void diablo_parse_flags(int argc, char **argv)
 
 void diablo_init_screen()
 {
-	int i;
-
 	MouseX = SCREEN_WIDTH / 2;
 	MouseY = SCREEN_HEIGHT / 2;
 	if (!sgbControllerActive)
diff --git a/Source/dthread.cpp b/Source/dthread.cpp
index ed06db8fd..8c54b11e6 100644
--- a/Source/dthread.cpp
+++ b/Source/dthread.cpp
@@ -118,7 +118,6 @@ unsigned int dthread_handler(void *data)
 
 void dthread_cleanup()
 {
-	const char *error_buf;
 	TMegaPkt *tmp;
 
 	if (sghWorkToDoEvent == NULL) {
diff --git a/Source/init.cpp b/Source/init.cpp
index 6f2e48cd0..2dd3f818e 100644
--- a/Source/init.cpp
+++ b/Source/init.cpp
@@ -91,7 +91,6 @@ void init_archives()
 HANDLE init_test_access(char *mpq_path, char *mpq_name, char *reg_loc, int dwPriority, int fs)
 {
 	char Buffer[2][MAX_PATH];
-	char *sdlPath;
 	HANDLE archive;
 
 	GetBasePath(Buffer[0], MAX_PATH);
diff --git a/Source/mpqapi.h b/Source/mpqapi.h
index 608dea57b..8743cd686 100644
--- a/Source/mpqapi.h
+++ b/Source/mpqapi.h
@@ -14,10 +14,6 @@ DEVILUTION_BEGIN_NAMESPACE
 extern "C" {
 #endif
 
-extern BYTE mpq_buf[4096];
-extern BOOL save_archive_modified;
-extern BOOLEAN save_archive_open;
-
 void mpqapi_remove_hash_entry(const char *pszName);
 void mpqapi_alloc_block(uint32_t block_offset, uint32_t block_size);
 _BLOCKENTRY *mpqapi_new_block(int *block_index);
diff --git a/Source/pfile.cpp b/Source/pfile.cpp
index 0439b4fdb..8493d0c56 100644
--- a/Source/pfile.cpp
+++ b/Source/pfile.cpp
@@ -189,9 +189,7 @@ BYTE game_2_ui_class(const PlayerStruct *p)
 
 BOOL pfile_ui_set_hero_infos(BOOL(*ui_add_hero_info)(_uiheroinfo *))
 {
-	DWORD i, save_num;
-	char FileName[MAX_PATH];
-	char NewFileName[MAX_PATH];
+	DWORD i;
 	BOOL showFixedMsg;
 
 	memset(hero_names, 0, sizeof(hero_names));