diff --git a/gst-libs/gst/fft/kiss_fft_s16.h b/gst-libs/gst/fft/kiss_fft_s16.h
index 4303127ac3..7dd40a22bb 100644
--- a/gst-libs/gst/fft/kiss_fft_s16.h
+++ b/gst-libs/gst/fft/kiss_fft_s16.h
@@ -1,6 +1,14 @@
 #ifndef KISS_FFT_S16_H
 #define KISS_FFT_S16_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
@@ -26,8 +34,6 @@ extern "C" {
 
 #define KISS_FFT_S16_MALLOC g_malloc
 
-#include "_stdint.h"
-
 #define kiss_fft_s16_scalar int16_t
 
 typedef struct {
diff --git a/gst-libs/gst/fft/kiss_fft_s32.h b/gst-libs/gst/fft/kiss_fft_s32.h
index 8edd66454a..ad2f2b0868 100644
--- a/gst-libs/gst/fft/kiss_fft_s32.h
+++ b/gst-libs/gst/fft/kiss_fft_s32.h
@@ -1,6 +1,14 @@
 #ifndef KISS_FFT_S32_H
 #define KISS_FFT_S32_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
@@ -26,9 +34,6 @@ extern "C" {
 
 #define KISS_FFT_S32_MALLOC g_malloc
 
-
-#include "_stdint.h"
-
 #define kiss_fft_s32_scalar int32_t
 
 typedef struct {