--- a/inc/glxlog.h	Tue Jul 06 14:16:16 2010 +0300
+++ b/inc/glxlog.h	Thu Jul 22 16:33:32 2010 +0100
@@ -70,7 +70,7 @@
     #else
         // put full file paths off for __FILE__ macro to make the log entries shorter
         #pragma fullpath_file off*/
-        #define GLX_DEBUG_STR( cat, str ) __FILE__ "(%d) : " ##cat " : " ##str
+        #define GLX_DEBUG_STR( cat, str ) __FILE__ "(%d) : " cat " : " str
 //    #endif
 
     /**

--- a/ui/commandhandlers/commandhandlerbase/inc/glxcommandhandler.h	Tue Jul 06 14:16:16 2010 +0300
+++ b/ui/commandhandlers/commandhandlerbase/inc/glxcommandhandler.h	Thu Jul 22 16:33:32 2010 +0100
@@ -19,6 +19,7 @@
 #define GLXCOMMANDHANDLER_H
 
 #include <QObject>
+#include <QModelIndex>
 
 #ifdef BUILD_COMMANDHANDLERBASE
 #define GLX_COMMANDHANDLERBASE_EXPORT Q_DECL_EXPORT
@@ -26,7 +27,6 @@
 #define GLX_COMMANDHANDLERBASE_EXPORT Q_DECL_IMPORT
 #endif
 
-class QModelIndex;
 class GLX_COMMANDHANDLERBASE_EXPORT GlxCommandHandler : public QObject
 {
 public:

--- a/ui/viewmanagement/statehandler/inc/glxactionhandler.h	Tue Jul 06 14:16:16 2010 +0300
+++ b/ui/viewmanagement/statehandler/inc/glxactionhandler.h	Thu Jul 22 16:33:32 2010 +0100
@@ -22,9 +22,9 @@
 
 #include <QObject>
 #include <QHash>
+#include <QModelIndex>
 
 class GlxCommandHandler;
-class QModelIndex;
 
 class GlxActionHandler : public QObject
 {