diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 9465509e..3f1da558 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-25  Marcus Brinkmann  <marcus@g10code.de>
+
+	* kdpipeiodevice.h: Use namespace _gpgme_.
+	* kdpipeiodevice.cpp: Use namespace _gpgme_.
+	[Q_OS_WIN32 && NOMINMAX]: Do not define NOMINMAX again.
+	* w32-qt-io.cpp: Change namespace of KDPipeIODevice to
+	_gpgme_::KDPipeIODevice.
+
 2007-09-17  Werner Koch  <wk@g10code.com>
 
 	* rungpg.c (gpg_new): Make robust against undefined ttyname or
diff --git a/gpgme/kdpipeiodevice.cpp b/gpgme/kdpipeiodevice.cpp
index f4acebee..6f48292a 100644
--- a/gpgme/kdpipeiodevice.cpp
+++ b/gpgme/kdpipeiodevice.cpp
@@ -26,7 +26,9 @@
 #include <algorithm>
 
 #ifdef Q_OS_WIN32
-# define NOMINMAX
+# ifndef NOMINMAX
+#  define NOMINMAX
+# endif
 # include <windows.h>
 # include <io.h>
 #else
@@ -34,6 +36,8 @@
 # include <errno.h>
 #endif
 
+using namespace _gpgme_;
+
 #ifndef KDAB_CHECK_THIS
 # define KDAB_CHECK_CTOR (void)1
 # define KDAB_CHECK_DTOR KDAB_CHECK_CTOR
diff --git a/gpgme/kdpipeiodevice.h b/gpgme/kdpipeiodevice.h
index ce2873f9..37d2a96b 100644
--- a/gpgme/kdpipeiodevice.h
+++ b/gpgme/kdpipeiodevice.h
@@ -26,6 +26,8 @@
 
 //#include "checker.h"
 
+namespace _gpgme_ {
+
 class KDPipeIODevice : public QIODevice {
     Q_OBJECT
     //KDAB_MAKE_CHECKABLE( KDPipeIODevice )
diff --git a/gpgme/w32-qt-io.cpp b/gpgme/w32-qt-io.cpp
index c2a231aa..989d9936 100644
--- a/gpgme/w32-qt-io.cpp
+++ b/gpgme/w32-qt-io.cpp
@@ -53,9 +53,12 @@ extern "C"
 #endif
 #endif
 
+using _gpgme_::KDPipeIODevice;
+
 
 /* This file is an ugly hack to get GPGME working with Qt on Windows
    targets.  On Windows, you can not select() on file descriptors.
+
    The only way to check if there is something to read is to read
    something.  This means that GPGME can not let Qt check for data
    without letting Qt also handle the data on Windows targets.