--- a/src/read_cache.h
+++ b/src/read_cache.h
@@ -1,46 +1,36 @@
-/*
+/* 
  * Copyright (C) 2000 Rich Wareham <richwareham@users.sourceforge.net>
- *
+ * 
  * This file is part of libdvdnav, a DVD navigation library.
- *
+ * 
  * libdvdnav is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *
+ * 
  * libdvdnav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * You should have received a copy of the GNU General Public License along
- * with libdvdnav; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * $Id$
+ *
  */
 
-#ifndef LIBDVDNAV_READ_CACHE_H
-#define LIBDVDNAV_READ_CACHE_H
+#ifndef __DVDNAV_READ_CACHE_H
+#define __DVDNAV_READ_CACHE_H
 
-/* Opaque cache type -- defined in dvdnav_internal.h */
-/* typedef struct read_cache_s read_cache_t; */
-
-/* EXPERIMENTAL: Setting the following to 1 will use an experimental multi-threaded
- *               read-ahead cache.
- */
-#define _MULTITHREAD_ 0
-
-/* Constructor/destructors */
-read_cache_t *dvdnav_read_cache_new(dvdnav_t* dvd_self);
-void dvdnav_read_cache_free(read_cache_t* self);
+#include "dvdnav_internal.h"
 
 /* This function MUST be called whenever self->file changes. */
-void dvdnav_read_cache_clear(read_cache_t *self);
+void dvdnav_read_cache_clear(dvdnav_t *self);
 /* This function is called just after reading the NAV packet. */
-void dvdnav_pre_cache_blocks(read_cache_t *self, int sector, size_t block_count);
-/* This function will do the cache read.
- * The buffer handed in must be malloced to take one dvd block.
- * On a cache hit, a different buffer will be returned though.
- * Those buffers must _never_ be freed. */
-int dvdnav_read_cache_block(read_cache_t *self, int sector, size_t block_count, uint8_t **buf);
+void dvdnav_pre_cache_blocks(dvdnav_t *self, int sector, size_t block_count);
+/* This function will do the cache read */
+int dvdnav_read_cache_block(dvdnav_t *self, int sector, size_t block_count, uint8_t *buf);
 
-#endif /* LIBDVDNAV_READ_CACHE_H */
+#endif /* __DVDNAV_READ_CACHE_H */