diff -urN vidix-svn-r21861.orig/drivers/bswap.h vidix-svn-r21861/drivers/bswap.h
--- vidix-svn-r21861.orig/drivers/bswap.h	1970-01-01 03:00:00 +0300
+++ vidix-svn-r21861/drivers/bswap.h	2007-01-10 14:18:34 +0200
@@ -0,0 +1,12 @@
+#ifndef __BSWAP_H__
+#define __BSWAP_H__
+
+#include <byteswap.h>
+
+#ifdef WORDS_BIGENDIAN
+#define le2me_32(x) bswap_32(x)
+#else
+#define le2me_32(x) (x)
+#endif
+
+#endif /* __BSWAP_H__ */
diff -urN vidix-svn-r21861.orig/drivers/cyberblade_vid.c vidix-svn-r21861/drivers/cyberblade_vid.c
--- vidix-svn-r21861.orig/drivers/cyberblade_vid.c	2007-01-10 12:56:41 +0200
+++ vidix-svn-r21861/drivers/cyberblade_vid.c	2007-01-10 14:18:34 +0200
@@ -45,10 +45,10 @@
 
 #include "../vidix.h"
 #include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
+#include <libdha.h>
+#include <libdha/pci_ids.h>
+#include <libdha/pci_names.h>
+#include "../config.h"
 
 #include "cyberblade_regs.h"
 
diff -urN vidix-svn-r21861.orig/drivers/mach64_vid.c vidix-svn-r21861/drivers/mach64_vid.c
--- vidix-svn-r21861.orig/drivers/mach64_vid.c	2007-01-10 12:56:41 +0200
+++ vidix-svn-r21861/drivers/mach64_vid.c	2007-01-10 14:18:34 +0200
@@ -13,17 +13,16 @@
 #include <inttypes.h>
 #include <fcntl.h>
 
-#include "../../config.h"
-#include "../../libavutil/common.h"
-#include "../../mpbswap.h"
+#include "../config.h"
+//#include "../../libavutil/common.h"
+#include "bswap.h"
 #include "../vidix.h"
 #include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
+#include <libdha.h>
+#include <libdha/pci_ids.h>
+#include <libdha/pci_names.h>
 
 #include "mach64.h"
-#include "../../version.h"
 
 #define UNUSED(x) ((void)(x)) /**< Removes warning about unused arguments */
 
@@ -464,7 +463,6 @@
     printf("[mach64] Driver was not probed but is being initializing\n");
     return EINTR;
   }
-  if(__verbose>0) printf("[mach64] version %s\n", VERSION);
   
   if((mach64_mmio_base = map_phys_mem(pci_info.base2,0x1000))==(void *)-1) return ENOMEM;
   mach64_wait_for_idle();
diff -urN vidix-svn-r21861.orig/drivers/mga_vid.c vidix-svn-r21861/drivers/mga_vid.c
--- vidix-svn-r21861.orig/drivers/mga_vid.c	2007-01-10 12:56:41 +0200
+++ vidix-svn-r21861/drivers/mga_vid.c	2007-01-10 14:18:34 +0200
@@ -56,9 +56,9 @@
 
 #include "../vidix.h"
 #include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
+#include <libdha.h>
+#include <libdha/pci_ids.h>
+#include <libdha/pci_names.h>
 
 #ifdef __MINGW32__
 #define ENOTSUP 134
diff -urN vidix-svn-r21861.orig/drivers/nvidia_vid.c vidix-svn-r21861/drivers/nvidia_vid.c
--- vidix-svn-r21861.orig/drivers/nvidia_vid.c	2007-01-10 12:56:41 +0200
+++ vidix-svn-r21861/drivers/nvidia_vid.c	2007-01-10 14:18:34 +0200
@@ -20,12 +20,12 @@
 
 #include "../vidix.h"
 #include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
-#include "../../libavutil/common.h"
-#include "../../mpbswap.h"
+#include <libdha.h>
+#include <libdha/pci_ids.h>
+#include <libdha/pci_names.h>
+#include "../config.h"
+//#include "../../libavutil/common.h"
+//#include "../../mpbswap.h"
 
 
 pciinfo_t pci_info;
diff -urN vidix-svn-r21861.orig/drivers/pm3_vid.c vidix-svn-r21861/drivers/pm3_vid.c
--- vidix-svn-r21861.orig/drivers/pm3_vid.c	2007-01-10 12:56:41 +0200
+++ vidix-svn-r21861/drivers/pm3_vid.c	2007-01-10 14:18:34 +0200
@@ -27,10 +27,10 @@
 
 #include "../vidix.h"
 #include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
+#include <libdha.h>
+#include <libdha/pci_ids.h>
+#include <libdha/pci_names.h>
+#include "../config.h"
 
 #include "pm3_regs.h"
 
diff -urN vidix-svn-r21861.orig/drivers/radeon_vid.c vidix-svn-r21861/drivers/radeon_vid.c
--- vidix-svn-r21861.orig/drivers/radeon_vid.c	2007-01-10 12:56:41 +0200
+++ vidix-svn-r21861/drivers/radeon_vid.c	2007-01-10 14:18:34 +0200
@@ -16,14 +16,14 @@
 #include <math.h>
 #include <inttypes.h>
 
-#include "../../config.h"
-#include "../../libavutil/common.h"
-#include "../../mpbswap.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
+#include "../config.h"
+//#include "../../libavutil/common.h"
+#include "bswap.h"
+#include <libdha/pci_ids.h>
+#include <libdha/pci_names.h>
 #include "../vidix.h"
 #include "../fourcc.h"
-#include "../../libdha/libdha.h"
+#include <libdha.h>
 #include "radeon.h"
 
 #ifdef HAVE_X11
diff -urN vidix-svn-r21861.orig/drivers/savage_vid.c vidix-svn-r21861/drivers/savage_vid.c
--- vidix-svn-r21861.orig/drivers/savage_vid.c	2007-01-10 12:56:41 +0200
+++ vidix-svn-r21861/drivers/savage_vid.c	2007-01-10 14:18:34 +0200
@@ -40,10 +40,10 @@
 
 #include "../vidix.h"
 #include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
+#include <libdha.h>
+#include <libdha/pci_ids.h>
+#include <libdha/pci_names.h>
+#include "../config.h"
 
 #include "savage_regs.h"
 
diff -urN vidix-svn-r21861.orig/drivers/sis_bridge.c vidix-svn-r21861/drivers/sis_bridge.c
--- vidix-svn-r21861.orig/drivers/sis_bridge.c	2007-01-10 12:56:41 +0200
+++ vidix-svn-r21861/drivers/sis_bridge.c	2007-01-10 14:18:34 +0200
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "../../libdha/libdha.h"
+#include <libdha.h>
 #include "sis_regs.h"
 #include "sis_defs.h"
 
diff -urN vidix-svn-r21861.orig/drivers/sis_vid.c vidix-svn-r21861/drivers/sis_vid.c
--- vidix-svn-r21861.orig/drivers/sis_vid.c	2007-01-10 12:56:41 +0200
+++ vidix-svn-r21861/drivers/sis_vid.c	2007-01-10 14:18:34 +0200
@@ -32,10 +32,10 @@
 
 #include "../vidix.h"
 #include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
+#include <libdha.h>
+#include <libdha/pci_ids.h>
+#include <libdha/pci_names.h>
+#include "../config.h"
 
 #include "sis_regs.h"
 #include "sis_defs.h"
diff -urN vidix-svn-r21861.orig/drivers/unichrome_vid.c vidix-svn-r21861/drivers/unichrome_vid.c
--- vidix-svn-r21861.orig/drivers/unichrome_vid.c	2007-01-10 12:56:41 +0200
+++ vidix-svn-r21861/drivers/unichrome_vid.c	2007-01-10 14:18:34 +0200
@@ -41,10 +41,10 @@
 
 #include "../vidix.h"
 #include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
+#include <libdha.h>
+#include <libdha/pci_ids.h>
+#include <libdha/pci_names.h>
+#include "../config.h"
 
 #include "unichrome_regs.h"
 
diff -urN vidix-svn-r21861.orig/vidixlib.c vidix-svn-r21861/vidixlib.c
--- vidix-svn-r21861.orig/vidixlib.c	2007-01-10 12:56:41 +0200
+++ vidix-svn-r21861/vidixlib.c	2007-01-10 14:18:45 +0200
@@ -43,9 +43,9 @@
 #endif
 
 #include "vidixlib.h"
-#include "../config.h"
-#include "../libavutil/common.h"
-#include "../mpbswap.h"
+#include "config.h"
+#include <stdint.h>
+#include <byteswap.h>
 
 static char drv_name[FILENAME_MAX];