diff -ur accessx.orig/Access.C accessx/Access.C
--- accessx.orig/Access.C	2003-09-19 19:08:01.000000000 +0300
+++ accessx/Access.C	2008-01-07 18:53:43.000000000 +0200
@@ -22,6 +22,8 @@
 #include <X11/XKBlib.h>
 #include "Access.h"
 
+using namespace std;
+
 //
 // Access()
 //
@@ -153,7 +155,7 @@
     //Get the state of the keyboard.
 
     XkbDescPtr xkb = XkbGetMap(display, 0, XkbUseCoreKbd);
-    if ((int)xkb == BadAlloc || xkb == NULL)
+    if (xkb == NULL)
       {
 	return 5; /*AccessKeyboardQueryFailure;*/
       }
@@ -262,7 +264,7 @@
     //Get the state of the keyboard.
 
     XkbDescPtr xkb = XkbGetMap(display, 0, XkbUseCoreKbd);
-    if ((int)xkb == BadAlloc || xkb == NULL)
+    if (xkb == NULL)
       {
 	return 5; /*AccessKeyboardQueryFailure;*/
       }
diff -ur accessx.orig/Access.h accessx/Access.h
--- accessx.orig/Access.h	2003-09-19 19:00:42.000000000 +0300
+++ accessx/Access.h	2008-01-07 18:53:47.000000000 +0200
@@ -21,7 +21,7 @@
  *
  */
 
-#include <iostream.h>
+#include <iostream>
 #include <math.h>
 
 inline char* onoroff(int val)
diff -ur accessx.orig/ax.C accessx/ax.C
--- accessx.orig/ax.C	2003-09-19 19:09:31.000000000 +0300
+++ accessx/ax.C	2008-01-07 18:53:49.000000000 +0200
@@ -20,6 +20,7 @@
 
 #include "ax.h"
 
+using namespace std;
 
 ///////////////////////////////////////////////////////////////////////////////
 //
diff -ur accessx.orig/ax.h accessx/ax.h
--- accessx.orig/ax.h	2003-09-19 19:06:56.000000000 +0300
+++ accessx/ax.h	2008-01-07 18:53:51.000000000 +0200
@@ -24,7 +24,7 @@
 
 // Include Files
 
-#include <iostream.h>
+#include <iostream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>