diff --git a/wrap/gcache/cache.h b/wrap/gcache/cache.h
index c01e7d60..8d26ea2c 100644
--- a/wrap/gcache/cache.h
+++ b/wrap/gcache/cache.h
@@ -7,6 +7,7 @@
 #include <vector>
 #include <list>
 #include <wrap/system/multithreading/mt.h>
+#include <wrap/system/multithreading/atomic_int.h>
 
 #include "provider.h"
 
@@ -31,7 +32,7 @@ public:
   //if true the cache will exit at the first opportunity
   bool quit;
   ///keeps track of changes (if 1 then something was loaded or dropped
-  QAtomicInt new_data;
+  mt::atomicInt new_data;
   ///callback for new_data
   void (*callback)(void *data);
 
@@ -80,7 +81,7 @@ public:
       this->heap.clear();
     }
     if(!s_curr == 0) {
-      qDebug() << "Cache size after flush is not ZERO!";
+      std::cerr << "Cache size after flush is not ZERO!\n";
       s_curr = 0;
     }
   }
diff --git a/wrap/gcache/controller.h b/wrap/gcache/controller.h
index 14bd791e..81241f84 100644
--- a/wrap/gcache/controller.h
+++ b/wrap/gcache/controller.h
@@ -1,7 +1,6 @@
 #ifndef GCACHE_CONTROLLER_H
 #define GCACHE_CONTROLLER_H
 
-#include <QDebug>
 #include "cache.h"
 
 /** Allows to insert tokens, update priorities and generally control the cache.
diff --git a/wrap/gcache/door.h b/wrap/gcache/door.h
index 29f8ac88..5a21e47e 100644
--- a/wrap/gcache/door.h
+++ b/wrap/gcache/door.h
@@ -26,13 +26,12 @@
 #define CACHE_DOOR_H
 
 #include <wrap/system/multithreading/mt.h>
+#include <wrap/system/multithreading/atomic_int.h>
 
 #ifdef QT_CORE_LIB
 #include <QWaitCondition>
 #endif
 
-#include <QAtomicInt>
-
 #define METHOD_2
 
 #ifdef METHOD_1
diff --git a/wrap/gcache/token.h b/wrap/gcache/token.h
index 22febdc6..89951d9b 100644
--- a/wrap/gcache/token.h
+++ b/wrap/gcache/token.h
@@ -1,7 +1,7 @@
 #ifndef GCACHE_TOKEN_H
 #define GCACHE_TOKEN_H
 
-#include <QAtomicInt>
+#include <wrap/system/multithreading/atomic_int.h>
 
 /* QAtomic int count keep trak of token status:
    >0: locked (possibly multiple times)
@@ -34,7 +34,7 @@ class Token {
   ///swap space used in updatePriorities [do not use, should be private]
   Priority tmp_priority;     
   ///reference count of locked items [do not use, should be private]
-  QAtomicInt count;          
+  mt::atomicInt count;
 
  public:
   Token(): count(OUTSIDE) {}