From a6b5bf1ef9a542a647ca4e7333547e97bde0e55f Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Sun, 1 Oct 2017 15:28:17 +0200
Subject: [PATCH] src/aubio_priv.h: include ipp headers from here

---
 src/aubio_priv.h | 8 +++++++-
 src/cvec.c       | 6 ------
 src/fvec.c       | 6 ------
 src/mathutils.c  | 6 ------
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/aubio_priv.h b/src/aubio_priv.h
index bc0ce9c3..86dd0e7f 100644
--- a/src/aubio_priv.h
+++ b/src/aubio_priv.h
@@ -123,7 +123,13 @@
 #endif /* HAVE_AUBIO_DOUBLE */
 #endif /* HAVE_ATLAS */
 
-#if !defined(HAVE_MEMCPY_HACKS) && !defined(HAVE_ACCELERATE) && !defined(HAVE_ATLAS)
+#if defined HAVE_INTEL_IPP
+#include <ippcore.h>
+#include <ippvm.h>
+#include <ipps.h>
+#endif
+
+#if !defined(HAVE_MEMCPY_HACKS) && !defined(HAVE_ACCELERATE) && !defined(HAVE_ATLAS) && !defined(HAVE_INTEL_IPP)
 #define HAVE_NOOPT 1
 #else
 #undef HAVE_NOOPT
diff --git a/src/cvec.c b/src/cvec.c
index e8a369a5..bde75111 100644
--- a/src/cvec.c
+++ b/src/cvec.c
@@ -21,12 +21,6 @@
 #include "aubio_priv.h"
 #include "cvec.h"
 
-#if defined HAVE_INTEL_IPP
-#include <ippcore.h>
-#include <ippvm.h>
-#include <ipps.h>
-#endif
-
 cvec_t * new_cvec(uint_t length) {
   cvec_t * s;
   if ((sint_t)length <= 0) {
diff --git a/src/fvec.c b/src/fvec.c
index fdb5acb8..6161a6ad 100644
--- a/src/fvec.c
+++ b/src/fvec.c
@@ -21,12 +21,6 @@
 #include "aubio_priv.h"
 #include "fvec.h"
 
-#if defined HAVE_INTEL_IPP
-#include <ippcore.h>
-#include <ippvm.h>
-#include <ipps.h>
-#endif
-
 fvec_t * new_fvec(uint_t length) {
   fvec_t * s;
   if ((sint_t)length <= 0) {
diff --git a/src/mathutils.c b/src/mathutils.c
index 5e4244da..ef07d805 100644
--- a/src/mathutils.c
+++ b/src/mathutils.c
@@ -25,12 +25,6 @@
 #include "mathutils.h"
 #include "musicutils.h"
 
-#if defined HAVE_INTEL_IPP
-#include <ippcore.h>
-#include <ippvm.h>
-#include <ipps.h>
-#endif
-
 /** Window types */
 typedef enum
 {
-- 
2.11.0