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.
Drop a few of the latter altogether where foo.c was including headers
already included by its foo.h.

The OUTSIDE_SPEEX guard isn't needed here anymore either, since that
was only for the resampler which is now in a separate source tree.

29 files changed, 31 insertions, 69 deletions

diff --git a/configure.ac b/configure.ac
index c6ae8fc..0979deb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -282,8 +282,6 @@ fi
 AC_SUBST(SIZE16)
 AC_SUBST(SIZE32)
 
-AC_DEFINE([_BUILD_SPEEX], [], [Defined only when Speex itself is build built])
-
 AC_OUTPUT([Makefile libspeex/Makefile src/Makefile doc/Makefile Speex.spec
            include/Makefile include/speex/Makefile speex.pc
            win32/Makefile win32/libspeex/Makefile win32/speexenc/Makefile
diff --git a/doc/nb_celp.c b/doc/nb_celp.c
index 2f6ac2f..90bda10 100644
--- a/doc/nb_celp.c
+++ b/doc/nb_celp.c
@@ -5,7 +5,6 @@
 #include "quant_lsp.h"
 #include "cb_search.h"
 #include "filters.h"
-#include "../include/speex/speex_bits.h"
 #include "os_support.h"
 
 #ifndef NULL
diff --git a/include/speex/speex.h b/include/speex/speex.h
index 157e7aa..2e2698b 100644
--- a/include/speex/speex.h
+++ b/include/speex/speex.h
@@ -40,13 +40,8 @@
  *  @{
  */
 
-#ifdef _BUILD_SPEEX
-# include "speex_types.h"
-# include "speex_bits.h"
-#else
-# include <speex/speex_types.h>
-# include <speex/speex_bits.h>
-#endif
+#include "speex_types.h"
+#include "speex_bits.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/speex/speex_callbacks.h b/include/speex/speex_callbacks.h
index 42bc9c3..6f450b3 100644
--- a/include/speex/speex_callbacks.h
+++ b/include/speex/speex_callbacks.h
@@ -39,11 +39,7 @@
  *  @{
  */
 
-#ifdef _BUILD_SPEEX
-# include "speex.h"
-#else
-# include <speex/speex.h>
-#endif
+#include "speex.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/speex/speex_header.h b/include/speex/speex_header.h
index dfd1ce6..f8e36db 100644
--- a/include/speex/speex_header.h
+++ b/include/speex/speex_header.h
@@ -41,11 +41,7 @@
  *  @{
  */
 
-#ifdef _BUILD_SPEEX
-# include "speex_types.h"
-#else
-# include <speex/speex_types.h>
-#endif
+#include "speex_types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/speex/speex_stereo.h b/include/speex/speex_stereo.h
index 6eb6c12..8abb523 100644
--- a/include/speex/speex_stereo.h
+++ b/include/speex/speex_stereo.h
@@ -39,13 +39,8 @@
  *  @{
  */
 
-#ifdef _BUILD_SPEEX
-# include "speex_types.h"
-# include "speex_bits.h"
-#else
-# include <speex/speex_types.h>
-# include <speex/speex_bits.h>
-#endif
+#include "speex_types.h"
+#include "speex_bits.h"
 
 
 #ifdef __cplusplus
diff --git a/include/speex/speex_types.h b/include/speex/speex_types.h
index 59bb5b4..17ea2b2 100644
--- a/include/speex/speex_types.h
+++ b/include/speex/speex_types.h
@@ -119,11 +119,7 @@
 
 #else
 
-# ifdef _BUILD_SPEEX
-#  include "include/speex/speex_config_types.h"
-#else
-#  include <speex/speex_config_types.h>
-#endif
+#include "speex_config_types.h"
 
 #endif
 
diff --git a/libspeex/Makefile.am b/libspeex/Makefile.am
index 91f5da9..e71173b 100644
--- a/libspeex/Makefile.am
+++ b/libspeex/Makefile.am
@@ -17,7 +17,7 @@ else
   FFTSRC=
 endif
 
-INCLUDES = -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include/speex -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
 
 lib_LTLIBRARIES = libspeex.la
 
diff --git a/libspeex/arch.h b/libspeex/arch.h
index 3b47ed9..70fd669 100644
--- a/libspeex/arch.h
+++ b/libspeex/arch.h
@@ -74,9 +74,7 @@
 
 #endif
 
-#ifndef OUTSIDE_SPEEX
-#include "../include/speex/speex_types.h"
-#endif
+#include "speex/speex_types.h"
 
 #define ABS(x) ((x) < 0 ? (-(x)) : (x))      /**< Absolute integer value. */
 #define ABS16(x) ((x) < 0 ? (-(x)) : (x))    /**< Absolute 16-bit value.  */
diff --git a/libspeex/bits.c b/libspeex/bits.c
index 95adbfd..94c280a 100644
--- a/libspeex/bits.c
+++ b/libspeex/bits.c
@@ -36,7 +36,7 @@
 #include "config.h"
 #endif
 
-#include "../include/speex/speex_bits.h"
+#include "speex/speex_bits.h"
 #include "arch.h"
 #include "os_support.h"
 
diff --git a/libspeex/cb_search.h b/libspeex/cb_search.h
index e4fa60b..50b530a 100644
--- a/libspeex/cb_search.h
+++ b/libspeex/cb_search.h
@@ -35,7 +35,7 @@
 #ifndef CB_SEARCH_H
 #define CB_SEARCH_H
 
-#include "../include/speex/speex_bits.h"
+#include "speex/speex_bits.h"
 #include "arch.h"
 
 /** Split codebook parameters. */
diff --git a/libspeex/ltp.c b/libspeex/ltp.c
index f20bca5..e9e6c5a 100644
--- a/libspeex/ltp.c
+++ b/libspeex/ltp.c
@@ -38,7 +38,6 @@
 #include "ltp.h"
 #include "stack_alloc.h"
 #include "filters.h"
-#include "../include/speex/speex_bits.h"
 #include "math_approx.h"
 #include "os_support.h"
 
diff --git a/libspeex/ltp.h b/libspeex/ltp.h
index 7218ffe..95bb126 100644
--- a/libspeex/ltp.h
+++ b/libspeex/ltp.h
@@ -35,7 +35,7 @@
 #ifndef LTP_H
 #define LTP_H
 
-#include "../include/speex/speex_bits.h"
+#include "speex/speex_bits.h"
 #include "arch.h"
 
 /** LTP parameters. */
diff --git a/libspeex/modes.h b/libspeex/modes.h
index cc4d064..0977a57 100644
--- a/libspeex/modes.h
+++ b/libspeex/modes.h
@@ -36,8 +36,7 @@
 #ifndef MODES_H
 #define MODES_H
 
-#include "../include/speex/speex.h"
-#include "../include/speex/speex_bits.h"
+#include "speex/speex.h"
 #include "arch.h"
 
 #define NB_SUBMODES 16
diff --git a/libspeex/nb_celp.c b/libspeex/nb_celp.c
index ab2511d..3b050aa 100644
--- a/libspeex/nb_celp.c
+++ b/libspeex/nb_celp.c
@@ -43,12 +43,10 @@
 #include "filters.h"
 #include "stack_alloc.h"
 #include "vq.h"
-#include "../include/speex/speex_bits.h"
 #include "vbr.h"
 #include "arch.h"
 #include "math_approx.h"
 #include "os_support.h"
-#include "../include/speex/speex_callbacks.h"
 
 #ifdef VORBIS_PSYCHO
 #include "vorbis_psy.h"
diff --git a/libspeex/nb_celp.h b/libspeex/nb_celp.h
index 39be0b1..a8d3088 100644
--- a/libspeex/nb_celp.h
+++ b/libspeex/nb_celp.h
@@ -37,8 +37,7 @@
 #define NB_CELP_H
 
 #include "modes.h"
-#include "../include/speex/speex_bits.h"
-#include "../include/speex/speex_callbacks.h"
+#include "speex/speex_callbacks.h"
 #include "vbr.h"
 #include "filters.h"
 
diff --git a/libspeex/quant_lsp.h b/libspeex/quant_lsp.h
index 2f89430..0fc206b 100644
--- a/libspeex/quant_lsp.h
+++ b/libspeex/quant_lsp.h
@@ -35,7 +35,7 @@
 #ifndef QUANT_LSP_H
 #define QUANT_LSP_H
 
-#include "../include/speex/speex_bits.h"
+#include "speex/speex_bits.h"
 #include "arch.h"
 
 #define MAX_LSP_SIZE 20
diff --git a/libspeex/sb_celp.h b/libspeex/sb_celp.h
index f60e86e..141d0c2 100644
--- a/libspeex/sb_celp.h
+++ b/libspeex/sb_celp.h
@@ -37,7 +37,6 @@
 #define SB_CELP_H
 
 #include "modes.h"
-#include "../include/speex/speex_bits.h"
 #include "nb_celp.h"
 
 /**Structure representing the full state of the sub-band encoder*/
diff --git a/libspeex/speex_callbacks.c b/libspeex/speex_callbacks.c
index 27fd19a..09f037c 100644
--- a/libspeex/speex_callbacks.c
+++ b/libspeex/speex_callbacks.c
@@ -36,7 +36,7 @@
 #include "config.h"
 #endif
 
-#include "../include/speex/speex_callbacks.h"
+#include "speex/speex_callbacks.h"
 #include "arch.h"
 #include "os_support.h"
 
diff --git a/libspeex/speex_header.c b/libspeex/speex_header.c
index 5d6bb04..e56f87e 100644
--- a/libspeex/speex_header.c
+++ b/libspeex/speex_header.c
@@ -36,8 +36,8 @@
 #endif
 
 #include "arch.h"
-#include "../include/speex/speex_header.h"
-#include "../include/speex/speex.h"
+#include "speex/speex_header.h"
+#include "speex/speex.h"
 #include "os_support.h"
 
 #ifndef NULL
diff --git a/libspeex/stereo.c b/libspeex/stereo.c
index 02337ef..8fee55e 100644
--- a/libspeex/stereo.c
+++ b/libspeex/stereo.c
@@ -33,8 +33,8 @@
 #include "config.h"
 #endif
 
-#include "../include/speex/speex_stereo.h"
-#include "../include/speex/speex_callbacks.h"
+#include "speex/speex_stereo.h"
+#include "speex/speex_callbacks.h"
 #include "math_approx.h"
 #include "vq.h"
 #include <math.h>
diff --git a/libspeex/testenc.c b/libspeex/testenc.c
index f4709b4..88a6492 100644
--- a/libspeex/testenc.c
+++ b/libspeex/testenc.c
@@ -2,10 +2,9 @@
 #include "config.h"
 #endif
 
-#include "../include/speex/speex.h"
+#include "speex/speex_callbacks.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "../include/speex/speex_callbacks.h"
 
 #ifdef FIXED_DEBUG
 extern long long spx_mips;
diff --git a/libspeex/testenc_uwb.c b/libspeex/testenc_uwb.c
index 18b51d6..2dfd695 100644
--- a/libspeex/testenc_uwb.c
+++ b/libspeex/testenc_uwb.c
@@ -2,10 +2,9 @@
 #include "config.h"
 #endif
 
-#include "../include/speex/speex.h"
+#include "speex/speex_callbacks.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "../include/speex/speex_callbacks.h"
 
 #ifdef FIXED_DEBUG
 extern long long spx_mips;
diff --git a/libspeex/testenc_wb.c b/libspeex/testenc_wb.c
index 843bc24..64ba237 100644
--- a/libspeex/testenc_wb.c
+++ b/libspeex/testenc_wb.c
@@ -2,10 +2,9 @@
 #include "config.h"
 #endif
 
-#include "../include/speex/speex.h"
+#include "speex/speex_callbacks.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "../include/speex/speex_callbacks.h"
 
 #ifdef FIXED_DEBUG
 extern long long spx_mips;
diff --git a/src/Makefile.am b/src/Makefile.am
index 50b1810..bdb8936 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@
 # Disable automatic dependency tracking if using other tools than gcc and gmake
 #AUTOMAKE_OPTIONS = no-dependencies
 
-INCLUDES = -I$(top_builddir) @OGG_CFLAGS@ @SPEEXDSP_CFLAGS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include/speex -I$(top_builddir) @OGG_CFLAGS@ @SPEEXDSP_CFLAGS@
 
 man_MANS = speexenc.1 speexdec.1
 
diff --git a/src/speexdec.c b/src/speexdec.c
index 1ee3a50..eb4123c 100644
--- a/src/speexdec.c
+++ b/src/speexdec.c
@@ -46,7 +46,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../include/speex/speex.h"
 #include <ogg/ogg.h>
 
 #if defined WIN32 || defined _WIN32
@@ -81,9 +80,9 @@
 
 #include <string.h>
 #include "wav_io.h"
-#include "../include/speex/speex_header.h"
-#include "../include/speex/speex_stereo.h"
-#include "../include/speex/speex_callbacks.h"
+#include "speex/speex_header.h"
+#include "speex/speex_stereo.h"
+#include "speex/speex_callbacks.h"
 
 #define MAX_FRAME_SIZE 2000
 
diff --git a/src/speexenc.c b/src/speexenc.c
index e1904c4..4ad51ae 100644
--- a/src/speexenc.c
+++ b/src/speexenc.c
@@ -47,11 +47,11 @@
 #include <string.h>
 #include <time.h>
 
-#include "../include/speex/speex.h"
+#include "speex/speex.h"
+#include "speex/speex_header.h"
+#include "speex/speex_stereo.h"
 #include <ogg/ogg.h>
 #include "wav_io.h"
-#include "../include/speex/speex_header.h"
-#include "../include/speex/speex_stereo.h"
 #ifdef USE_SPEEXDSP
 #include <speex/speex_preprocess.h>
 #endif
diff --git a/src/wav_io.c b/src/wav_io.c
index c8f466d..907f5ba 100644
--- a/src/wav_io.c
+++ b/src/wav_io.c
@@ -36,7 +36,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "../include/speex/speex_types.h"
 #include "wav_io.h"
 
 
diff --git a/src/wav_io.h b/src/wav_io.h
index b6570a2..0755763 100644
--- a/src/wav_io.h
+++ b/src/wav_io.h
@@ -33,7 +33,7 @@
 #define WAV_IO_H
 
 #include <stdio.h>
-#include "../include/speex/speex_types.h"
+#include "speex/speex_types.h"
 
 #if !defined(__LITTLE_ENDIAN__) && ( defined(WORDS_BIGENDIAN) || defined(__BIG_ENDIAN__) )
 #define le_short(s) ((short) ((unsigned short) (s) << 8) | ((unsigned short) (s) >> 8))