More shuffling of includes to ease codebook integration. This breaks the VQ build, but I'll fix that right away. Monty svn path=/trunk/vorbis/; revision=223