Tidy the speex/*.h includes some more

This is a partial revert of 785e61a593c61ebc0afee5d87eca9cc73e16d6a6.

The _BUILD_SPEEX special case isn't needed in the public headers, and
we don't need '../include' relative paths in the internal files.

Don't include speex.h in jitter.c, it's not needed there, and no longer
present in this source tree.

Switch from speex_types.h to speexdsp_types.h in arch.h, it's not clear
yet what the best thing to do with the latter will be (since they are
duplicates of each other and must always stay synchronised), but the
former is no longer present in this source tree anymore either.

19 files changed, 22 insertions, 49 deletions

diff --git a/configure.ac b/configure.ac
index cba9629..042b4de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -262,8 +262,6 @@ fi
 AC_SUBST(SIZE16)
 AC_SUBST(SIZE32)
 
-AC_DEFINE([_BUILD_SPEEX], [], [Defined only when Speex itself is build built])
-
 AC_OUTPUT([Makefile libspeexdsp/Makefile doc/Makefile SpeexDSP.spec
            include/Makefile include/speex/Makefile speexdsp.pc
            win32/Makefile win32/libspeexdsp/Makefile
diff --git a/include/speex/speex_buffer.h b/include/speex/speex_buffer.h
index c10b1f9..5bd128a 100644
--- a/include/speex/speex_buffer.h
+++ b/include/speex/speex_buffer.h
@@ -34,11 +34,7 @@
 #ifndef SPEEX_BUFFER_H
 #define SPEEX_BUFFER_H
 
-#ifdef _BUILD_SPEEX
-# include "speexdsp_types.h"
-#else
-# include <speex/speexdsp_types.h>
-#endif
+#include "speexdsp_types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/speex/speex_echo.h b/include/speex/speex_echo.h
index d20cf48..6f14d09 100644
--- a/include/speex/speex_echo.h
+++ b/include/speex/speex_echo.h
@@ -37,11 +37,7 @@
  *  This is the acoustic echo canceller module.
  *  @{
  */
-#ifdef _BUILD_SPEEX
-# include "speexdsp_types.h"
-#else
-# include <speex/speexdsp_types.h>
-#endif
+#include "speexdsp_types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/speex/speex_jitter.h b/include/speex/speex_jitter.h
index 474b9f3..66708da 100644
--- a/include/speex/speex_jitter.h
+++ b/include/speex/speex_jitter.h
@@ -41,11 +41,7 @@
  *  @{
  */
 
-#ifdef _BUILD_SPEEX
-# include "speexdsp_types.h"
-#else
-# include <speex/speexdsp_types.h>
-#endif
+#include "speexdsp_types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/speex/speex_preprocess.h b/include/speex/speex_preprocess.h
index 3a3e7ec..b9555eb 100644
--- a/include/speex/speex_preprocess.h
+++ b/include/speex/speex_preprocess.h
@@ -43,11 +43,7 @@
  *  @{
  */
 
-#ifdef _BUILD_SPEEX
-# include "speexdsp_types.h"
-#else
-# include <speex/speexdsp_types.h>
-#endif
+#include "speexdsp_types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/speex/speex_resampler.h b/include/speex/speex_resampler.h
index 96dfe1e..50d777f 100644
--- a/include/speex/speex_resampler.h
+++ b/include/speex/speex_resampler.h
@@ -84,11 +84,7 @@
       
 #else /* OUTSIDE_SPEEX */
 
-#ifdef _BUILD_SPEEX
-# include "speexdsp_types.h"
-#else
-# include <speex/speexdsp_types.h>
-#endif
+#include "speexdsp_types.h"
 
 #endif /* OUTSIDE_SPEEX */
 
diff --git a/include/speex/speexdsp_types.h b/include/speex/speexdsp_types.h
index 8ab2140..334d674 100644
--- a/include/speex/speexdsp_types.h
+++ b/include/speex/speexdsp_types.h
@@ -119,11 +119,7 @@
 
 #else
 
-# ifdef _BUILD_SPEEX
-#  include "include/speex/speexdsp_config_types.h"
-#else
-#  include <speex/speexdsp_config_types.h>
-#endif
+#include "speexdsp_config_types.h"
 
 #endif
 
diff --git a/libspeexdsp/Makefile.am b/libspeexdsp/Makefile.am
index a7f462f..d5bc5ab 100644
--- a/libspeexdsp/Makefile.am
+++ b/libspeexdsp/Makefile.am
@@ -3,7 +3,7 @@
 
 EXTRA_DIST=echo_diagnostic.m
 
-INCLUDES = -I$(top_builddir)/include -I$(top_builddir) @FFT_CFLAGS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include/speex -I$(top_builddir) @FFT_CFLAGS@
 
 lib_LTLIBRARIES = libspeexdsp.la
 
diff --git a/libspeexdsp/arch.h b/libspeexdsp/arch.h
index 3b47ed9..4a235a5 100644
--- a/libspeexdsp/arch.h
+++ b/libspeexdsp/arch.h
@@ -75,7 +75,7 @@
 #endif
 
 #ifndef OUTSIDE_SPEEX
-#include "../include/speex/speex_types.h"
+#include "speex/speexdsp_types.h"
 #endif
 
 #define ABS(x) ((x) < 0 ? (-(x)) : (x))      /**< Absolute integer value. */
diff --git a/libspeexdsp/buffer.c b/libspeexdsp/buffer.c
index e094804..c82cab5 100644
--- a/libspeexdsp/buffer.c
+++ b/libspeexdsp/buffer.c
@@ -38,7 +38,7 @@
 
 #include "os_support.h"
 #include "arch.h"
-#include "../include/speex/speex_buffer.h"
+#include "speex/speex_buffer.h"
 
 struct SpeexBuffer_ {
    char *data;
diff --git a/libspeexdsp/jitter.c b/libspeexdsp/jitter.c
index 68240f1..c4b5308 100644
--- a/libspeexdsp/jitter.c
+++ b/libspeexdsp/jitter.c
@@ -55,9 +55,8 @@ TODO:
 
 
 #include "arch.h"
-#include "../include/speex/speex.h"
-#include "../include/speex/speex_bits.h"
-#include "../include/speex/speex_jitter.h"
+#include "speex/speex_bits.h"
+#include "speex/speex_jitter.h"
 #include "os_support.h"
 
 #ifndef NULL
diff --git a/libspeexdsp/mdf.c b/libspeexdsp/mdf.c
index 8a5c031..456ab84 100644
--- a/libspeexdsp/mdf.c
+++ b/libspeexdsp/mdf.c
@@ -70,7 +70,7 @@
 #endif
 
 #include "arch.h"
-#include "../include/speex/speex_echo.h"
+#include "speex/speex_echo.h"
 #include "fftwrap.h"
 #include "pseudofloat.h"
 #include "math_approx.h"
diff --git a/libspeexdsp/preprocess.c b/libspeexdsp/preprocess.c
index 3920a76..b8e287a 100644
--- a/libspeexdsp/preprocess.c
+++ b/libspeexdsp/preprocess.c
@@ -60,8 +60,8 @@
 #endif
 
 #include <math.h>
-#include "../include/speex/speex_preprocess.h"
-#include "../include/speex/speex_echo.h"
+#include "speex/speex_preprocess.h"
+#include "speex/speex_echo.h"
 #include "arch.h"
 #include "fftwrap.h"
 #include "filterbank.h"
diff --git a/libspeexdsp/resample.c b/libspeexdsp/resample.c
index d178507..7121445 100644
--- a/libspeexdsp/resample.c
+++ b/libspeexdsp/resample.c
@@ -69,8 +69,8 @@ static void speex_free (void *ptr) {free(ptr);}
 #include "speex_resampler.h"
 #include "arch.h"
 #else /* OUTSIDE_SPEEX */
-               
-#include "../include/speex/speex_resampler.h"
+
+#include "speex/speex_resampler.h"
 #include "arch.h"
 #include "os_support.h"
 #endif /* OUTSIDE_SPEEX */
diff --git a/libspeexdsp/scal.c b/libspeexdsp/scal.c
index 358f817..315ed5a 100755
--- a/libspeexdsp/scal.c
+++ b/libspeexdsp/scal.c
@@ -44,7 +44,7 @@ The algorithm implemented here is described in:
 #include "config.h"
 #endif
 
-#include "../include/speex/speex_echo.h"
+#include "speex/speex_echo.h"
 #include "vorbis_psy.h"
 #include "arch.h"
 #include "os_support.h"
diff --git a/libspeexdsp/testdenoise.c b/libspeexdsp/testdenoise.c
index 9c5398b..adebe94 100644
--- a/libspeexdsp/testdenoise.c
+++ b/libspeexdsp/testdenoise.c
@@ -2,7 +2,7 @@
 #include "config.h"
 #endif
 
-#include "../include/speex/speex_preprocess.h"
+#include "speex/speex_preprocess.h"
 #include <stdio.h>
 
 #define NN 160
diff --git a/libspeexdsp/testecho.c b/libspeexdsp/testecho.c
index 2eedfac..1624dc2 100644
--- a/libspeexdsp/testecho.c
+++ b/libspeexdsp/testecho.c
@@ -2,13 +2,13 @@
 #include "config.h"
 #endif
 
+#include "speex/speex_echo.h"
+#include "speex/speex_preprocess.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "../include/speex/speex_echo.h"
-#include "../include/speex/speex_preprocess.h"
 
 
 #define NN 128
diff --git a/libspeexdsp/testjitter.c b/libspeexdsp/testjitter.c
index c4894fb..557c5c3 100644
--- a/libspeexdsp/testjitter.c
+++ b/libspeexdsp/testjitter.c
@@ -2,7 +2,7 @@
 #include "config.h"
 #endif
 
-#include "../include/speex/speex_jitter.h"
+#include "speex/speex_jitter.h"
 #include <stdio.h>
 
 union jbpdata {
diff --git a/libspeexdsp/testresample.c b/libspeexdsp/testresample.c
index 8e16dc7..1681e52 100644
--- a/libspeexdsp/testresample.c
+++ b/libspeexdsp/testresample.c
@@ -34,8 +34,8 @@
 #include "config.h"
 #endif
 
+#include "speex/speex_resampler.h"
 #include <stdio.h>
-#include "../include/speex/speex_resampler.h"
 #include <math.h>
 #include <stdlib.h>