diff --git a/src/PixTone.cpp b/src/PixTone.cpp
index 52c1d7a4..7cd05e14 100644
--- a/src/PixTone.cpp
+++ b/src/PixTone.cpp
@@ -152,7 +152,7 @@ bool MakePixelWaveData(const std::vector<double>& pxtData, uint8_t *data)
 		const int v2 = (int)(uint64_t)pitchOffset % 256;
 
 		//Input data
-		data[i] = envelopeTable[(unsigned __int64)((long double)(i << 8) / pxtData[1])]
+		data[i] = envelopeTable[(uint64_t)((long double)(i << 8) / pxtData[1])]
 			* (pxtData[4]
 				* gWaveModelTable[(size_t)pxtData[2]][a]
 				/ 0x40
@@ -167,7 +167,7 @@ bool MakePixelWaveData(const std::vector<double>& pxtData, uint8_t *data)
 		long double newMainOffset;
 		if (gWaveModelTable[(size_t)pxtData[6]][v2] >= 0)
 			newMainOffset = (mainFreq * 2)
-			* (long double)gWaveModelTable[(size_t)pxtData[6]][(signed int)(unsigned __int64)pitchOffset % 256]
+			* (long double)gWaveModelTable[(size_t)pxtData[6]][(signed int)(uint64_t)pitchOffset % 256]
 			* pxtData[8]
 			/ 64.0
 			/ 64.0
diff --git a/src/Sound.h b/src/Sound.h
index 0ffb0ecb..3c02e75f 100644
--- a/src/Sound.h
+++ b/src/Sound.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <stddef.h>
 #include <stdint.h>
 
 class SOUNDBUFFER