diff --git a/source/libsmackerdec/include/FileStream.h b/source/libsmackerdec/include/FileStream.h
index 81983559f..35e1481a1 100644
--- a/source/libsmackerdec/include/FileStream.h
+++ b/source/libsmackerdec/include/FileStream.h
@@ -20,7 +20,6 @@
 #ifndef _SmackerFileStream_h_
 #define _SmackerFileStream_h_
 
-#include "compat.h"
 #include <stdint.h>
 #include "files.h"
 
diff --git a/source/libsmackerdec/src/SmackerDecoder.cpp b/source/libsmackerdec/src/SmackerDecoder.cpp
index e326fc330..b210871a3 100644
--- a/source/libsmackerdec/src/SmackerDecoder.cpp
+++ b/source/libsmackerdec/src/SmackerDecoder.cpp
@@ -45,10 +45,9 @@
 #include "SmackerDecoder.h"
 #include "HuffmanVLC.h"
 #include "LogError.h"
+#include "printf.h"
 #include <assert.h>
 #include <algorithm>
-#include "compat.h"
-#include "baselayer.h"
 
 std::vector<class SmackerDecoder*> classInstances;
 
@@ -93,9 +92,8 @@ void Smacker_Close(SmackerHandle &handle)
 	handle.isValid = false;
 }
 
-uint32_t Smacker_GetNumAudioTracks(SmackerHandle &handle)
+uint32_t Smacker_GetNumAudioTracks(SmackerHandle &)
 {
-	UNREFERENCED_PARAMETER(handle);
 	// TODO: fixme
 	return 1;
 }
@@ -411,7 +409,6 @@ bool SmackerDecoder::Open(const char *fileName)
 	// determine max buffer sizes for audio tracks
 //	file.Seek(nextPos, SmackerCommon::FileStream::kSeekStart);
 
-	uint32_t UNUSED(frameSize) = frameSizes[0] & (~3);
 	uint8_t frameFlag  = frameFlags[0];
 
 	// skip over palette
@@ -588,8 +585,6 @@ int SmackerDecoder::DecodeHeaderTree(SmackerCommon::BitReader &bits, std::vector
 	{
 		DecodeTree(bits, &tmp2, 0, 0);
 
-		uint32_t UNUSED(end) = bits.GetPosition();
-
 		bits.SkipBits(1);
 
 		VLC_InitTable(ctx.v2, tmp2.maxlength, tmp2.current, &tmp2.lengths[0], &tmp2.bits[0]);
@@ -809,8 +804,6 @@ int SmackerDecoder::DecodeFrame(uint32_t frameSize)
 
 	stride = frameWidth;
 
-	uint32_t UNUSED(fileStart) = file.GetPosition();
-
 	SmackerCommon::BitReader bits(file, frameSize);
 
 	while (blk < blocks)