diff -Naur adplug-1.5.1.orig/adplugdb/adplugdb.cpp adplug-1.5.1/adplugdb/adplugdb.cpp
--- adplug-1.5.1.orig/adplugdb/adplugdb.cpp	2004-08-08 19:20:07.000000000 +0000
+++ adplug-1.5.1/adplugdb/adplugdb.cpp	2005-10-29 15:01:35.233532720 +0000
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#include <binfile.h>
+#include <libbinio/binfile.h>
 #include <string>
 #include <iostream>
 
diff -Naur adplug-1.5.1.orig/src/adplug.cpp adplug-1.5.1/src/adplug.cpp
--- adplug-1.5.1.orig/src/adplug.cpp	2005-05-12 16:48:10.000000000 +0000
+++ adplug-1.5.1/src/adplug.cpp	2005-10-29 15:01:45.570961192 +0000
@@ -20,7 +20,7 @@
  */
 
 #include <string>
-#include <binfile.h>
+#include <libbinio/binfile.h>
 
 #include "adplug.h"
 #include "debug.h"
diff -Naur adplug-1.5.1.orig/src/database.cpp adplug-1.5.1/src/database.cpp
--- adplug-1.5.1.orig/src/database.cpp	2003-03-01 18:51:59.000000000 +0000
+++ adplug-1.5.1/src/database.cpp	2005-10-29 15:02:52.226827960 +0000
@@ -21,8 +21,8 @@
  * Copyright (c) 2002, 2003 Simon Peter <dn.tlp@gmx.net>
  */
 
-#include <binio.h>
-#include <binfile.h>
+#include <libbinio/binio.h>
+#include <libbinio/binfile.h>
 #include <string.h>
 
 #include "database.h"
diff -Naur adplug-1.5.1.orig/src/database.h adplug-1.5.1/src/database.h
--- adplug-1.5.1.orig/src/database.h	2003-03-01 18:51:59.000000000 +0000
+++ adplug-1.5.1/src/database.h	2005-10-29 15:02:36.282251904 +0000
@@ -26,7 +26,7 @@
 
 #include <iostream>
 #include <string>
-#include <binio.h>
+#include <libbinio/binio.h>
 
 class CAdPlugDatabase
 {
diff -Naur adplug-1.5.1.orig/src/dmo.cpp adplug-1.5.1/src/dmo.cpp
--- adplug-1.5.1.orig/src/dmo.cpp	2004-09-02 19:48:12.000000000 +0000
+++ adplug-1.5.1/src/dmo.cpp	2005-10-29 15:03:10.603034352 +0000
@@ -26,7 +26,7 @@
 */
 
 #include <string.h>
-#include <binstr.h>
+#include <libbinio/binstr.h>
 
 #include "dmo.h"
 #include "debug.h"
diff -Naur adplug-1.5.1.orig/src/fprovide.cpp adplug-1.5.1/src/fprovide.cpp
--- adplug-1.5.1.orig/src/fprovide.cpp	2003-02-17 16:42:50.000000000 +0000
+++ adplug-1.5.1/src/fprovide.cpp	2005-10-29 15:02:43.765114336 +0000
@@ -20,8 +20,8 @@
  */
 
 #include <string.h>
-#include <binio.h>
-#include <binfile.h>
+#include <libbinio/binio.h>
+#include <libbinio/binfile.h>
 
 #include "fprovide.h"
 
diff -Naur adplug-1.5.1.orig/src/fprovide.h adplug-1.5.1/src/fprovide.h
--- adplug-1.5.1.orig/src/fprovide.h	2003-01-28 13:34:35.000000000 +0000
+++ adplug-1.5.1/src/fprovide.h	2005-10-29 15:02:27.742550136 +0000
@@ -23,7 +23,7 @@
 #define H_ADPLUG_FILEPROVIDER
 
 #include <string>
-#include <binio.h>
+#include <libbinio/binio.h>
 
 class CFileProvider
 {