diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3175fa7d..9cc741c67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ set (OPENMW_VERSION "${OPENMW_VERSION_MAJOR}.${OPENMW_VERSION_MINOR}.${OPENMW_VE
 # Debug suffix for plugins
 set(DEBUG_SUFFIX "")
 if (DEFINED CMAKE_BUILD_TYPE)
-    if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
         set(DEBUG_SUFFIX "_d")
     endif()
 endif()
diff --git a/apps/openmw/mwsound/sound.hpp b/apps/openmw/mwsound/sound.hpp
index a33892548..0cba6abca 100644
--- a/apps/openmw/mwsound/sound.hpp
+++ b/apps/openmw/mwsound/sound.hpp
@@ -3,6 +3,8 @@
 
 #include <OgreVector3.h>
 
+#include "soundmanager.hpp"
+
 namespace MWSound
 {
     class Sound
diff --git a/apps/openmw/mwsound/soundmanager.hpp b/apps/openmw/mwsound/soundmanager.hpp
index ff360122b..83195390c 100644
--- a/apps/openmw/mwsound/soundmanager.hpp
+++ b/apps/openmw/mwsound/soundmanager.hpp
@@ -5,6 +5,8 @@
 #include <utility>
 #include <map>
 
+#include <boost/shared_ptr.hpp>
+
 #include <OgreResourceGroupManager.h>
 
 #include <components/settings/settings.hpp>