diff --git a/src/audio/sfx_manager.hpp b/src/audio/sfx_manager.hpp
index 200e35b28..9ca0c150a 100644
--- a/src/audio/sfx_manager.hpp
+++ b/src/audio/sfx_manager.hpp
@@ -98,7 +98,7 @@ public:
       *  Entries for custom SFX sounds.  These are unique for each kart.
       * eg. kart->playCustomSFX(SFX_MANAGER::CUSTOM_HORN)
       */
-    enum CustomSFX
+    enum CustomSFX : int
     {
         CUSTOM_HORN,    //!< Replaces default horn
         CUSTOM_CRASH,   //!< Played when colliding with another kart
diff --git a/src/graphics/camera_normal.cpp b/src/graphics/camera_normal.cpp
index d234da1ac..6adaa8103 100644
--- a/src/graphics/camera_normal.cpp
+++ b/src/graphics/camera_normal.cpp
@@ -19,6 +19,7 @@
 
 #include "graphics/camera_normal.hpp"
 
+#include "audio/sfx_manager.hpp"
 #include "config/stk_config.hpp"
 #include "config/user_config.hpp"
 #include "input/device_manager.hpp"
diff --git a/src/guiengine/widgets/player_kart_widget.cpp b/src/guiengine/widgets/player_kart_widget.cpp
index 7e69a7205..3682e90aa 100644
--- a/src/guiengine/widgets/player_kart_widget.cpp
+++ b/src/guiengine/widgets/player_kart_widget.cpp
@@ -18,6 +18,7 @@
 
 #include "guiengine/widgets/player_kart_widget.hpp"
 
+#include "audio/sfx_manager.hpp"
 #include "config/player_manager.hpp"
 #include "config/user_config.hpp"
 #include "graphics/render_info.hpp"
diff --git a/src/karts/explosion_animation.cpp b/src/karts/explosion_animation.cpp
index 68f4b198c..d3e09aa57 100644
--- a/src/karts/explosion_animation.cpp
+++ b/src/karts/explosion_animation.cpp
@@ -18,6 +18,7 @@
 
 #include "karts/explosion_animation.hpp"
 
+#include "audio/sfx_manager.hpp"
 #include "graphics/camera.hpp"
 #include "graphics/stars.hpp"
 #include "guiengine/engine.hpp"
diff --git a/src/karts/kart_properties.cpp b/src/karts/kart_properties.cpp
index 9284be7db..b3f968fce 100644
--- a/src/karts/kart_properties.cpp
+++ b/src/karts/kart_properties.cpp
@@ -18,7 +18,9 @@
 
 #include "karts/kart_properties.hpp"
 
+#include "audio/sfx_manager.hpp"
 #include "addons/addon.hpp"
+#include "audio/sfx_manager.hpp"
 #include "config/stk_config.hpp"
 #include "config/player_manager.hpp"
 #include "graphics/central_settings.hpp"
diff --git a/src/karts/kart_properties.hpp b/src/karts/kart_properties.hpp
index dfe8f65a1..13797cb5e 100644
--- a/src/karts/kart_properties.hpp
+++ b/src/karts/kart_properties.hpp
@@ -31,7 +31,6 @@ namespace irr
 }
 using namespace irr;
 
-#include "audio/sfx_manager.hpp"
 #include "io/xml_node.hpp"
 #include "race/race_manager.hpp"
 #include "utils/interpolation_array.hpp"
@@ -273,7 +272,7 @@ public:
 
     // ------------------------------------------------------------------------
     /** Returns custom sound effects for this kart. */
-    const int          getCustomSfxId (SFXManager::CustomSFX type)
+    const int          getCustomSfxId (int type)
                                        const  {return m_custom_sfx_id[type];  }
 
     // ------------------------------------------------------------------------