7 files changed, 10 insertions, 8 deletions
diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp
index 2bc889a71..4a6d03924 100644
--- a/src/modules/objects/class_listview.cpp
+++ b/src/modules/objects/class_listview.cpp
@@ -27,8 +27,8 @@
 
 #include "kvi_tal_listview.h"
 #ifdef COMPILE_USE_QT4
-#include <Q3Header>
-#include <QDragEnterEvent>
+#include <q3header.h>
+#include <qevent.h>
 #else
 #include <qheader.h>
 #endif
diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
index c9c7cebfb..8be51a018 100644
--- a/src/modules/objects/class_multilineedit.cpp
+++ b/src/modules/objects/class_multilineedit.cpp
@@ -33,7 +33,7 @@
 	#include <q3multilineedit.h>
 #include <QTextStream>
 
-#include <Q3StyleSheet>
+#include <q3stylesheet.h>
 #define KviTalMultiLineEdit Q3MultiLineEdit
 #define QTEXTEDIT_AUTO_ALL Q3TextEdit::AutoAll
 #define QTEXTEDIT_AUTO_NONE Q3TextEdit::AutoNone
diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp
index 11cbacee6..e0951b14e 100644
--- a/src/modules/objects/class_process.cpp
+++ b/src/modules/objects/class_process.cpp
@@ -27,7 +27,7 @@
 #include "kvi_locale.h"
 #include <qtimer.h>
 #ifdef COMPILE_USE_QT4
-#include <Q3Process>
+#include <q3process.h>
 #else 
 #include <qprocess.h>
 #endif
diff --git a/src/modules/objects/class_process.h b/src/modules/objects/class_process.h
index 3259a6a2f..fe4be1c0e 100644
--- a/src/modules/objects/class_process.h
+++ b/src/modules/objects/class_process.h
@@ -29,7 +29,7 @@
 
 #include "object_macros.h"
 #ifdef COMPILE_USE_QT4
-#include <Q3Process>
+#include <q3process.h>
 #else
 #include <qprocess.h>
 #endif
diff --git a/src/modules/objects/class_progressbar.cpp b/src/modules/objects/class_progressbar.cpp
index 05dc045b7..7d106f4e2 100644
--- a/src/modules/objects/class_progressbar.cpp
+++ b/src/modules/objects/class_progressbar.cpp
@@ -28,7 +28,7 @@
 #include "kvi_locale.h"
 #include "kvi_iconmanager.h"
 #ifdef COMPILE_USE_QT4
-#include <Q3ProgressBar>
+#include <q3progressbar.h>
 #define KVI_PROGRESS_BAR Q3ProgressBar
 #else
 #include <qprogressbar.h>
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
index 61a1cfef1..464f10f85 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/class_wrapper.cpp
@@ -156,10 +156,10 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 		} 		else {
 		if(pWidget) {
     pWidget = findWidgetToWrap(
-     !szClass.isEmpty() ? szClass : 0, !szName.isEmpty() ? szName : 0, pWidget
+     !szClass.isEmpty() ? szClass : KviQString::empty, !szName.isEmpty() ? szName : KviQString::empty, pWidget
     );
    } else {
-    pWidget = findTopLevelWidgetToWrap(szClass.isEmpty() ? szClass : 0, !szName.isEmpty() ? szName : 0);
+    pWidget = findTopLevelWidgetToWrap(szClass.isEmpty() ? szClass : KviQString::empty, !szName.isEmpty() ? szName : KviQString::empty);
    }
 		}
 		if( !pWidget )
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 32e82b8f8..2bf81cb81 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -44,6 +44,8 @@
 	#include <qobjectlist.h>
 #endif
 
+#include <qdir.h>
+
 #include "class_button.h"
 #include "class_checkbox.h"
 #include "class_urllabel.h"