diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ff710c97..0b752e02e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -253,8 +253,7 @@ add_library(devilution STATIC
   Source/town.cpp
   Source/towners.cpp
   Source/track.cpp
-  Source/trigs.cpp
-  Source/wave.cpp)
+  Source/trigs.cpp)
 
 set(devilutionx_SRCS
   SourceX/dx.cpp
diff --git a/Source/all.h b/Source/all.h
index 7201f04a2..947203b54 100644
--- a/Source/all.h
+++ b/Source/all.h
@@ -86,7 +86,6 @@
 #include "towners.h"
 #include "track.h"
 #include "trigs.h"
-#include "wave.h"
 #include "render.h" // linked last, likely .s/.asm
 
 #endif /* __ALL_H__ */
diff --git a/Source/engine.cpp b/Source/engine.cpp
index eef257dde..6404ab897 100644
--- a/Source/engine.cpp
+++ b/Source/engine.cpp
@@ -809,8 +809,8 @@ BYTE *LoadFileInMem(const char *pszName, DWORD *pdwFileLen)
 	BYTE *buf;
 	int fileLen;
 
-	WOpenFile(pszName, &file, FALSE);
-	fileLen = WGetFileSize(file, NULL, pszName);
+	SFileOpenFile(pszName, &file);
+	fileLen = SFileGetFileSize(file, NULL);
 
 	if (pdwFileLen)
 		*pdwFileLen = fileLen;
@@ -820,8 +820,8 @@ BYTE *LoadFileInMem(const char *pszName, DWORD *pdwFileLen)
 
 	buf = (BYTE *)DiabloAllocPtr(fileLen);
 
-	WReadFile(file, buf, fileLen, pszName);
-	WCloseFile(file);
+	SFileReadFile(file, buf, fileLen, NULL, NULL);
+	SFileCloseFile(file);
 
 	return buf;
 }
@@ -842,15 +842,15 @@ DWORD LoadFileWithMem(const char *pszName, BYTE *p)
 		app_fatal("LoadFileWithMem(NULL):\n%s", pszName);
 	}
 
-	WOpenFile(pszName, &hsFile, FALSE);
+	SFileOpenFile(pszName, &hsFile);
 
-	dwFileLen = WGetFileSize(hsFile, NULL, pszName);
+	dwFileLen = SFileGetFileSize(hsFile, NULL);
 	if (dwFileLen == 0) {
 		app_fatal("Zero length SFILE:\n%s", pszName);
 	}
 
-	WReadFile(hsFile, p, dwFileLen, pszName);
-	WCloseFile(hsFile);
+	SFileReadFile(hsFile, p, dwFileLen, NULL, NULL);
+	SFileCloseFile(hsFile);
 
 	return dwFileLen;
 }
diff --git a/Source/palette.cpp b/Source/palette.cpp
index da1cf4719..5f876ef5e 100644
--- a/Source/palette.cpp
+++ b/Source/palette.cpp
@@ -87,9 +87,9 @@ void LoadPalette(const char *pszFileName)
 
 	assert(pszFileName);
 
-	WOpenFile(pszFileName, &pBuf, FALSE);
-	WReadFile(pBuf, (char *)PalData, sizeof(PalData), pszFileName);
-	WCloseFile(pBuf);
+	SFileOpenFile(pszFileName, &pBuf);
+	SFileReadFile(pBuf, (char *)PalData, sizeof(PalData), NULL, NULL);
+	SFileCloseFile(pBuf);
 
 	for (i = 0; i < 256; i++) {
 		orig_palette[i].r = PalData[i][0];
diff --git a/Source/player.cpp b/Source/player.cpp
index b69c4a207..89cb7238a 100644
--- a/Source/player.cpp
+++ b/Source/player.cpp
@@ -4,6 +4,7 @@
  * Implementation of player functionality, leveling, actions, creation, loading, etc.
  */
 #include "all.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
@@ -388,10 +389,10 @@ static DWORD GetPlrGFXSize(const char *szCel)
 					sprintf(Type, "%c%c%c", CharCharHF[c], *a, *w);
 					sprintf(pszName, "PlrGFX\\%s\\%s\\%s%s.CL2", ClassStrTblOld[c], Type, Type, szCel);
 				}
-				if (WOpenFile(pszName, &hsFile, TRUE)) {
+				if (SFileOpenFile(pszName, &hsFile)) {
 					/// ASSERT: assert(hsFile);
-					dwSize = WGetFileSize(hsFile, NULL, pszName);
-					WCloseFile(hsFile);
+					dwSize = SFileGetFileSize(hsFile, NULL);
+					SFileCloseFile(hsFile);
 					if (dwMaxSize <= dwSize) {
 						dwMaxSize = dwSize;
 					}
diff --git a/Source/wave.cpp b/Source/wave.cpp
deleted file mode 100644
index 7db2b09a0..000000000
--- a/Source/wave.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * @file wave.cpp
- *
- * Implementation of functionality for loading fies and processing wave files.
- */
-#include "all.h"
-#include "../3rdParty/Storm/Source/storm.h"
-
-DEVILUTION_BEGIN_NAMESPACE
-
-void WCloseFile(HANDLE file)
-{
-	SFileCloseFile(file);
-}
-
-LONG WGetFileSize(HANDLE hsFile, DWORD *lpFileSizeHigh, const char *FileName)
-{
-	LONG ret;
-
-	if ((ret = SFileGetFileSize(hsFile, lpFileSizeHigh)) == 0)
-		FileErrDlg(FileName);
-
-	return ret;
-}
-
-BOOL WOpenFile(const char *FileName, HANDLE *phsFile, BOOL mayNotExist)
-{
-	if (!SFileOpenFile(FileName, phsFile))
-		FileErrDlg(FileName);
-
-	return TRUE;
-}
-
-void WReadFile(HANDLE hsFile, LPVOID buf, DWORD to_read, const char *FileName)
-{
-	if (SFileSetFilePointer(hsFile, 0, NULL, DVL_FILE_CURRENT) == -1)
-		FileErrDlg(FileName);
-
-	if (!SFileReadFile(hsFile, buf, to_read, NULL, NULL))
-		FileErrDlg(FileName);
-}
-
-DEVILUTION_END_NAMESPACE
diff --git a/Source/wave.h b/Source/wave.h
deleted file mode 100644
index cbfe53563..000000000
--- a/Source/wave.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file wave.h
- *
- * Interface of functionality for loading files and processing wave files.
- */
-#ifndef __WAVE_H__
-#define __WAVE_H__
-
-DEVILUTION_BEGIN_NAMESPACE
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void WCloseFile(HANDLE file);
-LONG WGetFileSize(HANDLE hsFile, DWORD *lpFileSizeHigh, const char *FileName);
-BOOL WOpenFile(const char *FileName, HANDLE *phsFile, BOOL mayNotExist);
-void WReadFile(HANDLE hsFile, LPVOID buf, DWORD to_read, const char *FileName);
-int WSetFilePointer(HANDLE file1, int offset, HANDLE file2, int whence);
-
-#ifdef __cplusplus
-}
-#endif
-
-DEVILUTION_END_NAMESPACE
-
-#endif /* __WAVE_H__ */
diff --git a/SourceS/miniwin/misc.h b/SourceS/miniwin/misc.h
index bae300db7..7b5318044 100644
--- a/SourceS/miniwin/misc.h
+++ b/SourceS/miniwin/misc.h
@@ -68,6 +68,7 @@ bool PostMessage(UINT Msg, WPARAM wParam, LPARAM lParam);
 //
 
 #define  DVL_FILE_CURRENT 1
+#define  DVL_FILE_END 2
 
 #define  DVL_WM_QUIT 0x0012
 
diff --git a/SourceX/sound.cpp b/SourceX/sound.cpp
index f5f704a25..fbda8057f 100644
--- a/SourceX/sound.cpp
+++ b/SourceX/sound.cpp
@@ -117,7 +117,7 @@ TSnd *sound_file_load(const char *path)
 	DWORD dwBytes;
 	int error;
 
-	WOpenFile(path, &file, false);
+	SFileOpenFile(path, &file);
 	pSnd = (TSnd *)DiabloAllocPtr(sizeof(TSnd));
 	memset(pSnd, 0, sizeof(TSnd));
 	pSnd->sound_path = path;
@@ -129,7 +129,7 @@ TSnd *sound_file_load(const char *path)
 
 	pSnd->DSB = new SoundSample();
 	error = pSnd->DSB->SetChunk(wave_file, dwBytes);
-	WCloseFile(file);
+	SFileCloseFile(file);
 	mem_free_dbg(wave_file);
 	if (error != 0) {
 		ErrSdl();
diff --git a/SourceX/storm/storm.cpp b/SourceX/storm/storm.cpp
index a59b0a772..3db815075 100644
--- a/SourceX/storm/storm.cpp
+++ b/SourceX/storm/storm.cpp
@@ -264,10 +264,10 @@ BOOL SBmpLoadImage(const char *pszFileName, SDL_Color *pPalette, BYTE *pBuffer,
 		*pdwBpp = pcxhdr.BitsPerPixel;
 
 	if (!pBuffer) {
-		SFileSetFilePointer(hFile, 0, 0, 2);
+		SFileSetFilePointer(hFile, 0, 0, DVL_FILE_END);
 		fileBuffer = NULL;
 	} else {
-		size = SFileGetFileSize(hFile, 0) - SFileSetFilePointer(hFile, 0, 0, 1);
+		size = SFileGetFileSize(hFile, 0) - SFileSetFilePointer(hFile, 0, 0, DVL_FILE_CURRENT);
 		fileBuffer = (BYTE *)malloc(size);
 	}