diff -ru beid-2.6.0.org/src/beidcommlib/MessageQueue.cpp beid-2.6.0/src/beidcommlib/MessageQueue.cpp
--- beid-2.6.0.org/src/beidcommlib/MessageQueue.cpp	2005-11-14 20:23:58.000000000 +0100
+++ beid-2.6.0/src/beidcommlib/MessageQueue.cpp	2009-04-28 22:36:46.000000000 +0200
@@ -4,6 +4,7 @@
 
 #include "MessageQueue.h"
 #include <qwaitcondition.h>
+#include <algorithm>
 
 using namespace std;
 
diff -ru beid-2.6.0.org/src/beidcommon/datafile.cpp beid-2.6.0/src/beidcommon/datafile.cpp
--- beid-2.6.0.org/src/beidcommon/datafile.cpp	2005-11-25 17:19:33.000000000 +0100
+++ beid-2.6.0/src/beidcommon/datafile.cpp	2009-04-28 22:38:05.000000000 +0200
@@ -36,6 +36,10 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <float.h>
+#include <limits.h>
+#include <cstdlib>
+#include <climits>
+#include <cstring>
 
 #ifdef WIN32
     #include <windows.h>
diff -ru beid-2.6.0.org/src/beidcommon/TLVBuffer.cpp beid-2.6.0/src/beidcommon/TLVBuffer.cpp
--- beid-2.6.0.org/src/beidcommon/TLVBuffer.cpp	2005-11-25 17:19:33.000000000 +0100
+++ beid-2.6.0/src/beidcommon/TLVBuffer.cpp	2009-04-28 22:38:45.000000000 +0200
@@ -3,6 +3,8 @@
 //////////////////////////////////////////////////////////////////////
 
 #include "TLVBuffer.h"
+#include <cstdlib>
+#include <cstring>
 
 namespace eidcommon
 {
diff -ru beid-2.6.0.org/src/eidlib/eiderrors.h beid-2.6.0/src/eidlib/eiderrors.h
--- beid-2.6.0.org/src/eidlib/eiderrors.h	2009-04-28 22:17:33.000000000 +0200
+++ beid-2.6.0/src/eidlib/eiderrors.h	2009-04-28 22:39:44.000000000 +0200
@@ -21,6 +21,8 @@
 #define SCARD_E_NO_ACCESS                       0x80100027
 #endif
 
+#include <cstring>
+
 typedef struct
 {
     int iOpenSC;
diff -ru beid-2.6.0.org/src/eidlib/OpenSCReader.cpp beid-2.6.0/src/eidlib/OpenSCReader.cpp
--- beid-2.6.0.org/src/eidlib/OpenSCReader.cpp	2009-04-28 22:18:14.000000000 +0200
+++ beid-2.6.0/src/eidlib/OpenSCReader.cpp	2009-04-28 22:40:10.000000000 +0200
@@ -10,6 +10,7 @@
 #include <opensc/opensc.h>
 #include <opensc/pkcs15.h>
 #include <string.h>
+#include <cstdlib>
 
 
 struct pcsc_slot_data {	unsigned long pcsc_card; }; /* comes from reader-pcsc.c */