diff --git a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.h b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.h
index a78d85e..73d7bef 100644
--- a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.h
+++ b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.h
@@ -33,14 +33,16 @@
 
 class TDEAction;
 
-class KIPIBatchProcessImagesPlugin::BorderImagesDialog;
-class KIPIBatchProcessImagesPlugin::ColorImagesDialog;
-class KIPIBatchProcessImagesPlugin::ConvertImagesDialog;
-class KIPIBatchProcessImagesPlugin::EffectImagesDialog;
-class KIPIBatchProcessImagesPlugin::FilterImagesDialog;
-class KIPIBatchProcessImagesPlugin::RenameImagesDialog;
-class KIPIBatchProcessImagesPlugin::RecompressImagesDialog;
-class KIPIBatchProcessImagesPlugin::ResizeImagesDialog;
+namespace KIPIBatchProcessImagesPlugin {
+    class BorderImagesDialog;
+    class ColorImagesDialog;
+    class ConvertImagesDialog;
+    class EffectImagesDialog;
+    class FilterImagesDialog;
+    class RenameImagesDialog;
+    class RecompressImagesDialog;
+    class ResizeImagesDialog;
+}
 
 class Plugin_BatchProcessImages : public KIPI::Plugin
 {
diff --git a/kipi-plugins/mpegencoder/kimg2mpg.h b/kipi-plugins/mpegencoder/kimg2mpg.h
index 8028950..3294560 100644
--- a/kipi-plugins/mpegencoder/kimg2mpg.h
+++ b/kipi-plugins/mpegencoder/kimg2mpg.h
@@ -66,7 +66,7 @@ class KColorButton;
 class TDEListBox;
 class KButtonBox;
 class KProgress;
-class KURL::List;
+class KURL;
 
 namespace KIPIMPEGEncoderPlugin
 {
diff --git a/kipi-plugins/printwizard/cropframe.cpp b/kipi-plugins/printwizard/cropframe.cpp
index b92c392..13cb3c8 100644
--- a/kipi-plugins/printwizard/cropframe.cpp
+++ b/kipi-plugins/printwizard/cropframe.cpp
@@ -36,7 +36,7 @@ extern "C"
 namespace KIPIPrintWizardPlugin
 {
 
-CropFrame::CropFrame(TQWidget *parent=0, const char *name=0)
+CropFrame::CropFrame(TQWidget *parent, const char *name)
          : TQWidget(parent, name)
 {
   m_mouseDown = false;
diff --git a/kipi-plugins/sendimages/listimageserrordialog.h b/kipi-plugins/sendimages/listimageserrordialog.h
index 515ccce..be02d00 100644
--- a/kipi-plugins/sendimages/listimageserrordialog.h
+++ b/kipi-plugins/sendimages/listimageserrordialog.h
@@ -28,7 +28,7 @@
 #include <kdialogbase.h>
 
 class TDEListView;
-class KURL::List;
+class KURL;
 
 namespace KIPISendimagesPlugin
 {
diff --git a/kipi-plugins/sendimages/plugin_sendimages.h b/kipi-plugins/sendimages/plugin_sendimages.h
index d56c138..d745a94 100644
--- a/kipi-plugins/sendimages/plugin_sendimages.h
+++ b/kipi-plugins/sendimages/plugin_sendimages.h
@@ -30,7 +30,9 @@
 class TQCustomEvent;
 
 class TDEAction;
-class KIPISendimagesPlugin::SendImages;
+namespace KIPISendimagesPlugin {
+    class SendImages;
+}
 
 namespace KIPI
 {