diff --git a/source/soundmanager/data/OggData.h b/source/soundmanager/data/OggData.h
index ec2bd79ee8..bf3548d8da 100644
--- a/source/soundmanager/data/OggData.h
+++ b/source/soundmanager/data/OggData.h
@@ -54,9 +54,9 @@ protected:
 
 	bool AddDataBuffer(char* data, long length);
 	void SetFormatAndFreq(int form, ALsizei freq);
-	ALsizei  GetBufferCount();
-	ALuint GetBuffer();
-	ALuint* GetBufferPtr();
+	int  GetBufferCount();
+	unsigned int GetBuffer();
+	unsigned int* GetBufferPtr();
 };
 
 #endif // CONFIG2_AUDIO
diff --git a/source/soundmanager/data/SoundData.cpp b/source/soundmanager/data/SoundData.cpp
index d18094a5ca..e9d5704021 100644
--- a/source/soundmanager/data/SoundData.cpp
+++ b/source/soundmanager/data/SoundData.cpp
@@ -117,7 +117,7 @@ CSoundData* CSoundData::SoundDataFromOgg(const VfsPath& itemPath)
 	return answer;
 }
 
-ALsizei CSoundData::GetBufferCount()
+int CSoundData::GetBufferCount()
 {
 	return 1;
 }
@@ -147,12 +147,12 @@ bool CSoundData::DecrementCount()
 	return (m_RetentionCount <= 0);
 }
 
-ALuint CSoundData::GetBuffer()
+unsigned int CSoundData::GetBuffer()
 {
 	return m_ALBuffer;
 }
 
-ALuint* CSoundData::GetBufferPtr()
+unsigned int* CSoundData::GetBufferPtr()
 {
 	return &m_ALBuffer;
 }
diff --git a/source/soundmanager/data/SoundData.h b/source/soundmanager/data/SoundData.h
index e783081944..5ae66608ad 100644
--- a/source/soundmanager/data/SoundData.h
+++ b/source/soundmanager/data/SoundData.h
@@ -22,7 +22,6 @@
 
 #if CONFIG2_AUDIO
 
-#include "lib/external_libraries/openal.h"
 #include "lib/file/vfs/vfs_path.h"
 #include "ps/CStr.h"
 
@@ -41,7 +40,6 @@ public:
 	static void ReleaseSoundData(CSoundData* theData);
 
 	CSoundData();
-	CSoundData(ALuint dataSource);
 	virtual ~CSoundData();
 	
 	CSoundData* IncrementCount();
@@ -50,17 +48,17 @@ public:
 	virtual bool IsOneShot();
 
 	
-	virtual ALuint GetBuffer();
-	virtual ALsizei GetBufferCount();
+	virtual unsigned int GetBuffer();
+	virtual int GetBufferCount();
 	virtual CStrW* GetFileName();
 	virtual void SetFileName(const Path& aName);
 
-	virtual ALuint* GetBufferPtr();
+	virtual unsigned int* GetBufferPtr();
 
 protected:
 	static DataMap* sSoundData;
 
-	ALuint m_ALBuffer;
+	unsigned int m_ALBuffer;
 	int m_RetentionCount;
 	CStrW* m_FileName;
 
diff --git a/source/soundmanager/items/CSoundBase.cpp b/source/soundmanager/items/CSoundBase.cpp
index 99640ee03b..2ac84e5422 100644
--- a/source/soundmanager/items/CSoundBase.cpp
+++ b/source/soundmanager/items/CSoundBase.cpp
@@ -56,10 +56,11 @@ void CSoundBase::ReleaseOpenAL()
 
 void CSoundBase::Attach(CSoundData* itemData)
 {
-
+	UNUSED2(itemData);
 }
 bool CSoundBase::CanAttach(CSoundData* itemData)
 {
+	UNUSED2(itemData);
 	return false;
 }
 
@@ -132,8 +133,8 @@ void CSoundBase::SetGain(ALfloat gain)
 
 void CSoundBase::SetRollOff(ALfloat rolls)
 {
-	if ( m_ALSource )	
-   	{
+	if ( m_ALSource )
+	{
 		CScopeLock lock(m_ItemMutex);
 		alSourcef(m_ALSource, AL_REFERENCE_DISTANCE, 70.0f);
 		AL_CHECK