diff --git a/src/game/memory.h b/src/game/memory.h
index 0255ce51..c795332e 100644
--- a/src/game/memory.h
+++ b/src/game/memory.h
@@ -4,9 +4,9 @@
 #include <libultra/types.h>
 #include "types.h"
 #ifdef _WIN32
-#include <string.h>
-#else
 #include <strings.h>
+#else
+#include <string.h>
 #endif
 
 #define MEMORY_POOL_LEFT  0
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 63cd5d3e..a8bc99d3 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -50,6 +50,9 @@ set(tabledesign_SOURCES  sdk-tools/tabledesign/codebook.c sdk-tools/tabledesign/
 #tabledesign_CFLAGS  := -Iaudiofile -Wno-uninitialized
 #tabledesign_LDFLAGS := -Laudiofile -laudiofile -lstdc++
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/audiofile)
+if (MSVC)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/audiofile/include-windows)
+endif()
 add_executable(tabledesign ${tabledesign_SOURCES})
 target_link_libraries(tabledesign PUBLIC audiofile)
 
diff --git a/tools/audiofile/audiofile.cpp b/tools/audiofile/audiofile.cpp
index 59a67c86..31be40f0 100644
--- a/tools/audiofile/audiofile.cpp
+++ b/tools/audiofile/audiofile.cpp
@@ -2251,8 +2251,8 @@ public:
 
 	virtual ~File();
 	virtual int close() = 0;
-	virtual long long int read(void *data, size_t nbytes) = 0;
-	virtual long long int write(const void *data, size_t nbytes) = 0;
+	virtual ssize_t read(void *data, size_t nbytes) = 0;
+	virtual ssize_t write(const void *data, size_t nbytes) = 0;
 	virtual off_t length() = 0;
 	virtual off_t seek(off_t offset, SeekOrigin origin) = 0;
 	virtual off_t tell() = 0;
diff --git a/tools/audiofile/unistd.h b/tools/audiofile/include-windows/unistd.h
similarity index 100%
rename from tools/audiofile/unistd.h
rename to tools/audiofile/include-windows/unistd.h