diff -up kdebluetooth-1.0_beta8/kdebluetooth/kcm_btpaired/pairedtab.h~ kdebluetooth-1.0_beta8/kdebluetooth/kcm_btpaired/pairedtab.h
--- kdebluetooth-1.0_beta8/kdebluetooth/kcm_btpaired/pairedtab.h~	2007-09-17 19:52:30.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/kcm_btpaired/pairedtab.h	2008-01-06 15:45:56.000000000 +0200
@@ -29,6 +29,7 @@
 #define PAIREDTAB_H
 
 #include "pairedtabbase.h"
+#include <stdint.h>
 #include <qcstring.h>
 #include <qdatastream.h>
 #include <qstringlist.h>
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverops.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverops.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverops.cpp~	2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverops.cpp	2008-01-06 15:58:29.000000000 +0200
@@ -28,6 +28,7 @@
 #include "qobexserverops.h"
 #include "qobexauth.h"
 
+#undef myDebug
 #undef DEBUG
 // #define DEBUG
 #ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverconnection.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverconnection.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverconnection.cpp~	2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverconnection.cpp	2008-01-06 15:57:54.000000000 +0200
@@ -42,6 +42,7 @@
 #include "qobexnullserverops.h"
 #include "qobexserverops.h"
 
+#undef myDebug
 #undef DEBUG
 #define DEBUG
 #ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexclient.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexclient.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexclient.cpp~	2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexclient.cpp	2008-01-06 15:56:55.000000000 +0200
@@ -31,6 +31,7 @@
 
 #include "qobexclient.h"
 
+#undef myDebug
 //#undef DEBUG
 #define DEBUG
 #ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserialtransport.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserialtransport.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserialtransport.cpp~	2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserialtransport.cpp	2008-01-06 15:59:12.000000000 +0200
@@ -31,6 +31,7 @@
 
 #include "qobexserialtransport.h"
 
+#undef myDebug
 #undef DEBUG
 // #define DEBUG
 #ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobextransport.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobextransport.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobextransport.cpp~	2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobextransport.cpp	2008-01-06 15:57:32.000000000 +0200
@@ -46,6 +46,7 @@
 
 #include "qobextransport.h"
 
+#undef myDebug
 //#undef DEBUG
 #define DEBUG
 #ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qserialdevice.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qserialdevice.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qserialdevice.cpp~	2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qserialdevice.cpp	2008-01-06 15:58:59.000000000 +0200
@@ -43,6 +43,7 @@
 #include "qttylock.h"
 #include "qserialdevice.h"
 
+#undef myDebug
 #undef DEBUG
 // #define DEBUG
 #ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexbase.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexbase.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexbase.cpp~	2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexbase.cpp	2008-01-06 15:58:05.000000000 +0200
@@ -23,6 +23,7 @@
 
 #include "qobexbase.h"
 
+#undef myDebug
 #undef DEBUG
 // #define DEBUG
 #ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserver.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserver.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserver.cpp~	2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserver.cpp	2008-01-06 15:57:13.000000000 +0200
@@ -31,6 +31,7 @@
 
 #include "qobexserver.h"
 
+#undef myDebug
 #undef DEBUG
 // #define DEBUG
 #ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexericssontransport.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexericssontransport.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexericssontransport.cpp~	2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexericssontransport.cpp	2008-01-06 15:58:44.000000000 +0200
@@ -31,6 +31,7 @@
 
 #include "qobexericssontransport.h"
 
+#undef myDebug
 #undef DEBUG
 #define DEBUG
 #ifdef DEBUG