diff --git a/src/mod/applications/mod_avmd/avmd_buffer.h b/src/mod/applications/mod_avmd/avmd_buffer.h
index 3910fa1876..11d874b5dd 100644
--- a/src/mod/applications/mod_avmd/avmd_buffer.h
+++ b/src/mod/applications/mod_avmd/avmd_buffer.h
@@ -14,6 +14,11 @@
 
 #include <stdlib.h>
 
+#ifdef WIN32
+    #include <float.h>
+    #include <inttypes.h>
+#endif
+
 #ifndef INT16_MIN
 #define INT16_MIN              (-32767-1)
 #endif
diff --git a/src/mod/applications/mod_avmd/avmd_desa2.c b/src/mod/applications/mod_avmd/avmd_desa2.c
index c71ded6d06..f6b62785d1 100644
--- a/src/mod/applications/mod_avmd/avmd_desa2.c
+++ b/src/mod/applications/mod_avmd/avmd_desa2.c
@@ -6,21 +6,19 @@
  */
 
 #include <stdio.h>
+
 #ifdef WIN32
-#include <float.h>
-#define ISNAN(x) (!!(_isnan(x)))
-#define ISINF(x) (isinf(x))
-#else
-int __isnan(double);
-#define ISNAN(x) (__isnan(x))
-#define ISINF(x) (__isinf(x))
+    #include <float.h>
+    #define ISNAN(x) (!!(_isnan(x)))
+    #define ISINF(x) (isinf(x))
 #endif
+
 #include "avmd_buffer.h"
 #include "avmd_desa2.h"
 #include "avmd_options.h"
 
 #ifdef AVMD_FAST_MATH
-#include "avmd_fast_acosf.h"
+    #include "avmd_fast_acosf.h"
 #endif
 
 
diff --git a/src/mod/applications/mod_avmd/avmd_desa2_tweaked.c b/src/mod/applications/mod_avmd/avmd_desa2_tweaked.c
index 2aa8785491..41ee16adf5 100644
--- a/src/mod/applications/mod_avmd/avmd_desa2_tweaked.c
+++ b/src/mod/applications/mod_avmd/avmd_desa2_tweaked.c
@@ -15,14 +15,9 @@
     #include <float.h>
     #define ISNAN(x) (!!(_isnan(x)))
     #define ISINF(x) (isinf(x))
-#else
-    int __isnan(double);
-    #define ISNAN(x) (__isnan(x))
-    #define ISINF(x) (__isinf(x))
 #endif
 
 #include "avmd_buffer.h"
-#include "avmd_desa2_tweaked.h"
 #include "avmd_options.h"
 
 #ifndef AVMD_FAST_MATH
diff --git a/src/mod/applications/mod_avmd/mod_avmd.c b/src/mod/applications/mod_avmd/mod_avmd.c
index ed584518e9..34566b15d8 100644
--- a/src/mod/applications/mod_avmd/mod_avmd.c
+++ b/src/mod/applications/mod_avmd/mod_avmd.c
@@ -39,17 +39,15 @@
 #include <float.h>
 
 #ifdef WIN32
-#include <float.h>
-#include <inttypes.h>
-#define ISNAN(x) (!!(_isnan(x)))
-#define ISINF(x) (isinf(x))
+    #include <float.h>
+    #define ISNAN(x) (!!(_isnan(x)))
+    #define ISINF(x) (isinf(x))
 #else
-int __isnan(double);
-#define ISNAN(x) (__isnan(x))
-#define ISINF(x) (__isinf(x))
+    int __isnan(double);
+    #define ISNAN(x) (__isnan(x))
+    #define ISINF(x) (__isinf(x))
 #endif
 
-
 #include "avmd_buffer.h"
 #include "avmd_desa2_tweaked.h"
 #include "avmd_sma_buf.h"