Another include path error due to include dirs moving.

svn path=/branches/branch_beta3/vorbis/; revision=961

72 files changed, 74 insertions, 74 deletions

diff --git a/lib/books/lsp12_0.vqh b/lib/books/lsp12_0.vqh
index b0a0a277..dff8b68d 100644
--- a/lib/books/lsp12_0.vqh
+++ b/lib/books/lsp12_0.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_lsp12_0_VQH_
 #define _V_lsp12_0_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_lsp12_0[] = {
 	0,
diff --git a/lib/books/lsp30_0.vqh b/lib/books/lsp30_0.vqh
index b9e95e43..22770ccd 100644
--- a/lib/books/lsp30_0.vqh
+++ b/lib/books/lsp30_0.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_lsp30_0_VQH_
 #define _V_lsp30_0_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_lsp30_0[] = {
 	0,
diff --git a/lib/books/res0_1024a_128_1.vqh b/lib/books/res0_1024a_128_1.vqh
index 5c5929fb..d790e93b 100644
--- a/lib/books/res0_1024a_128_1.vqh
+++ b/lib/books/res0_1024a_128_1.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_128_1_VQH_
 #define _V_res0_1024a_128_1_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_128_1[] = {
 	1,
diff --git a/lib/books/res0_1024a_128_2.vqh b/lib/books/res0_1024a_128_2.vqh
index fce8c60a..b77e3ace 100644
--- a/lib/books/res0_1024a_128_2.vqh
+++ b/lib/books/res0_1024a_128_2.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_128_2_VQH_
 #define _V_res0_1024a_128_2_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_128_2[] = {
 	1,
diff --git a/lib/books/res0_1024a_128_3.vqh b/lib/books/res0_1024a_128_3.vqh
index 87d9ef86..b570fe95 100644
--- a/lib/books/res0_1024a_128_3.vqh
+++ b/lib/books/res0_1024a_128_3.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_128_3_VQH_
 #define _V_res0_1024a_128_3_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_128_3[] = {
 	2,
diff --git a/lib/books/res0_1024a_128_4.vqh b/lib/books/res0_1024a_128_4.vqh
index e4b49a58..8ccfc80d 100644
--- a/lib/books/res0_1024a_128_4.vqh
+++ b/lib/books/res0_1024a_128_4.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_128_4_VQH_
 #define _V_res0_1024a_128_4_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_128_4[] = {
 	2,
diff --git a/lib/books/res0_1024a_128_5.vqh b/lib/books/res0_1024a_128_5.vqh
index 61a9f6ee..ab9798e7 100644
--- a/lib/books/res0_1024a_128_5.vqh
+++ b/lib/books/res0_1024a_128_5.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_128_5_VQH_
 #define _V_res0_1024a_128_5_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_128_5[] = {
 	3,
diff --git a/lib/books/res0_1024a_128_6.vqh b/lib/books/res0_1024a_128_6.vqh
index 28fc5275..8b97c057 100644
--- a/lib/books/res0_1024a_128_6.vqh
+++ b/lib/books/res0_1024a_128_6.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_128_6_VQH_
 #define _V_res0_1024a_128_6_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_128_6[] = {
 	3,
diff --git a/lib/books/res0_1024a_128_7.vqh b/lib/books/res0_1024a_128_7.vqh
index caf231a9..71c40936 100644
--- a/lib/books/res0_1024a_128_7.vqh
+++ b/lib/books/res0_1024a_128_7.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_128_7_VQH_
 #define _V_res0_1024a_128_7_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_128_7[] = {
 	6,
diff --git a/lib/books/res0_1024a_128_8.vqh b/lib/books/res0_1024a_128_8.vqh
index cf1f6801..87d67a2e 100644
--- a/lib/books/res0_1024a_128_8.vqh
+++ b/lib/books/res0_1024a_128_8.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_128_8_VQH_
 #define _V_res0_1024a_128_8_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_128_8[] = {
 	11,
diff --git a/lib/books/res0_1024a_128_9.vqh b/lib/books/res0_1024a_128_9.vqh
index f3a3de94..10e8f01d 100644
--- a/lib/books/res0_1024a_128_9.vqh
+++ b/lib/books/res0_1024a_128_9.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_128_9_VQH_
 #define _V_res0_1024a_128_9_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_128_9[] = {
 	45,
diff --git a/lib/books/res0_1024a_160_1.vqh b/lib/books/res0_1024a_160_1.vqh
index 25231909..ca4b4f01 100644
--- a/lib/books/res0_1024a_160_1.vqh
+++ b/lib/books/res0_1024a_160_1.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_160_1_VQH_
 #define _V_res0_1024a_160_1_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_160_1[] = {
 	1,
diff --git a/lib/books/res0_1024a_160_2.vqh b/lib/books/res0_1024a_160_2.vqh
index 52d70eb6..7b7f5392 100644
--- a/lib/books/res0_1024a_160_2.vqh
+++ b/lib/books/res0_1024a_160_2.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_160_2_VQH_
 #define _V_res0_1024a_160_2_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_160_2[] = {
 	1,
diff --git a/lib/books/res0_1024a_160_3.vqh b/lib/books/res0_1024a_160_3.vqh
index 33f699ef..680fcdb2 100644
--- a/lib/books/res0_1024a_160_3.vqh
+++ b/lib/books/res0_1024a_160_3.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_160_3_VQH_
 #define _V_res0_1024a_160_3_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_160_3[] = {
 	2,
diff --git a/lib/books/res0_1024a_160_4.vqh b/lib/books/res0_1024a_160_4.vqh
index fd616551..a3bb4db3 100644
--- a/lib/books/res0_1024a_160_4.vqh
+++ b/lib/books/res0_1024a_160_4.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_160_4_VQH_
 #define _V_res0_1024a_160_4_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_160_4[] = {
 	2,
diff --git a/lib/books/res0_1024a_160_5.vqh b/lib/books/res0_1024a_160_5.vqh
index 0915c2cc..6a298abc 100644
--- a/lib/books/res0_1024a_160_5.vqh
+++ b/lib/books/res0_1024a_160_5.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_160_5_VQH_
 #define _V_res0_1024a_160_5_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_160_5[] = {
 	3,
diff --git a/lib/books/res0_1024a_160_6.vqh b/lib/books/res0_1024a_160_6.vqh
index 353d6ced..dcc29f59 100644
--- a/lib/books/res0_1024a_160_6.vqh
+++ b/lib/books/res0_1024a_160_6.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_160_6_VQH_
 #define _V_res0_1024a_160_6_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_160_6[] = {
 	3,
diff --git a/lib/books/res0_1024a_160_7.vqh b/lib/books/res0_1024a_160_7.vqh
index 70d1352a..6b7b7a1e 100644
--- a/lib/books/res0_1024a_160_7.vqh
+++ b/lib/books/res0_1024a_160_7.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_160_7_VQH_
 #define _V_res0_1024a_160_7_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_160_7[] = {
 	6,
diff --git a/lib/books/res0_1024a_160_8.vqh b/lib/books/res0_1024a_160_8.vqh
index afa77872..576eae47 100644
--- a/lib/books/res0_1024a_160_8.vqh
+++ b/lib/books/res0_1024a_160_8.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_160_8_VQH_
 #define _V_res0_1024a_160_8_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_160_8[] = {
 	11,
diff --git a/lib/books/res0_1024a_160_9.vqh b/lib/books/res0_1024a_160_9.vqh
index eb5eb1b9..e4b588e5 100644
--- a/lib/books/res0_1024a_160_9.vqh
+++ b/lib/books/res0_1024a_160_9.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_160_9_VQH_
 #define _V_res0_1024a_160_9_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_160_9[] = {
 	45,
diff --git a/lib/books/res0_1024a_192_1.vqh b/lib/books/res0_1024a_192_1.vqh
index 1d9916d9..b639c1e6 100644
--- a/lib/books/res0_1024a_192_1.vqh
+++ b/lib/books/res0_1024a_192_1.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_192_1_VQH_
 #define _V_res0_1024a_192_1_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_192_1[] = {
 	1,
diff --git a/lib/books/res0_1024a_192_2.vqh b/lib/books/res0_1024a_192_2.vqh
index f192b654..9710062c 100644
--- a/lib/books/res0_1024a_192_2.vqh
+++ b/lib/books/res0_1024a_192_2.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_192_2_VQH_
 #define _V_res0_1024a_192_2_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_192_2[] = {
 	2,
diff --git a/lib/books/res0_1024a_192_3.vqh b/lib/books/res0_1024a_192_3.vqh
index b8514873..9d45a29e 100644
--- a/lib/books/res0_1024a_192_3.vqh
+++ b/lib/books/res0_1024a_192_3.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_192_3_VQH_
 #define _V_res0_1024a_192_3_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_192_3[] = {
 	3,
diff --git a/lib/books/res0_1024a_192_4.vqh b/lib/books/res0_1024a_192_4.vqh
index 04b81ea9..5a1db68b 100644
--- a/lib/books/res0_1024a_192_4.vqh
+++ b/lib/books/res0_1024a_192_4.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_192_4_VQH_
 #define _V_res0_1024a_192_4_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_192_4[] = {
 	4,
diff --git a/lib/books/res0_1024a_192_5.vqh b/lib/books/res0_1024a_192_5.vqh
index 1dd6d395..cedaf24e 100644
--- a/lib/books/res0_1024a_192_5.vqh
+++ b/lib/books/res0_1024a_192_5.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_192_5_VQH_
 #define _V_res0_1024a_192_5_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_192_5[] = {
 	45,
diff --git a/lib/books/res0_1024a_256_1.vqh b/lib/books/res0_1024a_256_1.vqh
index dc6a3f49..da4dab88 100644
--- a/lib/books/res0_1024a_256_1.vqh
+++ b/lib/books/res0_1024a_256_1.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_256_1_VQH_
 #define _V_res0_1024a_256_1_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_256_1[] = {
 	2,
diff --git a/lib/books/res0_1024a_256_2.vqh b/lib/books/res0_1024a_256_2.vqh
index 64627b5d..bd4a525a 100644
--- a/lib/books/res0_1024a_256_2.vqh
+++ b/lib/books/res0_1024a_256_2.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_256_2_VQH_
 #define _V_res0_1024a_256_2_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_256_2[] = {
 	6,
diff --git a/lib/books/res0_1024a_256_3.vqh b/lib/books/res0_1024a_256_3.vqh
index e88c9c80..a3d5ccd8 100644
--- a/lib/books/res0_1024a_256_3.vqh
+++ b/lib/books/res0_1024a_256_3.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_256_3_VQH_
 #define _V_res0_1024a_256_3_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_256_3[] = {
 	11,
diff --git a/lib/books/res0_1024a_256_4.vqh b/lib/books/res0_1024a_256_4.vqh
index 89e2a792..bbc14a73 100644
--- a/lib/books/res0_1024a_256_4.vqh
+++ b/lib/books/res0_1024a_256_4.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_256_4_VQH_
 #define _V_res0_1024a_256_4_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_256_4[] = {
 	23,
diff --git a/lib/books/res0_1024a_256_5.vqh b/lib/books/res0_1024a_256_5.vqh
index 19e00ae4..ebfe9500 100644
--- a/lib/books/res0_1024a_256_5.vqh
+++ b/lib/books/res0_1024a_256_5.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_256_5_VQH_
 #define _V_res0_1024a_256_5_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_256_5[] = {
 	88,
diff --git a/lib/books/res0_1024a_350_1.vqh b/lib/books/res0_1024a_350_1.vqh
index d9e36dcb..6b681fe1 100644
--- a/lib/books/res0_1024a_350_1.vqh
+++ b/lib/books/res0_1024a_350_1.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_350_1_VQH_
 #define _V_res0_1024a_350_1_VQH_
-#include "vorbis/codebook.h"
+#include "vcodebook.h"
 
 static long _vq_quantlist_res0_1024a_350_1[] = {
 	2,
diff --git a/lib/books/res0_1024a_350_2.vqh b/lib/books/res0_1024a_350_2.vqh
index 9e8990fe..0c6460ba 100644
--- a/lib/books/res0_1024a_350_2.vqh
+++ b/lib/books/res0_1024a_350_2.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_350_2_VQH_
 #define _V_res0_1024a_350_2_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_350_2[] = {
 	6,
diff --git a/lib/books/res0_1024a_350_3.vqh b/lib/books/res0_1024a_350_3.vqh
index d7790b07..c888c259 100644
--- a/lib/books/res0_1024a_350_3.vqh
+++ b/lib/books/res0_1024a_350_3.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_350_3_VQH_
 #define _V_res0_1024a_350_3_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_350_3[] = {
 	11,
diff --git a/lib/books/res0_1024a_350_4.vqh b/lib/books/res0_1024a_350_4.vqh
index 292d7b5c..c0445625 100644
--- a/lib/books/res0_1024a_350_4.vqh
+++ b/lib/books/res0_1024a_350_4.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_350_4_VQH_
 #define _V_res0_1024a_350_4_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_350_4[] = {
 	23,
diff --git a/lib/books/res0_1024a_350_5.vqh b/lib/books/res0_1024a_350_5.vqh
index bdc68bf7..af512870 100644
--- a/lib/books/res0_1024a_350_5.vqh
+++ b/lib/books/res0_1024a_350_5.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_1024a_350_5_VQH_
 #define _V_res0_1024a_350_5_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_1024a_350_5[] = {
 	88,
diff --git a/lib/books/res0_128a_128_1.vqh b/lib/books/res0_128a_128_1.vqh
index ca49a377..e3f4320e 100644
--- a/lib/books/res0_128a_128_1.vqh
+++ b/lib/books/res0_128a_128_1.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_128_1_VQH_
 #define _V_res0_128a_128_1_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_128_1[] = {
 	1,
diff --git a/lib/books/res0_128a_128_2.vqh b/lib/books/res0_128a_128_2.vqh
index 81da6151..ede7f4cd 100644
--- a/lib/books/res0_128a_128_2.vqh
+++ b/lib/books/res0_128a_128_2.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_128_2_VQH_
 #define _V_res0_128a_128_2_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_128_2[] = {
 	2,
diff --git a/lib/books/res0_128a_128_3.vqh b/lib/books/res0_128a_128_3.vqh
index 3dcc0105..b4b2c8c3 100644
--- a/lib/books/res0_128a_128_3.vqh
+++ b/lib/books/res0_128a_128_3.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_128_3_VQH_
 #define _V_res0_128a_128_3_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_128_3[] = {
 	3,
diff --git a/lib/books/res0_128a_128_4.vqh b/lib/books/res0_128a_128_4.vqh
index 23ec1803..12f67b87 100644
--- a/lib/books/res0_128a_128_4.vqh
+++ b/lib/books/res0_128a_128_4.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_128_4_VQH_
 #define _V_res0_128a_128_4_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_128_4[] = {
 	4,
diff --git a/lib/books/res0_128a_128_5.vqh b/lib/books/res0_128a_128_5.vqh
index 36a69ac0..672be68c 100644
--- a/lib/books/res0_128a_128_5.vqh
+++ b/lib/books/res0_128a_128_5.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_128_5_VQH_
 #define _V_res0_128a_128_5_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_128_5[] = {
 	45,
diff --git a/lib/books/res0_128a_160_1.vqh b/lib/books/res0_128a_160_1.vqh
index 5393e8b5..52b60351 100644
--- a/lib/books/res0_128a_160_1.vqh
+++ b/lib/books/res0_128a_160_1.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_160_1_VQH_
 #define _V_res0_128a_160_1_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_160_1[] = {
 	1,
diff --git a/lib/books/res0_128a_160_2.vqh b/lib/books/res0_128a_160_2.vqh
index f62117b5..e92f97a1 100644
--- a/lib/books/res0_128a_160_2.vqh
+++ b/lib/books/res0_128a_160_2.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_160_2_VQH_
 #define _V_res0_128a_160_2_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_160_2[] = {
 	2,
diff --git a/lib/books/res0_128a_160_3.vqh b/lib/books/res0_128a_160_3.vqh
index 7e9a27b6..4e074f02 100644
--- a/lib/books/res0_128a_160_3.vqh
+++ b/lib/books/res0_128a_160_3.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_160_3_VQH_
 #define _V_res0_128a_160_3_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_160_3[] = {
 	3,
diff --git a/lib/books/res0_128a_160_4.vqh b/lib/books/res0_128a_160_4.vqh
index 1e33866a..408dcdfb 100644
--- a/lib/books/res0_128a_160_4.vqh
+++ b/lib/books/res0_128a_160_4.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_160_4_VQH_
 #define _V_res0_128a_160_4_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_160_4[] = {
 	4,
diff --git a/lib/books/res0_128a_160_5.vqh b/lib/books/res0_128a_160_5.vqh
index e5c7ffd3..1a796d2f 100644
--- a/lib/books/res0_128a_160_5.vqh
+++ b/lib/books/res0_128a_160_5.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_160_5_VQH_
 #define _V_res0_128a_160_5_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_160_5[] = {
 	45,
diff --git a/lib/books/res0_128a_192_1.vqh b/lib/books/res0_128a_192_1.vqh
index 7b7718c6..ccb4cfb5 100644
--- a/lib/books/res0_128a_192_1.vqh
+++ b/lib/books/res0_128a_192_1.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_192_1_VQH_
 #define _V_res0_128a_192_1_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_192_1[] = {
 	1,
diff --git a/lib/books/res0_128a_192_2.vqh b/lib/books/res0_128a_192_2.vqh
index ca3f9628..c42a275d 100644
--- a/lib/books/res0_128a_192_2.vqh
+++ b/lib/books/res0_128a_192_2.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_192_2_VQH_
 #define _V_res0_128a_192_2_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_192_2[] = {
 	2,
diff --git a/lib/books/res0_128a_192_3.vqh b/lib/books/res0_128a_192_3.vqh
index def392f2..e47deff9 100644
--- a/lib/books/res0_128a_192_3.vqh
+++ b/lib/books/res0_128a_192_3.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_192_3_VQH_
 #define _V_res0_128a_192_3_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_192_3[] = {
 	3,
diff --git a/lib/books/res0_128a_192_4.vqh b/lib/books/res0_128a_192_4.vqh
index f0b1e548..3174c0ad 100644
--- a/lib/books/res0_128a_192_4.vqh
+++ b/lib/books/res0_128a_192_4.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_192_4_VQH_
 #define _V_res0_128a_192_4_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_192_4[] = {
 	4,
diff --git a/lib/books/res0_128a_192_5.vqh b/lib/books/res0_128a_192_5.vqh
index 058c9fde..bb159ba9 100644
--- a/lib/books/res0_128a_192_5.vqh
+++ b/lib/books/res0_128a_192_5.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_192_5_VQH_
 #define _V_res0_128a_192_5_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_192_5[] = {
 	45,
diff --git a/lib/books/res0_128a_256_1.vqh b/lib/books/res0_128a_256_1.vqh
index c3093e90..cd0f780f 100644
--- a/lib/books/res0_128a_256_1.vqh
+++ b/lib/books/res0_128a_256_1.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_256_1_VQH_
 #define _V_res0_128a_256_1_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_256_1[] = {
 	2,
diff --git a/lib/books/res0_128a_256_2.vqh b/lib/books/res0_128a_256_2.vqh
index c0003e00..2e196c51 100644
--- a/lib/books/res0_128a_256_2.vqh
+++ b/lib/books/res0_128a_256_2.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_256_2_VQH_
 #define _V_res0_128a_256_2_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_256_2[] = {
 	6,
diff --git a/lib/books/res0_128a_256_3.vqh b/lib/books/res0_128a_256_3.vqh
index 69ddeda3..a1101014 100644
--- a/lib/books/res0_128a_256_3.vqh
+++ b/lib/books/res0_128a_256_3.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_256_3_VQH_
 #define _V_res0_128a_256_3_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_256_3[] = {
 	11,
diff --git a/lib/books/res0_128a_256_4.vqh b/lib/books/res0_128a_256_4.vqh
index f68f49a1..15f613c7 100644
--- a/lib/books/res0_128a_256_4.vqh
+++ b/lib/books/res0_128a_256_4.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_256_4_VQH_
 #define _V_res0_128a_256_4_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_256_4[] = {
 	23,
diff --git a/lib/books/res0_128a_256_5.vqh b/lib/books/res0_128a_256_5.vqh
index 354835a1..9da503e4 100644
--- a/lib/books/res0_128a_256_5.vqh
+++ b/lib/books/res0_128a_256_5.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_256_5_VQH_
 #define _V_res0_128a_256_5_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_256_5[] = {
 	88,
diff --git a/lib/books/res0_128a_350_1.vqh b/lib/books/res0_128a_350_1.vqh
index b3332ef3..0d7d2ea1 100644
--- a/lib/books/res0_128a_350_1.vqh
+++ b/lib/books/res0_128a_350_1.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_350_1_VQH_
 #define _V_res0_128a_350_1_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_350_1[] = {
 	2,
diff --git a/lib/books/res0_128a_350_2.vqh b/lib/books/res0_128a_350_2.vqh
index 5ed17536..05a019b4 100644
--- a/lib/books/res0_128a_350_2.vqh
+++ b/lib/books/res0_128a_350_2.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_350_2_VQH_
 #define _V_res0_128a_350_2_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_350_2[] = {
 	6,
diff --git a/lib/books/res0_128a_350_3.vqh b/lib/books/res0_128a_350_3.vqh
index 38d64029..af61575e 100644
--- a/lib/books/res0_128a_350_3.vqh
+++ b/lib/books/res0_128a_350_3.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_350_3_VQH_
 #define _V_res0_128a_350_3_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_350_3[] = {
 	11,
diff --git a/lib/books/res0_128a_350_4.vqh b/lib/books/res0_128a_350_4.vqh
index 72215cd4..57995160 100644
--- a/lib/books/res0_128a_350_4.vqh
+++ b/lib/books/res0_128a_350_4.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_350_4_VQH_
 #define _V_res0_128a_350_4_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_350_4[] = {
 	23,
diff --git a/lib/books/res0_128a_350_5.vqh b/lib/books/res0_128a_350_5.vqh
index c8c5dff4..97bf8c6d 100644
--- a/lib/books/res0_128a_350_5.vqh
+++ b/lib/books/res0_128a_350_5.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_res0_128a_350_5_VQH_
 #define _V_res0_128a_350_5_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _vq_quantlist_res0_128a_350_5[] = {
 	88,
diff --git a/lib/books/resaux0_1024a_128.vqh b/lib/books/resaux0_1024a_128.vqh
index d458b846..a422ec05 100644
--- a/lib/books/resaux0_1024a_128.vqh
+++ b/lib/books/resaux0_1024a_128.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_resaux0_1024a_128_VQH_
 #define _V_resaux0_1024a_128_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _huff_lengthlist_resaux0_1024a_128[] = {
 	 2, 6,12,10,14,11,18,11,13,15, 5, 3, 5, 6, 8, 8,
diff --git a/lib/books/resaux0_1024a_160.vqh b/lib/books/resaux0_1024a_160.vqh
index 9764826a..ac8ff835 100644
--- a/lib/books/resaux0_1024a_160.vqh
+++ b/lib/books/resaux0_1024a_160.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_resaux0_1024a_160_VQH_
 #define _V_resaux0_1024a_160_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _huff_lengthlist_resaux0_1024a_160[] = {
 	 2, 6,13,11,15,11,16,11,13,15, 5, 4, 7, 7, 9, 9,
diff --git a/lib/books/resaux0_1024a_192.vqh b/lib/books/resaux0_1024a_192.vqh
index f6e0e58e..ff5a4cf3 100644
--- a/lib/books/resaux0_1024a_192.vqh
+++ b/lib/books/resaux0_1024a_192.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_resaux0_1024a_192_VQH_
 #define _V_resaux0_1024a_192_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _huff_lengthlist_resaux0_1024a_192[] = {
 	 2, 6,11,11,11,11, 5, 3, 6, 8, 9, 9, 9, 5, 4, 5,
diff --git a/lib/books/resaux0_1024a_256.vqh b/lib/books/resaux0_1024a_256.vqh
index cffc25c5..4a3fd01e 100644
--- a/lib/books/resaux0_1024a_256.vqh
+++ b/lib/books/resaux0_1024a_256.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_resaux0_1024a_256_VQH_
 #define _V_resaux0_1024a_256_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _huff_lengthlist_resaux0_1024a_256[] = {
 	 3, 9,12,12,13,16, 9, 9,13,14,16,17,11,15,17,18,
diff --git a/lib/books/resaux0_1024a_350.vqh b/lib/books/resaux0_1024a_350.vqh
index ead2c9d2..04441a61 100644
--- a/lib/books/resaux0_1024a_350.vqh
+++ b/lib/books/resaux0_1024a_350.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_resaux0_1024a_350_VQH_
 #define _V_resaux0_1024a_350_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _huff_lengthlist_resaux0_1024a_350[] = {
 	 6,17,20,20,19,17,18,16,18,19,19,19,16,16,19,19,
diff --git a/lib/books/resaux0_128a_128.vqh b/lib/books/resaux0_128a_128.vqh
index 12651bf1..5f1255cd 100644
--- a/lib/books/resaux0_128a_128.vqh
+++ b/lib/books/resaux0_128a_128.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_resaux0_128a_128_VQH_
 #define _V_resaux0_128a_128_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _huff_lengthlist_resaux0_128a_128[] = {
 	 6,15,15,14,14,14,14,14,14,14,14,14,14,14,14,14,
diff --git a/lib/books/resaux0_128a_160.vqh b/lib/books/resaux0_128a_160.vqh
index 9d560617..658d93da 100644
--- a/lib/books/resaux0_128a_160.vqh
+++ b/lib/books/resaux0_128a_160.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_resaux0_128a_160_VQH_
 #define _V_resaux0_128a_160_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _huff_lengthlist_resaux0_128a_160[] = {
 	 6,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
diff --git a/lib/books/resaux0_128a_192.vqh b/lib/books/resaux0_128a_192.vqh
index d06722e1..f13cbc0c 100644
--- a/lib/books/resaux0_128a_192.vqh
+++ b/lib/books/resaux0_128a_192.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_resaux0_128a_192_VQH_
 #define _V_resaux0_128a_192_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _huff_lengthlist_resaux0_128a_192[] = {
 	 7,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
diff --git a/lib/books/resaux0_128a_256.vqh b/lib/books/resaux0_128a_256.vqh
index 4acc2d46..bbff2113 100644
--- a/lib/books/resaux0_128a_256.vqh
+++ b/lib/books/resaux0_128a_256.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_resaux0_128a_256_VQH_
 #define _V_resaux0_128a_256_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _huff_lengthlist_resaux0_128a_256[] = {
 	 6,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
diff --git a/lib/books/resaux0_128a_350.vqh b/lib/books/resaux0_128a_350.vqh
index 06cb1d78..e1697d1b 100644
--- a/lib/books/resaux0_128a_350.vqh
+++ b/lib/books/resaux0_128a_350.vqh
@@ -17,7 +17,7 @@
 
 #ifndef _V_resaux0_128a_350_VQH_
 #define _V_resaux0_128a_350_VQH_
-#include "vorbis/codebook.h"
+#include "codebook.h"
 
 static long _huff_lengthlist_resaux0_128a_350[] = {
 	 7,16,16,15,15,15,15,15,15,15,15,15,15,15,15,15,
diff --git a/vq/bookutil.c b/vq/bookutil.c
index f0df46f4..e6b15d15 100644
--- a/vq/bookutil.c
+++ b/vq/bookutil.c
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: utility functions for loading .vqh and .vqd files
- last mod: $Id: bookutil.c,v 1.17.2.2 2000/11/03 10:06:07 xiphmont Exp $
+ last mod: $Id: bookutil.c,v 1.17.2.3 2000/11/03 10:47:30 xiphmont Exp $
 
  ********************************************************************/
 
@@ -556,7 +556,7 @@ void write_codebook(FILE *out,char *name,const static_codebook *c){
  " ********************************************************************/\n\n");
 
   fprintf(out,"#ifndef _V_%s_VQH_\n#define _V_%s_VQH_\n",name,name);
-  fprintf(out,"#include \"vorbis/codebook.h\"\n\n");
+  fprintf(out,"#include \"codebook.h\"\n\n");
 
   /* first, the static vectors, then the book structure to tie it together. */
   /* quantlist */
diff --git a/vq/huffbuild.c b/vq/huffbuild.c
index 3b5968f1..84ac8273 100644
--- a/vq/huffbuild.c
+++ b/vq/huffbuild.c
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: hufftree builder
- last mod: $Id: huffbuild.c,v 1.5.2.2 2000/11/03 10:06:08 xiphmont Exp $
+ last mod: $Id: huffbuild.c,v 1.5.2.3 2000/11/03 10:47:30 xiphmont Exp $
 
  ********************************************************************/
 
@@ -162,7 +162,7 @@ int main(int argc, char *argv[]){
  " ********************************************************************/\n\n");
 
     fprintf(file,"#ifndef _V_%s_VQH_\n#define _V_%s_VQH_\n",base,base);
-    fprintf(file,"#include \"vorbis/codebook.h\"\n\n");
+    fprintf(file,"#include \"codebook.h\"\n\n");
     
     /* first, the static vectors, then the book structure to tie it together. */
     /* lengthlist */