diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index a75469a305..8fb6b7aa2e 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -17,6 +17,7 @@
 #include <string.h>
 
 #include "audio_driver.h"
+#include "audio_resampler_driver.h"
 #include "audio_utils.h"
 #include "audio_thread_wrapper.h"
 
diff --git a/audio/drivers_resampler/nearest.c b/audio/drivers_resampler/nearest.c
index 1f7bfe4fec..926a974785 100644
--- a/audio/drivers_resampler/nearest.c
+++ b/audio/drivers_resampler/nearest.c
@@ -13,12 +13,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../audio_resampler_driver.h"
-#include <math.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <stdint.h>
+#include <math.h>
  
+#include "../audio_resampler_driver.h"
 typedef struct rarch_nearest_resampler
 {
    float fraction;
diff --git a/audio/drivers_resampler/sinc.c b/audio/drivers_resampler/sinc.c
index 678d3ab4f6..29877cd06b 100644
--- a/audio/drivers_resampler/sinc.c
+++ b/audio/drivers_resampler/sinc.c
@@ -15,9 +15,9 @@
 
 /* Bog-standard windowed SINC implementation. */
 
-#include <math.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <math.h>
 #include <string.h>
 
 #ifdef __SSE__
diff --git a/driver.c b/driver.c
index af5313aef2..8763eee609 100644
--- a/driver.c
+++ b/driver.c
@@ -22,6 +22,7 @@
 #include "msg_hash.h"
 #include "verbosity.h"
 #include "audio/audio_driver.h"
+#include "audio/audio_resampler_driver.h"
 
 #ifdef HAVE_MENU
 #include "menu/menu.h"
diff --git a/driver.h b/driver.h
index 91a9043b94..4f45f51b05 100644
--- a/driver.h
+++ b/driver.h
@@ -33,7 +33,6 @@
 
 #include "camera/camera_driver.h"
 #include "location/location_driver.h"
-#include "audio/audio_resampler_driver.h"
 #include "record/record_driver.h"
 
 #include "libretro_version_1.h"
diff --git a/general.h b/general.h
index b5dd7a1ac1..e78da765fc 100644
--- a/general.h
+++ b/general.h
@@ -18,6 +18,7 @@
 #define __RARCH_GENERAL_H
 
 #include <stdint.h>
+#include <math.h>
 #include <limits.h>
 
 /* Platform-specific headers */
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index bf523aa133..0e82f605ee 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -39,6 +39,7 @@
 #include "../general.h"
 #include "../dynamic.h"
 #include "../audio/audio_driver.h"
+#include "../audio/audio_resampler_driver.h"
 #include "../input/input_common.h"
 #include "../input/input_autodetect.h"
 #include "../config.def.h"
diff --git a/record/drivers/record_ffmpeg.c b/record/drivers/record_ffmpeg.c
index 135305c1ba..a44ed73a88 100644
--- a/record/drivers/record_ffmpeg.c
+++ b/record/drivers/record_ffmpeg.c
@@ -61,6 +61,7 @@ extern "C" {
 
 #include "../../general.h"
 #include "../../verbosity.h"
+#include "../../audio/audio_resampler_driver.h"
 #include "../../audio/audio_utils.h"
 #include "../record_driver.h"
 
diff --git a/runloop.c b/runloop.c
index c40f410c8a..84d5b40238 100644
--- a/runloop.c
+++ b/runloop.c
@@ -16,6 +16,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <math.h>
+
 #include <file/file_path.h>
 #include <retro_inline.h>