Rename 'digikam' folder to 'src'

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1129 files changed, 1533 insertions, 1533 deletions

diff --git a/configure.files b/configure.files
index 9adc9eff..6d55e369 100644
--- a/configure.files
+++ b/configure.files
@@ -1,5 +1,5 @@
 ./admin/configure.in.min
 configure.in.in
-./digikam/configure.in.bot
-./digikam/configure.in.in
-./digikam/utilities/hotplug/configure.in.in
+./src/configure.in.bot
+./src/configure.in.in
+./src/utilities/hotplug/configure.in.in
diff --git a/configure.in b/configure.in
index 55e93361..fca132a4 100644
--- a/configure.in
+++ b/configure.in
@@ -448,15 +448,15 @@ fi
 KDE_CHECK_COMPILER_FLAG(fno-tree-pre,[CXXFLAGS="-fno-tree-pre $CXXFLAGS"])
 
 dnl =======================================================
-dnl FILE: ./digikam/utilities/hotplug/configure.in.in
+dnl FILE: ./src/utilities/hotplug/configure.in.in
 dnl =======================================================
 
-KDE_EXPAND_MAKEVAR(digikamhelper_dir, kde_datadir/digikam/utils)
+KDE_EXPAND_MAKEVAR(digikamhelper_dir, kde_datadir/src/utils)
 AC_SUBST(digikamhelper_dir)
 
-AC_OUTPUT(digikam/utilities/hotplug/digikam-download.desktop)
-AC_OUTPUT(digikam/utilities/hotplug/digikam-gphoto2-camera.desktop)
-AC_OUTPUT(digikam/utilities/hotplug/digikam-mount-and-download.desktop)
+AC_OUTPUT(src/utilities/hotplug/digikam-download.desktop)
+AC_OUTPUT(src/utilities/hotplug/digikam-gphoto2-camera.desktop)
+AC_OUTPUT(src/utilities/hotplug/digikam-mount-and-download.desktop)
 
 KDE_CREATE_SUBDIRSLIST
 AM_CONDITIONAL(digikam_SUBDIR_included, test "x$digikam_SUBDIR_included" = xyes)
@@ -473,85 +473,85 @@ AC_CONFIG_FILES([ data/pics/digikam/Makefile ])
 AC_CONFIG_FILES([ data/pics/showfoto/Makefile ])
 AC_CONFIG_FILES([ data/profiles/Makefile ])
 AC_CONFIG_FILES([ data/themes/Makefile ])
-AC_CONFIG_FILES([ digikam/Makefile ])
-AC_CONFIG_FILES([ digikam/digikam/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/adjustcurves/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/adjustlevels/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/antivignetting/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/blurfx/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/border/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/border/patterns/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/channelmixer/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/charcoal/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/colorfx/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/coreplugin/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/coreplugin/hsl/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/coreplugin/ratiocrop/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/coreplugin/sharpnesseditor/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/coreplugin/sharpnesseditor/clapack/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/distortionfx/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/emboss/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/filmgrain/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/freerotation/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/hotpixels/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/infrared/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/inpainting/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/inserttext/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/lensdistortion/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/noisereduction/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/oilpaint/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/perspective/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/raindrop/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/restoration/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/sheartool/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/superimpose/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/texture/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/texture/patterns/Makefile ])
-AC_CONFIG_FILES([ digikam/imageplugins/whitebalance/Makefile ])
-AC_CONFIG_FILES([ digikam/tdeioslave/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/curves/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/dialogs/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/dimg/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/dimg/filters/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/dimg/loaders/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/dmetadata/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/greycstoration/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/histogram/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/imageproperties/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/jpegutils/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/levels/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/lprof/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/sqlite2/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/sqlite3/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/themeengine/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/threadimageio/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/thumbbar/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/whitebalance/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/widgets/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/widgets/common/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/widgets/iccprofiles/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/widgets/imageplugins/Makefile ])
-AC_CONFIG_FILES([ digikam/libs/widgets/metadata/Makefile ])
-AC_CONFIG_FILES([ digikam/showfoto/Makefile ])
-AC_CONFIG_FILES([ digikam/showfoto/icons/Makefile ])
-AC_CONFIG_FILES([ digikam/showfoto/pics/Makefile ])
-AC_CONFIG_FILES([ digikam/showfoto/setup/Makefile ])
-AC_CONFIG_FILES([ digikam/themedesigner/Makefile ])
-AC_CONFIG_FILES([ digikam/utilities/Makefile ])
-AC_CONFIG_FILES([ digikam/utilities/batch/Makefile ])
-AC_CONFIG_FILES([ digikam/utilities/cameragui/Makefile ])
-AC_CONFIG_FILES([ digikam/utilities/hotplug/Makefile ])
-AC_CONFIG_FILES([ digikam/utilities/imageeditor/Makefile ])
-AC_CONFIG_FILES([ digikam/utilities/imageeditor/canvas/Makefile ])
-AC_CONFIG_FILES([ digikam/utilities/imageeditor/editor/Makefile ])
-AC_CONFIG_FILES([ digikam/utilities/imageeditor/rawimport/Makefile ])
-AC_CONFIG_FILES([ digikam/utilities/imageeditor/tools/Makefile ])
-AC_CONFIG_FILES([ digikam/utilities/lighttable/Makefile ])
-AC_CONFIG_FILES([ digikam/utilities/scripts/Makefile ])
-AC_CONFIG_FILES([ digikam/utilities/setup/Makefile ])
-AC_CONFIG_FILES([ digikam/utilities/slideshow/Makefile ])
+AC_CONFIG_FILES([ src/Makefile ])
+AC_CONFIG_FILES([ src/digikam/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/adjustcurves/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/adjustlevels/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/antivignetting/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/blurfx/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/border/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/border/patterns/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/channelmixer/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/charcoal/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/colorfx/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/coreplugin/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/coreplugin/hsl/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/coreplugin/ratiocrop/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/coreplugin/sharpnesseditor/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/coreplugin/sharpnesseditor/clapack/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/distortionfx/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/emboss/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/filmgrain/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/freerotation/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/hotpixels/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/infrared/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/inpainting/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/inserttext/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/lensdistortion/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/noisereduction/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/oilpaint/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/perspective/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/raindrop/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/restoration/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/sheartool/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/superimpose/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/texture/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/texture/patterns/Makefile ])
+AC_CONFIG_FILES([ src/imageplugins/whitebalance/Makefile ])
+AC_CONFIG_FILES([ src/tdeioslave/Makefile ])
+AC_CONFIG_FILES([ src/libs/Makefile ])
+AC_CONFIG_FILES([ src/libs/curves/Makefile ])
+AC_CONFIG_FILES([ src/libs/dialogs/Makefile ])
+AC_CONFIG_FILES([ src/libs/dimg/Makefile ])
+AC_CONFIG_FILES([ src/libs/dimg/filters/Makefile ])
+AC_CONFIG_FILES([ src/libs/dimg/loaders/Makefile ])
+AC_CONFIG_FILES([ src/libs/dmetadata/Makefile ])
+AC_CONFIG_FILES([ src/libs/greycstoration/Makefile ])
+AC_CONFIG_FILES([ src/libs/histogram/Makefile ])
+AC_CONFIG_FILES([ src/libs/imageproperties/Makefile ])
+AC_CONFIG_FILES([ src/libs/jpegutils/Makefile ])
+AC_CONFIG_FILES([ src/libs/levels/Makefile ])
+AC_CONFIG_FILES([ src/libs/lprof/Makefile ])
+AC_CONFIG_FILES([ src/libs/sqlite2/Makefile ])
+AC_CONFIG_FILES([ src/libs/sqlite3/Makefile ])
+AC_CONFIG_FILES([ src/libs/themeengine/Makefile ])
+AC_CONFIG_FILES([ src/libs/threadimageio/Makefile ])
+AC_CONFIG_FILES([ src/libs/thumbbar/Makefile ])
+AC_CONFIG_FILES([ src/libs/whitebalance/Makefile ])
+AC_CONFIG_FILES([ src/libs/widgets/Makefile ])
+AC_CONFIG_FILES([ src/libs/widgets/common/Makefile ])
+AC_CONFIG_FILES([ src/libs/widgets/iccprofiles/Makefile ])
+AC_CONFIG_FILES([ src/libs/widgets/imageplugins/Makefile ])
+AC_CONFIG_FILES([ src/libs/widgets/metadata/Makefile ])
+AC_CONFIG_FILES([ src/showfoto/Makefile ])
+AC_CONFIG_FILES([ src/showfoto/icons/Makefile ])
+AC_CONFIG_FILES([ src/showfoto/pics/Makefile ])
+AC_CONFIG_FILES([ src/showfoto/setup/Makefile ])
+AC_CONFIG_FILES([ src/themedesigner/Makefile ])
+AC_CONFIG_FILES([ src/utilities/Makefile ])
+AC_CONFIG_FILES([ src/utilities/batch/Makefile ])
+AC_CONFIG_FILES([ src/utilities/cameragui/Makefile ])
+AC_CONFIG_FILES([ src/utilities/hotplug/Makefile ])
+AC_CONFIG_FILES([ src/utilities/imageeditor/Makefile ])
+AC_CONFIG_FILES([ src/utilities/imageeditor/canvas/Makefile ])
+AC_CONFIG_FILES([ src/utilities/imageeditor/editor/Makefile ])
+AC_CONFIG_FILES([ src/utilities/imageeditor/rawimport/Makefile ])
+AC_CONFIG_FILES([ src/utilities/imageeditor/tools/Makefile ])
+AC_CONFIG_FILES([ src/utilities/lighttable/Makefile ])
+AC_CONFIG_FILES([ src/utilities/scripts/Makefile ])
+AC_CONFIG_FILES([ src/utilities/setup/Makefile ])
+AC_CONFIG_FILES([ src/utilities/slideshow/Makefile ])
 AC_CONFIG_FILES([ doc/Makefile ])
 AC_CONFIG_FILES([ translations/Makefile ])
 AC_CONFIG_FILES([ translations/messages/Makefile ])
diff --git a/digikam/imageplugins/adjustcurves/Makefile.am b/digikam/imageplugins/adjustcurves/Makefile.am
deleted file mode 100644
index 94cb29e5..00000000
--- a/digikam/imageplugins/adjustcurves/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_adjustcurves_la_SOURCES = imageplugin_adjustcurves.cpp \
-	                                         adjustcurvestool.cpp 
-
-digikamimageplugin_adjustcurves_la_LIBADD = $(LIB_TDEPARTS) \
-	                                        $(top_builddir)/digikam/digikam/libdigikam.la
-
-digikamimageplugin_adjustcurves_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_adjustcurves.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_adjustcurves.la
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_adjustcurves_ui.rc
diff --git a/digikam/imageplugins/adjustlevels/Makefile.am b/digikam/imageplugins/adjustlevels/Makefile.am
deleted file mode 100644
index 09b192eb..00000000
--- a/digikam/imageplugins/adjustlevels/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_adjustlevels_la_SOURCES = imageplugin_adjustlevels.cpp \
-	                                         adjustlevelstool.cpp 
-
-digikamimageplugin_adjustlevels_la_LIBADD = $(LIB_TDEPARTS) \
-	                                        $(top_builddir)/digikam/digikam/libdigikam.la 
-
-digikamimageplugin_adjustlevels_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_adjustlevels.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_adjustlevels.la
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_adjustlevels_ui.rc
-
diff --git a/digikam/imageplugins/antivignetting/Makefile.am b/digikam/imageplugins/antivignetting/Makefile.am
deleted file mode 100644
index b08eac9e..00000000
--- a/digikam/imageplugins/antivignetting/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_antivignetting_la_SOURCES = imageplugin_antivignetting.cpp \
-	                                           antivignettingtool.cpp antivignetting.cpp 
-
-digikamimageplugin_antivignetting_la_LIBADD = $(LIB_TDEPARTS) \
-	                                          $(top_builddir)/digikam/digikam/libdigikam.la 
-
-digikamimageplugin_antivignetting_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_antivignetting.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_antivignetting.la 
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_antivignetting_ui.rc
-
diff --git a/digikam/imageplugins/blurfx/Makefile.am b/digikam/imageplugins/blurfx/Makefile.am
deleted file mode 100644
index c60d7c89..00000000
--- a/digikam/imageplugins/blurfx/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_blurfx_la_SOURCES = imageplugin_blurfx.cpp \
-	                                   blurfxtool.cpp blurfx.cpp 
-
-digikamimageplugin_blurfx_la_LIBADD = $(LIB_TDEPARTS) \
-	                                  $(top_builddir)/digikam/digikam/libdigikam.la 
-
-digikamimageplugin_blurfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_blurfx.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_blurfx.la 
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_blurfx_ui.rc     
-       
diff --git a/digikam/imageplugins/border/Makefile.am b/digikam/imageplugins/border/Makefile.am
deleted file mode 100644
index 1ca2dbd0..00000000
--- a/digikam/imageplugins/border/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-METASOURCES = AUTO
-SUBDIRS = patterns
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_border_la_SOURCES = imageplugin_border.cpp \
-	                                   bordertool.cpp border.cpp 
-
-digikamimageplugin_border_la_LIBADD = $(LIB_TDEPARTS) \
-	                                  $(top_builddir)/digikam/digikam/libdigikam.la 
-
-digikamimageplugin_border_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_border.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_border.la 
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_border_ui.rc
diff --git a/digikam/imageplugins/channelmixer/Makefile.am b/digikam/imageplugins/channelmixer/Makefile.am
deleted file mode 100644
index caa69f6e..00000000
--- a/digikam/imageplugins/channelmixer/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_channelmixer_la_SOURCES = imageplugin_channelmixer.cpp \
-	                                         channelmixertool.cpp 
-
-digikamimageplugin_channelmixer_la_LIBADD = $(LIB_TDEPARTS) \
-	                                        $(top_builddir)/digikam/digikam/libdigikam.la 
-
-digikamimageplugin_channelmixer_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_channelmixer.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_channelmixer.la
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_channelmixer_ui.rc
-
diff --git a/digikam/imageplugins/charcoal/Makefile.am b/digikam/imageplugins/charcoal/Makefile.am
deleted file mode 100644
index f6300e60..00000000
--- a/digikam/imageplugins/charcoal/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_charcoal_la_SOURCES = imageplugin_charcoal.cpp \
-	                                     charcoaltool.cpp charcoal.cpp 
-
-digikamimageplugin_charcoal_la_LIBADD = $(LIB_TDEPARTS) \
-	                                    $(top_builddir)/digikam/digikam/libdigikam.la
-
-digikamimageplugin_charcoal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_charcoal.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_charcoal.la
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_charcoal_ui.rc
-       
diff --git a/digikam/imageplugins/colorfx/Makefile.am b/digikam/imageplugins/colorfx/Makefile.am
deleted file mode 100644
index 41a605c4..00000000
--- a/digikam/imageplugins/colorfx/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_colorfx_la_SOURCES = imageplugin_colorfx.cpp \
-	                                    colorfxtool.cpp 
-
-digikamimageplugin_colorfx_la_LIBADD = $(LIB_TDEPARTS) \
-	                                   $(top_builddir)/digikam/digikam/libdigikam.la 
-
-digikamimageplugin_colorfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_colorfx.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_colorfx.la
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_colorfx_ui.rc
-       
diff --git a/digikam/imageplugins/coreplugin/Makefile.am b/digikam/imageplugins/coreplugin/Makefile.am
deleted file mode 100644
index 1e0db6f0..00000000
--- a/digikam/imageplugins/coreplugin/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-SUBDIRS = sharpnesseditor hsl ratiocrop 
-COMPILE_FIRST = sharpnesseditor hsl ratiocrop 
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       -I$(top_srcdir)/digikam/imageplugins/coreplugin/sharpnesseditor \
-	       -I$(top_srcdir)/digikam/imageplugins/coreplugin/hsl \
-	       -I$(top_srcdir)/digikam/imageplugins/coreplugin/ratiocrop \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_core_la_SOURCES = imageplugin_core.cpp bwsepiatool.cpp \
-	                                 autocorrectiontool.cpp \
-	                                 rgbtool.cpp \
-	                                 redeyetool.cpp blurtool.cpp \
-	                                 iccprooftool.cpp bcgtool.cpp 
-
-noinst_HEADERS = autocorrectiontool.h blurtool.h \
-                 rgbtool.h bcgtool.h \
-                 bwsepiatool.h iccprooftool.h redeyetool.h 
-
-digikamimageplugin_core_la_LIBADD = $(LIB_TDEPARTS) \
-                                    $(top_builddir)/digikam/imageplugins/coreplugin/sharpnesseditor/libsharpnesseditor.la \
-	                            $(top_builddir)/digikam/imageplugins/coreplugin/hsl/libhsl.la \
-	                            $(top_builddir)/digikam/imageplugins/coreplugin/ratiocrop/libratiocrop.la \
-	                            $(top_builddir)/digikam/digikam/libdigikam.la \
-	                            $(top_builddir)/digikam/utilities/imageeditor/editor/libdimgeditor.la \
-	                            $(top_builddir)/digikam/libs/curves/libcurves.la \
-				    $(top_builddir)/digikam/libs/widgets/common/libcommonwidgets.la \
-				    $(top_builddir)/digikam/libs/widgets/imageplugins/libimagepluginswidgets.la
-
-digikamimageplugin_core_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio -lkexiv2 -ltdeutils
-
-kde_services_DATA = digikamimageplugin_core.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_core.la
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_core_ui.rc
diff --git a/digikam/imageplugins/coreplugin/hsl/Makefile.am b/digikam/imageplugins/coreplugin/hsl/Makefile.am
deleted file mode 100644
index b349cca8..00000000
--- a/digikam/imageplugins/coreplugin/hsl/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-noinst_LTLIBRARIES = libhsl.la
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	   -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	   -I$(top_srcdir)/digikam/libs/histogram \
-	   -I$(top_srcdir)/digikam/libs/levels \
-	   -I$(top_srcdir)/digikam/libs/curves \
-	   -I$(top_srcdir)/digikam/libs/whitebalance \
-	   -I$(top_srcdir)/digikam/libs/widgets/common \
-	   -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	   -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	   -I$(top_srcdir)/digikam/libs/dialogs \
-	   -I$(top_srcdir)/digikam/libs/dimg \
-	   -I$(top_srcdir)/digikam/libs/dmetadata \
-	   -I$(top_srcdir)/digikam/libs/dimg/filters \
-	   -I$(top_srcdir)/digikam/digikam \
-	   $(LIBKDCRAW_CFLAGS) \
-	   $(all_includes) 
-
-libhsl_la_SOURCES = hsltool.cpp hspreviewwidget.cpp 
-
-libhsl_la_LDFLAGS = $(all_libraries)
-
-noinst_HEADERS = hsltool.h hspreviewwidget.h 
-
diff --git a/digikam/imageplugins/coreplugin/ratiocrop/Makefile.am b/digikam/imageplugins/coreplugin/ratiocrop/Makefile.am
deleted file mode 100644
index d65a4a33..00000000
--- a/digikam/imageplugins/coreplugin/ratiocrop/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-noinst_LTLIBRARIES = libratiocrop.la
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	   -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	   -I$(top_srcdir)/digikam/libs/histogram \
-	   -I$(top_srcdir)/digikam/libs/levels \
-	   -I$(top_srcdir)/digikam/libs/curves \
-	   -I$(top_srcdir)/digikam/libs/whitebalance \
-	   -I$(top_srcdir)/digikam/libs/widgets/common \
-	   -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	   -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	   -I$(top_srcdir)/digikam/libs/dialogs \
-	   -I$(top_srcdir)/digikam/libs/dimg \
-	   -I$(top_srcdir)/digikam/libs/dmetadata \
-	   -I$(top_srcdir)/digikam/libs/dimg/filters \
-	   -I$(top_srcdir)/digikam/digikam \
-	   $(LIBKDCRAW_CFLAGS) \
-	   $(all_includes) 
-
-libratiocrop_la_SOURCES = ratiocroptool.cpp imageselectionwidget.cpp 
-
-libratiocrop_la_LDFLAGS = $(all_libraries)
-
-noinst_HEADERS = ratiocroptool.h imageselectionwidget.h 
-
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/Makefile.am b/digikam/imageplugins/coreplugin/sharpnesseditor/Makefile.am
deleted file mode 100644
index 39cc3a2d..00000000
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-SUBDIRS = clapack 
-COMPILE_FIRST = clapack 
-
-noinst_LTLIBRARIES = libsharpnesseditor.la
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	   -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	   -I$(top_srcdir)/digikam/libs/histogram \
-	   -I$(top_srcdir)/digikam/libs/levels \
-	   -I$(top_srcdir)/digikam/libs/curves \
-	   -I$(top_srcdir)/digikam/libs/whitebalance \
-	   -I$(top_srcdir)/digikam/libs/widgets/common \
-	   -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	   -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	   -I$(top_srcdir)/digikam/libs/dialogs \
-	   -I$(top_srcdir)/digikam/libs/dimg \
-	   -I$(top_srcdir)/digikam/libs/dmetadata \
-	   -I$(top_srcdir)/digikam/libs/dimg/filters \
-	   -I$(top_srcdir)/digikam/digikam \
-	   -I$(top_srcdir)/digikam/imageplugins/coreplugin/sharpnesseditor/clapack \
-	   $(LIBKDCRAW_CFLAGS) \
-	   $(all_includes) 
-
-libsharpnesseditor_la_LIBADD = $(top_builddir)/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/liblapack.la 
-
-libsharpnesseditor_la_SOURCES = sharpentool.cpp unsharp.cpp matrix.cpp refocus.cpp 
-
-libsharpnesseditor_la_LDFLAGS = $(all_libraries)
-
-noinst_HEADERS = sharpentool.h unsharp.h matrix.h refocus.h 
-
diff --git a/digikam/imageplugins/distortionfx/Makefile.am b/digikam/imageplugins/distortionfx/Makefile.am
deleted file mode 100644
index 2beedd78..00000000
--- a/digikam/imageplugins/distortionfx/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_distortionfx_la_SOURCES = imageplugin_distortionfx.cpp \
-	                                         distortionfxtool.cpp distortionfx.cpp
-
-digikamimageplugin_distortionfx_la_LIBADD = $(LIB_TDEPARTS) \
-	                                        $(top_builddir)/digikam/digikam/libdigikam.la
-
-digikamimageplugin_distortionfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_distortionfx.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_distortionfx.la 
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_distortionfx_ui.rc     
-       
diff --git a/digikam/imageplugins/emboss/Makefile.am b/digikam/imageplugins/emboss/Makefile.am
deleted file mode 100644
index dcb15c5e..00000000
--- a/digikam/imageplugins/emboss/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_emboss_la_SOURCES = imageplugin_emboss.cpp \
-	                                   embosstool.cpp emboss.cpp 
-
-digikamimageplugin_emboss_la_LIBADD = $(LIB_TDEPARTS) \
-	                                  $(top_builddir)/digikam/digikam/libdigikam.la 
-
-digikamimageplugin_emboss_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_emboss.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_emboss.la
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_emboss_ui.rc        
-
diff --git a/digikam/imageplugins/filmgrain/Makefile.am b/digikam/imageplugins/filmgrain/Makefile.am
deleted file mode 100644
index 1b644548..00000000
--- a/digikam/imageplugins/filmgrain/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_filmgrain_la_SOURCES = imageplugin_filmgrain.cpp \
-	                                      filmgraintool.cpp filmgrain.cpp 
-
-digikamimageplugin_filmgrain_la_LIBADD = $(LIB_TDEPARTS) \
-	                                     $(top_builddir)/digikam/digikam/libdigikam.la 
-
-digikamimageplugin_filmgrain_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_filmgrain.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_filmgrain.la
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_filmgrain_ui.rc        
-
diff --git a/digikam/imageplugins/freerotation/Makefile.am b/digikam/imageplugins/freerotation/Makefile.am
deleted file mode 100644
index 5f6fe564..00000000
--- a/digikam/imageplugins/freerotation/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes)
-
-digikamimageplugin_freerotation_la_SOURCES = imageplugin_freerotation.cpp \
-	                                         freerotationtool.cpp freerotation.cpp 
-
-digikamimageplugin_freerotation_la_LIBADD = $(LIB_TDEPARTS) \
-	                                        $(top_builddir)/digikam/digikam/libdigikam.la 
-
-digikamimageplugin_freerotation_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_freerotation.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_freerotation.la
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_freerotation_ui.rc
-
diff --git a/digikam/imageplugins/hotpixels/Makefile.am b/digikam/imageplugins/hotpixels/Makefile.am
deleted file mode 100644
index 5df75bb8..00000000
--- a/digikam/imageplugins/hotpixels/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/threadimageio \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-        
-digikamimageplugin_hotpixels_la_SOURCES = blackframeparser.cpp weights.cpp \
-	                                      hotpixelfixer.cpp imageplugin_hotpixels.cpp \
-					      blackframelistview.cpp hotpixelstool.cpp 
-
-digikamimageplugin_hotpixels_la_LIBADD = $(LIB_TDEPARTS) \
-	                                     $(top_builddir)/digikam/digikam/libdigikam.la 
-
-digikamimageplugin_hotpixels_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_hotpixels.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_hotpixels.la 
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_hotpixels_ui.rc
-       
diff --git a/digikam/imageplugins/infrared/Makefile.am b/digikam/imageplugins/infrared/Makefile.am
deleted file mode 100644
index d4641e6d..00000000
--- a/digikam/imageplugins/infrared/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_infrared_la_SOURCES = imageplugin_infrared.cpp \
-	                                     infraredtool.cpp infrared.cpp 
-
-digikamimageplugin_infrared_la_LIBADD = $(LIB_TDEPARTS) \
-	                                    $(top_builddir)/digikam/digikam/libdigikam.la
-
-digikamimageplugin_infrared_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_infrared.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_infrared.la
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_infrared_ui.rc        
-
diff --git a/digikam/imageplugins/inpainting/Makefile.am b/digikam/imageplugins/inpainting/Makefile.am
deleted file mode 100644
index 61a4db32..00000000
--- a/digikam/imageplugins/inpainting/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       -I$(top_srcdir)/digikam/libs/greycstoration \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_inpainting_la_SOURCES = imageplugin_inpainting.cpp \
-	                                       inpaintingtool.cpp 
-
-digikamimageplugin_inpainting_la_LIBADD = $(LIB_TDEPARTS) \
-	                                      $(top_builddir)/digikam/digikam/libdigikam.la  
-
-digikamimageplugin_inpainting_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -no-undefined -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_inpainting.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_inpainting.la
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_inpainting_ui.rc
diff --git a/digikam/imageplugins/inserttext/Makefile.am b/digikam/imageplugins/inserttext/Makefile.am
deleted file mode 100644
index dd3cd41a..00000000
--- a/digikam/imageplugins/inserttext/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes)   
-
-digikamimageplugin_inserttext_la_SOURCES = imageplugin_inserttext.cpp inserttextwidget.cpp \
-	                                       inserttexttool.cpp fontchooserwidget.cpp 
-
-digikamimageplugin_inserttext_la_LIBADD = $(LIB_TDEPARTS) \
-	                                      $(top_builddir)/digikam/digikam/libdigikam.la 
-
-digikamimageplugin_inserttext_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_inserttext.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_inserttext.la 
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_inserttext_ui.rc
-
diff --git a/digikam/imageplugins/lensdistortion/Makefile.am b/digikam/imageplugins/lensdistortion/Makefile.am
deleted file mode 100644
index 37f5485a..00000000
--- a/digikam/imageplugins/lensdistortion/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_lensdistortion_la_SOURCES = imageplugin_lensdistortion.cpp \
-	                                           lensdistortiontool.cpp \
-	                                           lensdistortion.cpp pixelaccess.cpp 
-
-digikamimageplugin_lensdistortion_la_LIBADD = $(LIB_TDEPARTS) \
-	                                          $(top_builddir)/digikam/digikam/libdigikam.la 
-
-digikamimageplugin_lensdistortion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_lensdistortion.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_lensdistortion.la 
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_lensdistortion_ui.rc
diff --git a/digikam/imageplugins/noisereduction/Makefile.am b/digikam/imageplugins/noisereduction/Makefile.am
deleted file mode 100644
index bea97b6d..00000000
--- a/digikam/imageplugins/noisereduction/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_noisereduction_la_SOURCES = imageplugin_noisereduction.cpp \
-	                                           noisereductiontool.cpp noisereduction.cpp
-
-digikamimageplugin_noisereduction_la_LIBADD = $(LIB_TDEPARTS) \
-	                                          $(top_builddir)/digikam/digikam/libdigikam.la 
-
-digikamimageplugin_noisereduction_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_noisereduction.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_noisereduction.la
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_noisereduction_ui.rc
-       
diff --git a/digikam/imageplugins/oilpaint/Makefile.am b/digikam/imageplugins/oilpaint/Makefile.am
deleted file mode 100644
index e8bf8e3a..00000000
--- a/digikam/imageplugins/oilpaint/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_oilpaint_la_SOURCES = imageplugin_oilpaint.cpp \
-	                                     oilpainttool.cpp oilpaint.cpp 
-
-digikamimageplugin_oilpaint_la_LIBADD = $(LIB_TDEPARTS) \
-	                                    $(top_builddir)/digikam/digikam/libdigikam.la 
-
-digikamimageplugin_oilpaint_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_oilpaint.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_oilpaint.la 
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_oilpaint_ui.rc        
-       
diff --git a/digikam/imageplugins/perspective/Makefile.am b/digikam/imageplugins/perspective/Makefile.am
deleted file mode 100644
index ead24ff1..00000000
--- a/digikam/imageplugins/perspective/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes)  
-
-digikamimageplugin_perspective_la_SOURCES = imageplugin_perspective.cpp \
-	                                        perspectivetool.cpp \
-					        perspectivewidget.cpp triangle.cpp matrix.cpp
-
-digikamimageplugin_perspective_la_LIBADD = $(LIB_TDEPARTS) \
-	                                       $(top_builddir)/digikam/digikam/libdigikam.la 
-	
-digikamimageplugin_perspective_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_perspective.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_perspective.la
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_perspective_ui.rc
-
diff --git a/digikam/imageplugins/raindrop/Makefile.am b/digikam/imageplugins/raindrop/Makefile.am
deleted file mode 100644
index 61c7e5e6..00000000
--- a/digikam/imageplugins/raindrop/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_raindrop_la_SOURCES = imageplugin_raindrop.cpp \
-	                                     raindroptool.cpp raindrop.cpp 
-
-digikamimageplugin_raindrop_la_LIBADD = $(LIB_TDEPARTS) \
-	                                    $(top_builddir)/digikam/digikam/libdigikam.la
-
-digikamimageplugin_raindrop_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_raindrop.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_raindrop.la 
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_raindrop_ui.rc     
-       
diff --git a/digikam/imageplugins/restoration/Makefile.am b/digikam/imageplugins/restoration/Makefile.am
deleted file mode 100644
index 993f1d9f..00000000
--- a/digikam/imageplugins/restoration/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       -I$(top_srcdir)/digikam/libs/greycstoration \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_restoration_la_SOURCES = imageplugin_restoration.cpp \
-	                                        restorationtool.cpp 
-
-digikamimageplugin_restoration_la_LIBADD = $(LIB_TDEPARTS) \
-	                                       $(top_builddir)/digikam/digikam/libdigikam.la 
-
-digikamimageplugin_restoration_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -no-undefined -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_restoration.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_restoration.la
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_restoration_ui.rc
-
diff --git a/digikam/imageplugins/sheartool/Makefile.am b/digikam/imageplugins/sheartool/Makefile.am
deleted file mode 100644
index 12ae89be..00000000
--- a/digikam/imageplugins/sheartool/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes)  
-
-digikamimageplugin_sheartool_la_SOURCES = imageplugin_sheartool.cpp shear.cpp \
-	                                      sheartool.cpp 
-
-digikamimageplugin_sheartool_la_LIBADD = $(LIB_TDEPARTS) \
-	                                     $(top_builddir)/digikam/digikam/libdigikam.la 
-
-digikamimageplugin_sheartool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_sheartool.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_sheartool.la
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_sheartool_ui.rc
diff --git a/digikam/imageplugins/superimpose/Makefile.am b/digikam/imageplugins/superimpose/Makefile.am
deleted file mode 100644
index b7dcf06c..00000000
--- a/digikam/imageplugins/superimpose/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/libs/thumbbar \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_superimpose_la_SOURCES = superimposewidget.cpp superimpose.cpp dirselectwidget.cpp \
-	                                        imageplugin_superimpose.cpp superimposetool.cpp 
-	                                        
-
-digikamimageplugin_superimpose_la_LIBADD = $(LIB_TDEPARTS) \
-	                                       $(top_builddir)/digikam/digikam/libdigikam.la 
-
-digikamimageplugin_superimpose_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_superimpose.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_superimpose.la
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_superimpose_ui.rc
diff --git a/digikam/imageplugins/texture/Makefile.am b/digikam/imageplugins/texture/Makefile.am
deleted file mode 100644
index f510fc9b..00000000
--- a/digikam/imageplugins/texture/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-METASOURCES = AUTO
-SUBDIRS = patterns
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_texture_la_SOURCES = imageplugin_texture.cpp \
-	                                    texturetool.cpp texture.cpp 
-
-digikamimageplugin_texture_la_LIBADD = $(LIB_TDEPARTS) \
-	                                   $(top_builddir)/digikam/digikam/libdigikam.la  
-
-digikamimageplugin_texture_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_texture.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_texture.la
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_texture_ui.rc        
-
diff --git a/digikam/imageplugins/whitebalance/Makefile.am b/digikam/imageplugins/whitebalance/Makefile.am
deleted file mode 100644
index 69d5e819..00000000
--- a/digikam/imageplugins/whitebalance/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/whitebalance \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKDCRAW_CFLAGS) \
-	       $(all_includes) 
-
-digikamimageplugin_whitebalance_la_SOURCES = imageplugin_whitebalance.cpp \
-	                                         whitebalancetool.cpp 
-
-digikamimageplugin_whitebalance_la_LIBADD = $(LIB_TDEPARTS) \
-	                                        $(top_builddir)/digikam/digikam/libdigikam.la  
-
-digikamimageplugin_whitebalance_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
-
-kde_services_DATA = digikamimageplugin_whitebalance.desktop
-
-kde_module_LTLIBRARIES = digikamimageplugin_whitebalance.la
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimageplugin_whitebalance_ui.rc
diff --git a/digikam/libs/dimg/Makefile.am b/digikam/libs/dimg/Makefile.am
deleted file mode 100644
index bebb34bc..00000000
--- a/digikam/libs/dimg/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-SUBDIRS = loaders filters 
-METASOURCES = AUTO
-
-noinst_LTLIBRARIES = libdimg.la
-
-libdimg_la_SOURCES = dimg.cpp dimgscale.cpp dcolor.cpp dcolorcomposer.cpp ddebug.cpp 
-
-libdimg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-
-libdimg_la_LIBADD  = $(top_builddir)/digikam/libs/histogram/libhistogram.la \
-	             $(top_builddir)/digikam/libs/levels/liblevels.la \
-	             $(top_builddir)/digikam/libs/curves/libcurves.la \
-	             $(top_builddir)/digikam/libs/whitebalance/libwhitebalance.la \
-	             $(top_builddir)/digikam/libs/dimg/loaders/libdimgloaders.la \
-	             $(top_builddir)/digikam/libs/dimg/filters/libdimgfilters.la \
-	             $(top_builddir)/digikam/libs/dmetadata/libdmetadata.la \
-	             $(LIBKDCRAW_LIBS) $(LCMS_LIBS) 
-
-INCLUDES = $(all_includes) $(LIBKDCRAW_CFLAGS) \
-	   -I$(top_srcdir)/digikam/libs/dimg/loaders \
-	   -I$(top_srcdir)/digikam/libs/dimg/filters \
-	   -I$(top_srcdir)/digikam/libs/dmetadata \
-	   -I$(top_srcdir)/digikam/digikam
-
-digikaminclude_HEADERS = dimg.h dcolor.h dcolorpixelaccess.h dcolorcomposer.h \
-                         dcolorblend.h ddebug.h
-digikamincludedir = $(includedir)/digikam
diff --git a/digikam/libs/widgets/Makefile.am b/digikam/libs/widgets/Makefile.am
deleted file mode 100644
index 0eee7b4b..00000000
--- a/digikam/libs/widgets/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-SUBDIRS = metadata imageplugins common iccprofiles
-
-noinst_LTLIBRARIES = libwidgets.la
-
-libwidgets_la_SOURCES =
-
-libwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-
-libwidgets_la_LIBADD = $(top_builddir)/digikam/libs/widgets/metadata/libmetadatawidgets.la \
-	               $(top_builddir)/digikam/libs/widgets/iccprofiles/libiccprofileswidgets.la \
-	               $(top_builddir)/digikam/libs/widgets/imageplugins/libimagepluginswidgets.la \
-	               $(top_builddir)/digikam/libs/widgets/common/libcommonwidgets.la 
diff --git a/digikam/showfoto/Makefile.am b/digikam/showfoto/Makefile.am
deleted file mode 100644
index 18fd4bbe..00000000
--- a/digikam/showfoto/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-SUBDIRS = setup 
-
-METASOURCES = AUTO  
-
-bin_PROGRAMS = showfoto
-
-INCLUDES = -I$(top_srcdir)/digikam/showfoto/setup \
-	   -I$(top_srcdir)/digikam/utilities/setup \
-	   -I$(top_srcdir)/digikam/libs/thumbbar \
-	   -I$(top_srcdir)/digikam/libs/widgets/common \
-	   -I$(top_srcdir)/digikam/libs/imageproperties \
-	   -I$(top_srcdir)/digikam/libs/histogram \
-	   -I$(top_srcdir)/digikam/libs/dimg \
-	   -I$(top_srcdir)/digikam/libs/dmetadata \
-	   -I$(top_srcdir)/digikam/libs/threadimageio \
-	   -I$(top_srcdir)/digikam/libs/themeengine \
-	   -I$(top_srcdir)/digikam/libs/dialogs \
-	   -I$(top_srcdir)/digikam/digikam \
-	   -I$(top_srcdir)/digikam/utilities/slideshow \
-	   -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	   -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	   -I$(top_srcdir)/digikam/utilities/imageeditor/tools \
-	   $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes)
-
-showfoto_SOURCES = main.cpp showfoto.cpp 
-
-showfoto_LDADD   = $(top_builddir)/digikam/showfoto/setup/libsetup.la \
-	           $(top_builddir)/digikam/libs/imageproperties/libimagepropertiesshowfoto.la \
-	           $(top_builddir)/digikam/libs/thumbbar/libthumbbar.la \
-	           $(top_builddir)/digikam/utilities/imageeditor/editor/libshowfoto.la \
-	           $(top_builddir)/digikam/utilities/slideshow/libslideshow.la \
-	           $(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la \
-	           $(top_builddir)/digikam/libs/themeengine/libthemeengine.la \
-	           $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \
-	           $(LIB_TDEUTILS) $(LIB_TDEPARTS) $(LIBJPEG)  
-
-showfoto_LDFLAGS = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) $(KDE_RPATH) $(all_libraries)
-
-rcdir = $(kde_datadir)/showfoto
-rc_DATA = showfotoui.rc
-
-xdg_apps_DATA = showfoto.desktop
diff --git a/digikam/utilities/hotplug/configure.in.in b/digikam/utilities/hotplug/configure.in.in
deleted file mode 100644
index 94133f75..00000000
--- a/digikam/utilities/hotplug/configure.in.in
+++ /dev/null
@@ -1,7 +0,0 @@
-KDE_EXPAND_MAKEVAR(digikamhelper_dir, kde_datadir/digikam/utils)
-AC_SUBST(digikamhelper_dir)
-
-AC_OUTPUT(digikam/utilities/hotplug/digikam-download.desktop)
-AC_OUTPUT(digikam/utilities/hotplug/digikam-gphoto2-camera.desktop)
-AC_OUTPUT(digikam/utilities/hotplug/digikam-mount-and-download.desktop)
-
diff --git a/digikam/utilities/imageeditor/canvas/Makefile.am b/digikam/utilities/imageeditor/canvas/Makefile.am
deleted file mode 100644
index 6ebf238e..00000000
--- a/digikam/utilities/imageeditor/canvas/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-METASOURCES = AUTO
-
-noinst_LTLIBRARIES = libdimgcanvas.la
-
-libdimgcanvas_la_SOURCES = dimginterface.cpp colorcorrectiondlg.cpp \
-	                       canvas.cpp undocache.cpp \
-	                       undoaction.cpp undomanager.cpp \
-	                       imagepluginloader.cpp imageplugin.cpp
-
-libdimgcanvas_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TIFF) 
-
-INCLUDES = -I$(top_srcdir)/digikam/digikam \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/threadimageio \
-	       -I$(top_srcdir)/digikam/utilities/splashscreen \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/rawimport \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes) 
-
-digikaminclude_HEADERS = imageplugin.h 
-
-digikamincludedir = $(includedir)/digikam
diff --git a/digikam/utilities/imageeditor/editor/Makefile.am b/digikam/utilities/imageeditor/editor/Makefile.am
deleted file mode 100644
index d3d5bf78..00000000
--- a/digikam/utilities/imageeditor/editor/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-METASOURCES = AUTO
-
-noinst_LTLIBRARIES = libdimgeditor.la libshowfoto.la 
-
-libdimgeditor_la_SOURCES = editorwindow.cpp imageiface.cpp imagewindow.cpp editorstackview.cpp \
-	                   editortooliface.cpp editortool.cpp editortoolsettings.cpp
-
-libdimgeditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEPRINT) 
-
-libdimgeditor_la_LIBADD = $(top_builddir)/digikam/utilities/imageeditor/tools/libdimgeditortools.la \
-	                      $(top_builddir)/digikam/utilities/imageeditor/rawimport/librawimport.la 
-
-libshowfoto_la_SOURCES = editorwindow.cpp imageiface.cpp editorstackview.cpp \
-	                 editortooliface.cpp editortool.cpp editortoolsettings.cpp
-
-libshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEPRINT) 
-
-libshowfoto_la_LIBADD = $(top_builddir)/digikam/libs/dimg/libdimg.la \
-	                $(top_builddir)/digikam/libs/dialogs/libdialogshowfoto.la \
-	                $(top_builddir)/digikam/libs/widgets/libwidgets.la \
-	                $(top_builddir)/digikam/libs/greycstoration/libgreycstoration.la \
-	                $(top_builddir)/digikam/utilities/imageeditor/canvas/libdimgcanvas.la \
-	                $(top_builddir)/digikam/utilities/imageeditor/tools/libdimgeditortools.la \
-	                $(top_builddir)/digikam/utilities/imageeditor/rawimport/librawimport.la 
-
-INCLUDES = -I$(top_srcdir)/digikam/digikam \
-	   -I$(top_srcdir)/digikam/libs/widgets/common \
-	   -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	   -I$(top_srcdir)/digikam/libs/dialogs \
-	   -I$(top_srcdir)/digikam/libs/dimg \
-	   -I$(top_srcdir)/digikam/libs/themeengine \
-	   -I$(top_srcdir)/digikam/libs/dmetadata \
-	   -I$(top_srcdir)/digikam/libs/dimg/filters \
-	   -I$(top_srcdir)/digikam/libs/imageproperties \
-	   -I$(top_srcdir)/digikam/libs/threadimageio \
-	   -I$(top_srcdir)/digikam/utilities/setup \
-	   -I$(top_srcdir)/digikam/utilities/slideshow \
-	   -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	   -I$(top_srcdir)/digikam/utilities/imageeditor/tools \
-	   -I$(top_builddir)/digikam/libs/dialogs \
-	   $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes) 
-
-digikaminclude_HEADERS = imageiface.h 
-
-digikamincludedir = $(includedir)/digikam
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = digikamimagewindowui.rc
-
-kde_servicetypes_DATA = digikamimageplugin.desktop
-
diff --git a/digikam/utilities/imageeditor/rawimport/Makefile.am b/digikam/utilities/imageeditor/rawimport/Makefile.am
deleted file mode 100644
index c80bd079..00000000
--- a/digikam/utilities/imageeditor/rawimport/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-METASOURCES = AUTO
-
-noinst_LTLIBRARIES = librawimport.la 
-
-librawimport_la_SOURCES = rawpreview.cpp rawsettingsbox.cpp rawimport.cpp \
-	                  rawpostprocessing.cpp 
-
-librawimport_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEPRINT) 
-
-INCLUDES= -I$(top_srcdir)/digikam/digikam \
-	  -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	  -I$(top_srcdir)/digikam/libs/histogram \
-	  -I$(top_srcdir)/digikam/libs/curves \
-	  -I$(top_srcdir)/digikam/libs/levels \
-	  -I$(top_srcdir)/digikam/libs/whitebalance \
-	  -I$(top_srcdir)/digikam/libs/dmetadata \
-	  -I$(top_srcdir)/digikam/libs/curves \
-	  -I$(top_srcdir)/digikam/libs/dimg \
-	  -I$(top_srcdir)/digikam/libs/dimg/filters \
-	  -I$(top_srcdir)/digikam/libs/dialogs \
-	  -I$(top_srcdir)/digikam/libs/widgets/common \
-	  -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	  -I$(top_srcdir)/digikam/libs/threadimageio \
-	  -I$(top_srcdir)/digikam/libs/themeengine \
-	  $(LIBKDCRAW_CFLAGS) \
-	  $(all_includes) 
-
diff --git a/digikam/utilities/imageeditor/tools/Makefile.am b/digikam/utilities/imageeditor/tools/Makefile.am
deleted file mode 100644
index 66196c41..00000000
--- a/digikam/utilities/imageeditor/tools/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-METASOURCES = AUTO
-
-noinst_LTLIBRARIES = libdimgeditortools.la 
-
-libdimgeditortools_la_SOURCES = imageresize.cpp imageprint.cpp
-
-libdimgeditortools_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEPRINT) 
-
-INCLUDES= -I$(top_srcdir)/digikam/digikam \
-	  -I$(top_srcdir)/digikam/libs/dimg \
-	  -I$(top_srcdir)/digikam/libs/dimg/filters \
-	  -I$(top_srcdir)/digikam/libs/dmetadata \
-	  -I$(top_srcdir)/digikam/libs/widgets/common \
-	  -I$(top_srcdir)/digikam/libs/greycstoration \
-	  -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	  -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	  $(LIBKDCRAW_CFLAGS) \
-	  $(all_includes) 
-
diff --git a/digikam/utilities/lighttable/Makefile.am b/digikam/utilities/lighttable/Makefile.am
deleted file mode 100644
index ada5ddf0..00000000
--- a/digikam/utilities/lighttable/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-METASOURCES = AUTO
-
-INCLUDES = -I$(top_srcdir)/digikam/digikam \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/dialogs \
-	       -I$(top_srcdir)/digikam/libs/thumbbar \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/themeengine \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/libs/imageproperties \
-	       -I$(top_srcdir)/digikam/libs/threadimageio \
-	       -I$(top_srcdir)/digikam/utilities/setup \
-	       -I$(top_srcdir)/digikam/utilities/slideshow \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_builddir)/digikam/libs/dialogs \
-	       $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes) 
-
-noinst_LTLIBRARIES = liblighttable.la 
-
-liblighttable_la_SOURCES = lighttablebar.cpp lighttablewindow.cpp lighttablepreview.cpp \
-                           lighttableview.cpp 
-
-liblighttable_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-
-rcdir = $(kde_datadir)/digikam
-rc_DATA = lighttablewindowui.rc
diff --git a/digikam/CMakeL10n.txt b/src/CMakeL10n.txt
index b326219c..b326219c 100644
--- a/digikam/CMakeL10n.txt
+++ b/src/CMakeL10n.txt
diff --git a/digikam/COPYING-DOCS b/src/COPYING-DOCS
index 4a0fe1c8..4a0fe1c8 100644
--- a/digikam/COPYING-DOCS
+++ b/src/COPYING-DOCS
diff --git a/digikam/DBSCHEMA.ODS b/src/DBSCHEMA.ODS
index 4e016a4b..4e016a4b 100644
--- a/digikam/DBSCHEMA.ODS
+++ b/src/DBSCHEMA.ODS
diff --git a/digikam/DESIGN b/src/DESIGN
index 9b16c519..9b16c519 100644
--- a/digikam/DESIGN
+++ b/src/DESIGN
diff --git a/digikam/Makefile.am b/src/Makefile.am
index 4741808b..4741808b 100644
--- a/digikam/Makefile.am
+++ b/src/Makefile.am
diff --git a/digikam/NEWS.0.9.0 b/src/NEWS.0.9.0
index ad8e1cb1..ad8e1cb1 100644
--- a/digikam/NEWS.0.9.0
+++ b/src/NEWS.0.9.0
diff --git a/digikam/NEWS.0.9.1 b/src/NEWS.0.9.1
index 957162db..957162db 100644
--- a/digikam/NEWS.0.9.1
+++ b/src/NEWS.0.9.1
diff --git a/digikam/NEWS.0.9.2 b/src/NEWS.0.9.2
index 77fbbabc..77fbbabc 100644
--- a/digikam/NEWS.0.9.2
+++ b/src/NEWS.0.9.2
diff --git a/digikam/NEWS.0.9.3 b/src/NEWS.0.9.3
index 6652db29..6652db29 100644
--- a/digikam/NEWS.0.9.3
+++ b/src/NEWS.0.9.3
diff --git a/digikam/NEWS.0.9.4 b/src/NEWS.0.9.4
index a7ea38bf..a7ea38bf 100644
--- a/digikam/NEWS.0.9.4
+++ b/src/NEWS.0.9.4
diff --git a/digikam/NEWS.0.9.5 b/src/NEWS.0.9.5
index 290a77f4..290a77f4 100644
--- a/digikam/NEWS.0.9.5
+++ b/src/NEWS.0.9.5
diff --git a/digikam/configure.in.bot b/src/configure.in.bot
index 8a34d97b..8a34d97b 100644
--- a/digikam/configure.in.bot
+++ b/src/configure.in.bot
diff --git a/digikam/configure.in.in b/src/configure.in.in
index 7095137f..7095137f 100644
--- a/digikam/configure.in.in
+++ b/src/configure.in.in
diff --git a/digikam/digikam/Makefile.am b/src/digikam/Makefile.am
index 6705dcb5..6f0ac90f 100644
--- a/digikam/digikam/Makefile.am
+++ b/src/digikam/Makefile.am
@@ -1,31 +1,31 @@
 METASOURCES = AUTO
 
 if with_included_sqlite3
-    LIB_SQLITE3_LOCAL = $(top_builddir)/digikam/libs/sqlite3/libsqlite3.la
-    SQLITE3_INCLUDES = -I$(top_srcdir)/digikam/libs/sqlite3
+    LIB_SQLITE3_LOCAL = $(top_builddir)/src/libs/sqlite3/libsqlite3.la
+    SQLITE3_INCLUDES = -I$(top_srcdir)/src/libs/sqlite3
 endif
 
-INCLUDES = -I$(top_srcdir)/digikam/libs/sqlite2 \
-	   -I$(top_srcdir)/digikam/libs/histogram \
-	   -I$(top_srcdir)/digikam/libs/levels \
-	   -I$(top_srcdir)/digikam/libs/curves \
-	   -I$(top_srcdir)/digikam/libs/themeengine \
-	   -I$(top_srcdir)/digikam/libs/widgets/common \
-	   -I$(top_srcdir)/digikam/libs/thumbbar \
-	   -I$(top_srcdir)/digikam/libs/jpegutils \
-	   -I$(top_srcdir)/digikam/libs/dimg \
-	   -I$(top_srcdir)/digikam/libs/dmetadata \
-	   -I$(top_srcdir)/digikam/libs/imageproperties \
-	   -I$(top_srcdir)/digikam/libs/threadimageio \
-	   -I$(top_srcdir)/digikam/libs/dialogs \
-	   -I$(top_builddir)/digikam/libs/dialogs \
-	   -I$(top_srcdir)/digikam/utilities/cameragui \
-	   -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	   -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	   -I$(top_srcdir)/digikam/utilities/setup \
-	   -I$(top_srcdir)/digikam/utilities/slideshow \
-	   -I$(top_srcdir)/digikam/utilities/batch \
-	   -I$(top_srcdir)/digikam/utilities/lighttable \
+INCLUDES = -I$(top_srcdir)/src/libs/sqlite2 \
+	   -I$(top_srcdir)/src/libs/histogram \
+	   -I$(top_srcdir)/src/libs/levels \
+	   -I$(top_srcdir)/src/libs/curves \
+	   -I$(top_srcdir)/src/libs/themeengine \
+	   -I$(top_srcdir)/src/libs/widgets/common \
+	   -I$(top_srcdir)/src/libs/thumbbar \
+	   -I$(top_srcdir)/src/libs/jpegutils \
+	   -I$(top_srcdir)/src/libs/dimg \
+	   -I$(top_srcdir)/src/libs/dmetadata \
+	   -I$(top_srcdir)/src/libs/imageproperties \
+	   -I$(top_srcdir)/src/libs/threadimageio \
+	   -I$(top_srcdir)/src/libs/dialogs \
+	   -I$(top_builddir)/src/libs/dialogs \
+	   -I$(top_srcdir)/src/utilities/cameragui \
+	   -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	   -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	   -I$(top_srcdir)/src/utilities/setup \
+	   -I$(top_srcdir)/src/utilities/slideshow \
+	   -I$(top_srcdir)/src/utilities/batch \
+	   -I$(top_srcdir)/src/utilities/lighttable \
 	   $(SQLITE3_INCLUDES) \
 	   $(LIBKEXIV2_CFLAGS) \
 	   $(LIBKIPI_CFLAGS) \
@@ -119,23 +119,23 @@ libdigikam_la_LIBADD = $(LIB_SQLITE3) \
 	               $(LIBKIPI_LIBS) \
 	               $(LIBKEXIV2_LIBS) \
 	               $(LIB_TDEUTILS) \
-	               $(top_builddir)/digikam/libs/sqlite2/libsqlite2.la \
-	               $(top_builddir)/digikam/libs/thumbbar/libthumbbar.la \
-	               $(top_builddir)/digikam/libs/themeengine/libthemeengine.la \
-	               $(top_builddir)/digikam/libs/widgets/libwidgets.la \
-	               $(top_builddir)/digikam/libs/dialogs/libdialog.la \
-	               $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \
-	               $(top_builddir)/digikam/libs/dimg/libdimg.la \
-	               $(top_builddir)/digikam/libs/imageproperties/libimagepropertiesdigikam.la \
-	               $(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la \
-	               $(top_builddir)/digikam/libs/greycstoration/libgreycstoration.la \
-	               $(top_builddir)/digikam/utilities/batch/libbatch.la \
-	               $(top_builddir)/digikam/utilities/slideshow/libslideshow.la \
-	               $(top_builddir)/digikam/utilities/cameragui/libcameragui.la \
-	               $(top_builddir)/digikam/utilities/imageeditor/canvas/libdimgcanvas.la \
-	               $(top_builddir)/digikam/utilities/imageeditor/editor/libdimgeditor.la \
-	               $(top_builddir)/digikam/utilities/setup/libsetup.la \
-	               $(top_builddir)/digikam/utilities/lighttable/liblighttable.la
+	               $(top_builddir)/src/libs/sqlite2/libsqlite2.la \
+	               $(top_builddir)/src/libs/thumbbar/libthumbbar.la \
+	               $(top_builddir)/src/libs/themeengine/libthemeengine.la \
+	               $(top_builddir)/src/libs/widgets/libwidgets.la \
+	               $(top_builddir)/src/libs/dialogs/libdialog.la \
+	               $(top_builddir)/src/libs/jpegutils/libjpegutils.la \
+	               $(top_builddir)/src/libs/dimg/libdimg.la \
+	               $(top_builddir)/src/libs/imageproperties/libimagepropertiesdigikam.la \
+	               $(top_builddir)/src/libs/threadimageio/libthreadimageio.la \
+	               $(top_builddir)/src/libs/greycstoration/libgreycstoration.la \
+	               $(top_builddir)/src/utilities/batch/libbatch.la \
+	               $(top_builddir)/src/utilities/slideshow/libslideshow.la \
+	               $(top_builddir)/src/utilities/cameragui/libcameragui.la \
+	               $(top_builddir)/src/utilities/imageeditor/canvas/libdimgcanvas.la \
+	               $(top_builddir)/src/utilities/imageeditor/editor/libdimgeditor.la \
+	               $(top_builddir)/src/utilities/setup/libsetup.la \
+	               $(top_builddir)/src/utilities/lighttable/liblighttable.la
 
 libdigikam_la_LDFLAGS = $(LIBKEXIV2_LIBS) $(all_libraries) $(KDE_RPATH) -no-undefined
 
diff --git a/digikam/digikam/album.cpp b/src/digikam/album.cpp
index a6e3a295..a6e3a295 100644
--- a/digikam/digikam/album.cpp
+++ b/src/digikam/album.cpp
diff --git a/digikam/digikam/album.h b/src/digikam/album.h
index ed088185..ed088185 100644
--- a/digikam/digikam/album.h
+++ b/src/digikam/album.h
diff --git a/digikam/digikam/albumdb.cpp b/src/digikam/albumdb.cpp
index 9b08d5c4..9b08d5c4 100644
--- a/digikam/digikam/albumdb.cpp
+++ b/src/digikam/albumdb.cpp
diff --git a/digikam/digikam/albumdb.h b/src/digikam/albumdb.h
index 9115684a..9115684a 100644
--- a/digikam/digikam/albumdb.h
+++ b/src/digikam/albumdb.h
diff --git a/digikam/digikam/albumdb_sqlite2.cpp b/src/digikam/albumdb_sqlite2.cpp
index 35bb9935..35bb9935 100644
--- a/digikam/digikam/albumdb_sqlite2.cpp
+++ b/src/digikam/albumdb_sqlite2.cpp
diff --git a/digikam/digikam/albumdb_sqlite2.h b/src/digikam/albumdb_sqlite2.h
index 339289ba..339289ba 100644
--- a/digikam/digikam/albumdb_sqlite2.h
+++ b/src/digikam/albumdb_sqlite2.h
diff --git a/digikam/digikam/albumfiletip.cpp b/src/digikam/albumfiletip.cpp
index 1950eab6..1950eab6 100644
--- a/digikam/digikam/albumfiletip.cpp
+++ b/src/digikam/albumfiletip.cpp
diff --git a/digikam/digikam/albumfiletip.h b/src/digikam/albumfiletip.h
index 6ec70aa9..6ec70aa9 100644
--- a/digikam/digikam/albumfiletip.h
+++ b/src/digikam/albumfiletip.h
diff --git a/digikam/digikam/albumfolderview.cpp b/src/digikam/albumfolderview.cpp
index 6e9048ab..6e9048ab 100644
--- a/digikam/digikam/albumfolderview.cpp
+++ b/src/digikam/albumfolderview.cpp
diff --git a/digikam/digikam/albumfolderview.h b/src/digikam/albumfolderview.h
index b02e57a9..b02e57a9 100644
--- a/digikam/digikam/albumfolderview.h
+++ b/src/digikam/albumfolderview.h
diff --git a/digikam/digikam/albumhistory.cpp b/src/digikam/albumhistory.cpp
index 174c879e..174c879e 100644
--- a/digikam/digikam/albumhistory.cpp
+++ b/src/digikam/albumhistory.cpp
diff --git a/digikam/digikam/albumhistory.h b/src/digikam/albumhistory.h
index 585dad84..585dad84 100644
--- a/digikam/digikam/albumhistory.h
+++ b/src/digikam/albumhistory.h
diff --git a/digikam/digikam/albumicongroupitem.cpp b/src/digikam/albumicongroupitem.cpp
index 07562f8b..07562f8b 100644
--- a/digikam/digikam/albumicongroupitem.cpp
+++ b/src/digikam/albumicongroupitem.cpp
diff --git a/digikam/digikam/albumicongroupitem.h b/src/digikam/albumicongroupitem.h
index ce2f5c7e..ce2f5c7e 100644
--- a/digikam/digikam/albumicongroupitem.h
+++ b/src/digikam/albumicongroupitem.h
diff --git a/digikam/digikam/albumiconitem.cpp b/src/digikam/albumiconitem.cpp
index 8c97f084..8c97f084 100644
--- a/digikam/digikam/albumiconitem.cpp
+++ b/src/digikam/albumiconitem.cpp
diff --git a/digikam/digikam/albumiconitem.h b/src/digikam/albumiconitem.h
index 1f743b60..1f743b60 100644
--- a/digikam/digikam/albumiconitem.h
+++ b/src/digikam/albumiconitem.h
diff --git a/digikam/digikam/albumiconview.cpp b/src/digikam/albumiconview.cpp
index 88d6a3d1..88d6a3d1 100644
--- a/digikam/digikam/albumiconview.cpp
+++ b/src/digikam/albumiconview.cpp
diff --git a/digikam/digikam/albumiconview.h b/src/digikam/albumiconview.h
index 0239a390..0239a390 100644
--- a/digikam/digikam/albumiconview.h
+++ b/src/digikam/albumiconview.h
diff --git a/digikam/digikam/albumiconviewfilter.cpp b/src/digikam/albumiconviewfilter.cpp
index 85a7c5fd..85a7c5fd 100644
--- a/digikam/digikam/albumiconviewfilter.cpp
+++ b/src/digikam/albumiconviewfilter.cpp
diff --git a/digikam/digikam/albumiconviewfilter.h b/src/digikam/albumiconviewfilter.h
index 8fdbaa64..8fdbaa64 100644
--- a/digikam/digikam/albumiconviewfilter.h
+++ b/src/digikam/albumiconviewfilter.h
diff --git a/digikam/digikam/albuminfo.h b/src/digikam/albuminfo.h
index 17e191e3..17e191e3 100644
--- a/digikam/digikam/albuminfo.h
+++ b/src/digikam/albuminfo.h
diff --git a/digikam/digikam/albumitemhandler.cpp b/src/digikam/albumitemhandler.cpp
index 60dc8c1b..60dc8c1b 100644
--- a/digikam/digikam/albumitemhandler.cpp
+++ b/src/digikam/albumitemhandler.cpp
diff --git a/digikam/digikam/albumitemhandler.h b/src/digikam/albumitemhandler.h
index e78042f5..e78042f5 100644
--- a/digikam/digikam/albumitemhandler.h
+++ b/src/digikam/albumitemhandler.h
diff --git a/digikam/digikam/albumlister.cpp b/src/digikam/albumlister.cpp
index 63648773..63648773 100644
--- a/digikam/digikam/albumlister.cpp
+++ b/src/digikam/albumlister.cpp
diff --git a/digikam/digikam/albumlister.h b/src/digikam/albumlister.h
index 7c14e4c1..7c14e4c1 100644
--- a/digikam/digikam/albumlister.h
+++ b/src/digikam/albumlister.h
diff --git a/digikam/digikam/albummanager.cpp b/src/digikam/albummanager.cpp
index 847ce99e..847ce99e 100644
--- a/digikam/digikam/albummanager.cpp
+++ b/src/digikam/albummanager.cpp
diff --git a/digikam/digikam/albummanager.h b/src/digikam/albummanager.h
index 3244f5a2..3244f5a2 100644
--- a/digikam/digikam/albummanager.h
+++ b/src/digikam/albummanager.h
diff --git a/digikam/digikam/albumpropsedit.cpp b/src/digikam/albumpropsedit.cpp
index 703d8c4a..703d8c4a 100644
--- a/digikam/digikam/albumpropsedit.cpp
+++ b/src/digikam/albumpropsedit.cpp
diff --git a/digikam/digikam/albumpropsedit.h b/src/digikam/albumpropsedit.h
index cd8f7564..cd8f7564 100644
--- a/digikam/digikam/albumpropsedit.h
+++ b/src/digikam/albumpropsedit.h
diff --git a/digikam/digikam/albumsettings.cpp b/src/digikam/albumsettings.cpp
index 6b7d4315..6b7d4315 100644
--- a/digikam/digikam/albumsettings.cpp
+++ b/src/digikam/albumsettings.cpp
diff --git a/digikam/digikam/albumsettings.h b/src/digikam/albumsettings.h
index c3e3dcb7..c3e3dcb7 100644
--- a/digikam/digikam/albumsettings.h
+++ b/src/digikam/albumsettings.h
diff --git a/digikam/digikam/albumthumbnailloader.cpp b/src/digikam/albumthumbnailloader.cpp
index 1fe2065b..1fe2065b 100644
--- a/digikam/digikam/albumthumbnailloader.cpp
+++ b/src/digikam/albumthumbnailloader.cpp
diff --git a/digikam/digikam/albumthumbnailloader.h b/src/digikam/albumthumbnailloader.h
index 9d08c5af..9d08c5af 100644
--- a/digikam/digikam/albumthumbnailloader.h
+++ b/src/digikam/albumthumbnailloader.h
diff --git a/digikam/digikam/albumwidgetstack.cpp b/src/digikam/albumwidgetstack.cpp
index 79b19599..79b19599 100644
--- a/digikam/digikam/albumwidgetstack.cpp
+++ b/src/digikam/albumwidgetstack.cpp
diff --git a/digikam/digikam/albumwidgetstack.h b/src/digikam/albumwidgetstack.h
index c8a6f6ac..c8a6f6ac 100644
--- a/digikam/digikam/albumwidgetstack.h
+++ b/src/digikam/albumwidgetstack.h
diff --git a/digikam/digikam/cameralist.cpp b/src/digikam/cameralist.cpp
index 6a380e0d..6a380e0d 100644
--- a/digikam/digikam/cameralist.cpp
+++ b/src/digikam/cameralist.cpp
diff --git a/digikam/digikam/cameralist.h b/src/digikam/cameralist.h
index 65ecbcea..65ecbcea 100644
--- a/digikam/digikam/cameralist.h
+++ b/src/digikam/cameralist.h
diff --git a/digikam/digikam/cameratype.cpp b/src/digikam/cameratype.cpp
index 28d8383a..28d8383a 100644
--- a/digikam/digikam/cameratype.cpp
+++ b/src/digikam/cameratype.cpp
diff --git a/digikam/digikam/cameratype.h b/src/digikam/cameratype.h
index 71ae0766..71ae0766 100644
--- a/digikam/digikam/cameratype.h
+++ b/src/digikam/cameratype.h
diff --git a/digikam/digikam/constants.h b/src/digikam/constants.h
index 63cbcc80..63cbcc80 100644
--- a/digikam/digikam/constants.h
+++ b/src/digikam/constants.h
diff --git a/digikam/digikam/daboutdata.h b/src/digikam/daboutdata.h
index 5ff23f42..5ff23f42 100644
--- a/digikam/digikam/daboutdata.h
+++ b/src/digikam/daboutdata.h
diff --git a/digikam/digikam/datefolderview.cpp b/src/digikam/datefolderview.cpp
index 8e36742e..8e36742e 100644
--- a/digikam/digikam/datefolderview.cpp
+++ b/src/digikam/datefolderview.cpp
diff --git a/digikam/digikam/datefolderview.h b/src/digikam/datefolderview.h
index 2e467fe3..2e467fe3 100644
--- a/digikam/digikam/datefolderview.h
+++ b/src/digikam/datefolderview.h
diff --git a/digikam/digikam/dcopiface.cpp b/src/digikam/dcopiface.cpp
index 49f051d9..49f051d9 100644
--- a/digikam/digikam/dcopiface.cpp
+++ b/src/digikam/dcopiface.cpp
diff --git a/digikam/digikam/dcopiface.h b/src/digikam/dcopiface.h
index 9367e6b1..9367e6b1 100644
--- a/digikam/digikam/dcopiface.h
+++ b/src/digikam/dcopiface.h
diff --git a/digikam/digikam/digikam.desktop b/src/digikam/digikam.desktop
index ba05db76..ba05db76 100644
--- a/digikam/digikam/digikam.desktop
+++ b/src/digikam/digikam.desktop
diff --git a/digikam/digikam/digikam_export.h b/src/digikam/digikam_export.h
index 0d221918..0d221918 100644
--- a/digikam/digikam/digikam_export.h
+++ b/src/digikam/digikam_export.h
diff --git a/digikam/digikam/digikamapp.cpp b/src/digikam/digikamapp.cpp
index 5b12575a..5b12575a 100644
--- a/digikam/digikam/digikamapp.cpp
+++ b/src/digikam/digikamapp.cpp
diff --git a/digikam/digikam/digikamapp.h b/src/digikam/digikamapp.h
index 899603d6..899603d6 100644
--- a/digikam/digikam/digikamapp.h
+++ b/src/digikam/digikamapp.h
diff --git a/digikam/digikam/digikamappprivate.h b/src/digikam/digikamappprivate.h
index cf5e43a9..cf5e43a9 100644
--- a/digikam/digikam/digikamappprivate.h
+++ b/src/digikam/digikamappprivate.h
diff --git a/digikam/digikam/digikamfirstrun.cpp b/src/digikam/digikamfirstrun.cpp
index e7a95c01..e7a95c01 100644
--- a/digikam/digikam/digikamfirstrun.cpp
+++ b/src/digikam/digikamfirstrun.cpp
diff --git a/digikam/digikam/digikamfirstrun.h b/src/digikam/digikamfirstrun.h
index e8921f5b..e8921f5b 100644
--- a/digikam/digikam/digikamfirstrun.h
+++ b/src/digikam/digikamfirstrun.h
diff --git a/digikam/digikam/digikamui.rc b/src/digikam/digikamui.rc
index e4763abe..e4763abe 100644
--- a/digikam/digikam/digikamui.rc
+++ b/src/digikam/digikamui.rc
diff --git a/digikam/digikam/digikamview.cpp b/src/digikam/digikamview.cpp
index a8fb42fb..a8fb42fb 100644
--- a/digikam/digikam/digikamview.cpp
+++ b/src/digikam/digikamview.cpp
diff --git a/digikam/digikam/digikamview.h b/src/digikam/digikamview.h
index cf929074..cf929074 100644
--- a/digikam/digikam/digikamview.h
+++ b/src/digikam/digikamview.h
diff --git a/digikam/digikam/dio.cpp b/src/digikam/dio.cpp
index f9639fcf..f9639fcf 100644
--- a/digikam/digikam/dio.cpp
+++ b/src/digikam/dio.cpp
diff --git a/digikam/digikam/dio.h b/src/digikam/dio.h
index a7c96d77..a7c96d77 100644
--- a/digikam/digikam/dio.h
+++ b/src/digikam/dio.h
diff --git a/digikam/digikam/dio_p.h b/src/digikam/dio_p.h
index 660cad04..660cad04 100644
--- a/digikam/digikam/dio_p.h
+++ b/src/digikam/dio_p.h
diff --git a/digikam/digikam/dragobjects.cpp b/src/digikam/dragobjects.cpp
index 14a3545f..14a3545f 100644
--- a/digikam/digikam/dragobjects.cpp
+++ b/src/digikam/dragobjects.cpp
diff --git a/digikam/digikam/dragobjects.h b/src/digikam/dragobjects.h
index 35a70f7a..35a70f7a 100644
--- a/digikam/digikam/dragobjects.h
+++ b/src/digikam/dragobjects.h
diff --git a/digikam/digikam/firstrun.cpp b/src/digikam/firstrun.cpp
index 43613034..43613034 100644
--- a/digikam/digikam/firstrun.cpp
+++ b/src/digikam/firstrun.cpp
diff --git a/digikam/digikam/firstrun.h b/src/digikam/firstrun.h
index e3803993..e3803993 100644
--- a/digikam/digikam/firstrun.h
+++ b/src/digikam/firstrun.h
diff --git a/digikam/digikam/folderitem.cpp b/src/digikam/folderitem.cpp
index 45b875f8..45b875f8 100644
--- a/digikam/digikam/folderitem.cpp
+++ b/src/digikam/folderitem.cpp
diff --git a/digikam/digikam/folderitem.h b/src/digikam/folderitem.h
index e99189a8..e99189a8 100644
--- a/digikam/digikam/folderitem.h
+++ b/src/digikam/folderitem.h
diff --git a/digikam/digikam/folderview.cpp b/src/digikam/folderview.cpp
index 0e2d515d..0e2d515d 100644
--- a/digikam/digikam/folderview.cpp
+++ b/src/digikam/folderview.cpp
diff --git a/digikam/digikam/folderview.h b/src/digikam/folderview.h
index e32737ce..e32737ce 100644
--- a/digikam/digikam/folderview.h
+++ b/src/digikam/folderview.h
diff --git a/digikam/digikam/icongroupitem.cpp b/src/digikam/icongroupitem.cpp
index e16588fe..e16588fe 100644
--- a/digikam/digikam/icongroupitem.cpp
+++ b/src/digikam/icongroupitem.cpp
diff --git a/digikam/digikam/icongroupitem.h b/src/digikam/icongroupitem.h
index 8a960a1f..8a960a1f 100644
--- a/digikam/digikam/icongroupitem.h
+++ b/src/digikam/icongroupitem.h
diff --git a/digikam/digikam/iconitem.cpp b/src/digikam/iconitem.cpp
index 798b96ae..798b96ae 100644
--- a/digikam/digikam/iconitem.cpp
+++ b/src/digikam/iconitem.cpp
diff --git a/digikam/digikam/iconitem.h b/src/digikam/iconitem.h
index aa67e209..aa67e209 100644
--- a/digikam/digikam/iconitem.h
+++ b/src/digikam/iconitem.h
diff --git a/digikam/digikam/iconview.cpp b/src/digikam/iconview.cpp
index 2dac3da0..2dac3da0 100644
--- a/digikam/digikam/iconview.cpp
+++ b/src/digikam/iconview.cpp
diff --git a/digikam/digikam/iconview.h b/src/digikam/iconview.h
index 59a4b921..59a4b921 100644
--- a/digikam/digikam/iconview.h
+++ b/src/digikam/iconview.h
diff --git a/digikam/digikam/imageattributeswatch.cpp b/src/digikam/imageattributeswatch.cpp
index a91e4dea..a91e4dea 100644
--- a/digikam/digikam/imageattributeswatch.cpp
+++ b/src/digikam/imageattributeswatch.cpp
diff --git a/digikam/digikam/imageattributeswatch.h b/src/digikam/imageattributeswatch.h
index 7d377609..7d377609 100644
--- a/digikam/digikam/imageattributeswatch.h
+++ b/src/digikam/imageattributeswatch.h
diff --git a/digikam/digikam/imageinfo.cpp b/src/digikam/imageinfo.cpp
index f32d3062..f32d3062 100644
--- a/digikam/digikam/imageinfo.cpp
+++ b/src/digikam/imageinfo.cpp
diff --git a/digikam/digikam/imageinfo.h b/src/digikam/imageinfo.h
index 3427b729..3427b729 100644
--- a/digikam/digikam/imageinfo.h
+++ b/src/digikam/imageinfo.h
diff --git a/digikam/digikam/imagepreviewview.cpp b/src/digikam/imagepreviewview.cpp
index f636f685..f636f685 100644
--- a/digikam/digikam/imagepreviewview.cpp
+++ b/src/digikam/imagepreviewview.cpp
diff --git a/digikam/digikam/imagepreviewview.h b/src/digikam/imagepreviewview.h
index f0058806..f0058806 100644
--- a/digikam/digikam/imagepreviewview.h
+++ b/src/digikam/imagepreviewview.h
diff --git a/digikam/digikam/kdateedit.cpp b/src/digikam/kdateedit.cpp
index 1cf4ec42..1cf4ec42 100644
--- a/digikam/digikam/kdateedit.cpp
+++ b/src/digikam/kdateedit.cpp
diff --git a/digikam/digikam/kdateedit.h b/src/digikam/kdateedit.h
index 92444823..92444823 100644
--- a/digikam/digikam/kdateedit.h
+++ b/src/digikam/kdateedit.h
diff --git a/digikam/digikam/kdatepickerpopup.cpp b/src/digikam/kdatepickerpopup.cpp
index b4cb8bb2..b4cb8bb2 100644
--- a/digikam/digikam/kdatepickerpopup.cpp
+++ b/src/digikam/kdatepickerpopup.cpp
diff --git a/digikam/digikam/kdatepickerpopup.h b/src/digikam/kdatepickerpopup.h
index e343594e..e343594e 100644
--- a/digikam/digikam/kdatepickerpopup.h
+++ b/src/digikam/kdatepickerpopup.h
diff --git a/digikam/digikam/kdatetimeedit.cpp b/src/digikam/kdatetimeedit.cpp
index e78c5cac..e78c5cac 100644
--- a/digikam/digikam/kdatetimeedit.cpp
+++ b/src/digikam/kdatetimeedit.cpp
diff --git a/digikam/digikam/kdatetimeedit.h b/src/digikam/kdatetimeedit.h
index ac0575c6..ac0575c6 100644
--- a/digikam/digikam/kdatetimeedit.h
+++ b/src/digikam/kdatetimeedit.h
diff --git a/digikam/digikam/kipiinterface.cpp b/src/digikam/kipiinterface.cpp
index aaf012e3..aaf012e3 100644
--- a/digikam/digikam/kipiinterface.cpp
+++ b/src/digikam/kipiinterface.cpp
diff --git a/digikam/digikam/kipiinterface.h b/src/digikam/kipiinterface.h
index b2974ece..b2974ece 100644
--- a/digikam/digikam/kipiinterface.h
+++ b/src/digikam/kipiinterface.h
diff --git a/digikam/digikam/main.cpp b/src/digikam/main.cpp
index 77609197..77609197 100644
--- a/digikam/digikam/main.cpp
+++ b/src/digikam/main.cpp
diff --git a/digikam/digikam/mediaplayerview.cpp b/src/digikam/mediaplayerview.cpp
index 97ef26aa..97ef26aa 100644
--- a/digikam/digikam/mediaplayerview.cpp
+++ b/src/digikam/mediaplayerview.cpp
diff --git a/digikam/digikam/mediaplayerview.h b/src/digikam/mediaplayerview.h
index 08399175..08399175 100644
--- a/digikam/digikam/mediaplayerview.h
+++ b/src/digikam/mediaplayerview.h
diff --git a/digikam/digikam/metadatahub.cpp b/src/digikam/metadatahub.cpp
index a1ab4d3c..a1ab4d3c 100644
--- a/digikam/digikam/metadatahub.cpp
+++ b/src/digikam/metadatahub.cpp
diff --git a/digikam/digikam/metadatahub.h b/src/digikam/metadatahub.h
index decb148e..decb148e 100644
--- a/digikam/digikam/metadatahub.h
+++ b/src/digikam/metadatahub.h
diff --git a/digikam/digikam/mimefilter.cpp b/src/digikam/mimefilter.cpp
index 80b3b501..80b3b501 100644
--- a/digikam/digikam/mimefilter.cpp
+++ b/src/digikam/mimefilter.cpp
diff --git a/digikam/digikam/mimefilter.h b/src/digikam/mimefilter.h
index bddb5609..bddb5609 100644
--- a/digikam/digikam/mimefilter.h
+++ b/src/digikam/mimefilter.h
diff --git a/digikam/digikam/monthwidget.cpp b/src/digikam/monthwidget.cpp
index 665318fd..665318fd 100644
--- a/digikam/digikam/monthwidget.cpp
+++ b/src/digikam/monthwidget.cpp
diff --git a/digikam/digikam/monthwidget.h b/src/digikam/monthwidget.h
index 70988c51..70988c51 100644
--- a/digikam/digikam/monthwidget.h
+++ b/src/digikam/monthwidget.h
diff --git a/digikam/digikam/pixmapmanager.cpp b/src/digikam/pixmapmanager.cpp
index 3da11b5a..3da11b5a 100644
--- a/digikam/digikam/pixmapmanager.cpp
+++ b/src/digikam/pixmapmanager.cpp
diff --git a/digikam/digikam/pixmapmanager.h b/src/digikam/pixmapmanager.h
index 62da7fa1..62da7fa1 100644
--- a/digikam/digikam/pixmapmanager.h
+++ b/src/digikam/pixmapmanager.h
diff --git a/digikam/digikam/ratingfilter.cpp b/src/digikam/ratingfilter.cpp
index 1cfa0bbf..1cfa0bbf 100644
--- a/digikam/digikam/ratingfilter.cpp
+++ b/src/digikam/ratingfilter.cpp
diff --git a/digikam/digikam/ratingfilter.h b/src/digikam/ratingfilter.h
index ac527e49..ac527e49 100644
--- a/digikam/digikam/ratingfilter.h
+++ b/src/digikam/ratingfilter.h
diff --git a/digikam/digikam/ratingpopupmenu.cpp b/src/digikam/ratingpopupmenu.cpp
index a1d17bab..a1d17bab 100644
--- a/digikam/digikam/ratingpopupmenu.cpp
+++ b/src/digikam/ratingpopupmenu.cpp
diff --git a/digikam/digikam/ratingpopupmenu.h b/src/digikam/ratingpopupmenu.h
index 14b2fef4..14b2fef4 100644
--- a/digikam/digikam/ratingpopupmenu.h
+++ b/src/digikam/ratingpopupmenu.h
diff --git a/digikam/digikam/ratingwidget.cpp b/src/digikam/ratingwidget.cpp
index 3371a2c6..3371a2c6 100644
--- a/digikam/digikam/ratingwidget.cpp
+++ b/src/digikam/ratingwidget.cpp
diff --git a/digikam/digikam/ratingwidget.h b/src/digikam/ratingwidget.h
index a6a6ab57..a6a6ab57 100644
--- a/digikam/digikam/ratingwidget.h
+++ b/src/digikam/ratingwidget.h
diff --git a/digikam/digikam/scanlib.cpp b/src/digikam/scanlib.cpp
index 71ea425c..71ea425c 100644
--- a/digikam/digikam/scanlib.cpp
+++ b/src/digikam/scanlib.cpp
diff --git a/digikam/digikam/scanlib.h b/src/digikam/scanlib.h
index 5e58b29b..5e58b29b 100644
--- a/digikam/digikam/scanlib.h
+++ b/src/digikam/scanlib.h
diff --git a/digikam/digikam/searchadvanceddialog.cpp b/src/digikam/searchadvanceddialog.cpp
index cb40b87b..cb40b87b 100644
--- a/digikam/digikam/searchadvanceddialog.cpp
+++ b/src/digikam/searchadvanceddialog.cpp
diff --git a/digikam/digikam/searchadvanceddialog.h b/src/digikam/searchadvanceddialog.h
index e4f233bd..e4f233bd 100644
--- a/digikam/digikam/searchadvanceddialog.h
+++ b/src/digikam/searchadvanceddialog.h
diff --git a/digikam/digikam/searchfolderview.cpp b/src/digikam/searchfolderview.cpp
index c302d700..c302d700 100644
--- a/digikam/digikam/searchfolderview.cpp
+++ b/src/digikam/searchfolderview.cpp
diff --git a/digikam/digikam/searchfolderview.h b/src/digikam/searchfolderview.h
index 8dab4ca0..8dab4ca0 100644
--- a/digikam/digikam/searchfolderview.h
+++ b/src/digikam/searchfolderview.h
diff --git a/digikam/digikam/searchquickdialog.cpp b/src/digikam/searchquickdialog.cpp
index 9cca5dfc..9cca5dfc 100644
--- a/digikam/digikam/searchquickdialog.cpp
+++ b/src/digikam/searchquickdialog.cpp
diff --git a/digikam/digikam/searchquickdialog.h b/src/digikam/searchquickdialog.h
index 3412283e..3412283e 100644
--- a/digikam/digikam/searchquickdialog.h
+++ b/src/digikam/searchquickdialog.h
diff --git a/digikam/digikam/searchresultsitem.cpp b/src/digikam/searchresultsitem.cpp
index d3f2ab13..d3f2ab13 100644
--- a/digikam/digikam/searchresultsitem.cpp
+++ b/src/digikam/searchresultsitem.cpp
diff --git a/digikam/digikam/searchresultsitem.h b/src/digikam/searchresultsitem.h
index 39d6562d..39d6562d 100644
--- a/digikam/digikam/searchresultsitem.h
+++ b/src/digikam/searchresultsitem.h
diff --git a/digikam/digikam/searchresultsview.cpp b/src/digikam/searchresultsview.cpp
index 968b14a8..968b14a8 100644
--- a/digikam/digikam/searchresultsview.cpp
+++ b/src/digikam/searchresultsview.cpp
diff --git a/digikam/digikam/searchresultsview.h b/src/digikam/searchresultsview.h
index a3846a28..a3846a28 100644
--- a/digikam/digikam/searchresultsview.h
+++ b/src/digikam/searchresultsview.h
diff --git a/digikam/digikam/searchwidgets.cpp b/src/digikam/searchwidgets.cpp
index c930d80c..c930d80c 100644
--- a/digikam/digikam/searchwidgets.cpp
+++ b/src/digikam/searchwidgets.cpp
diff --git a/digikam/digikam/searchwidgets.h b/src/digikam/searchwidgets.h
index 75ca51ce..75ca51ce 100644
--- a/digikam/digikam/searchwidgets.h
+++ b/src/digikam/searchwidgets.h
diff --git a/digikam/digikam/syncjob.cpp b/src/digikam/syncjob.cpp
index b350aabc..b350aabc 100644
--- a/digikam/digikam/syncjob.cpp
+++ b/src/digikam/syncjob.cpp
diff --git a/digikam/digikam/syncjob.h b/src/digikam/syncjob.h
index fca82613..fca82613 100644
--- a/digikam/digikam/syncjob.h
+++ b/src/digikam/syncjob.h
diff --git a/digikam/digikam/tageditdlg.cpp b/src/digikam/tageditdlg.cpp
index d77a0169..d77a0169 100644
--- a/digikam/digikam/tageditdlg.cpp
+++ b/src/digikam/tageditdlg.cpp
diff --git a/digikam/digikam/tageditdlg.h b/src/digikam/tageditdlg.h
index a1bfcfa2..a1bfcfa2 100644
--- a/digikam/digikam/tageditdlg.h
+++ b/src/digikam/tageditdlg.h
diff --git a/digikam/digikam/tagfilterview.cpp b/src/digikam/tagfilterview.cpp
index 2bebc2b8..2bebc2b8 100644
--- a/digikam/digikam/tagfilterview.cpp
+++ b/src/digikam/tagfilterview.cpp
diff --git a/digikam/digikam/tagfilterview.h b/src/digikam/tagfilterview.h
index 0cd977e1..0cd977e1 100644
--- a/digikam/digikam/tagfilterview.h
+++ b/src/digikam/tagfilterview.h
diff --git a/digikam/digikam/tagfolderview.cpp b/src/digikam/tagfolderview.cpp
index c5d54331..c5d54331 100644
--- a/digikam/digikam/tagfolderview.cpp
+++ b/src/digikam/tagfolderview.cpp
diff --git a/digikam/digikam/tagfolderview.h b/src/digikam/tagfolderview.h
index 27523e9d..27523e9d 100644
--- a/digikam/digikam/tagfolderview.h
+++ b/src/digikam/tagfolderview.h
diff --git a/digikam/digikam/tagspopupmenu.cpp b/src/digikam/tagspopupmenu.cpp
index 8b9e4644..8b9e4644 100644
--- a/digikam/digikam/tagspopupmenu.cpp
+++ b/src/digikam/tagspopupmenu.cpp
diff --git a/digikam/digikam/tagspopupmenu.h b/src/digikam/tagspopupmenu.h
index 5e746410..5e746410 100644
--- a/digikam/digikam/tagspopupmenu.h
+++ b/src/digikam/tagspopupmenu.h
diff --git a/digikam/digikam/thumbnailsize.h b/src/digikam/thumbnailsize.h
index a665913e..a665913e 100644
--- a/digikam/digikam/thumbnailsize.h
+++ b/src/digikam/thumbnailsize.h
diff --git a/digikam/digikam/timelinefolderview.cpp b/src/digikam/timelinefolderview.cpp
index 0168b8cb..0168b8cb 100644
--- a/digikam/digikam/timelinefolderview.cpp
+++ b/src/digikam/timelinefolderview.cpp
diff --git a/digikam/digikam/timelinefolderview.h b/src/digikam/timelinefolderview.h
index 2e8a8a86..2e8a8a86 100644
--- a/digikam/digikam/timelinefolderview.h
+++ b/src/digikam/timelinefolderview.h
diff --git a/digikam/digikam/timelineview.cpp b/src/digikam/timelineview.cpp
index ae8a6bc2..ae8a6bc2 100644
--- a/digikam/digikam/timelineview.cpp
+++ b/src/digikam/timelineview.cpp
diff --git a/digikam/digikam/timelineview.h b/src/digikam/timelineview.h
index fd673662..fd673662 100644
--- a/digikam/digikam/timelineview.h
+++ b/src/digikam/timelineview.h
diff --git a/digikam/digikam/timelinewidget.cpp b/src/digikam/timelinewidget.cpp
index b9033e41..b9033e41 100644
--- a/digikam/digikam/timelinewidget.cpp
+++ b/src/digikam/timelinewidget.cpp
diff --git a/digikam/digikam/timelinewidget.h b/src/digikam/timelinewidget.h
index 33aeb7ea..33aeb7ea 100644
--- a/digikam/digikam/timelinewidget.h
+++ b/src/digikam/timelinewidget.h
diff --git a/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp b/src/digikam/upgradedb_sqlite2tosqlite3.cpp
index b9156349..b9156349 100644
--- a/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp
+++ b/src/digikam/upgradedb_sqlite2tosqlite3.cpp
diff --git a/digikam/digikam/upgradedb_sqlite2tosqlite3.h b/src/digikam/upgradedb_sqlite2tosqlite3.h
index 8d94fa78..8d94fa78 100644
--- a/digikam/digikam/upgradedb_sqlite2tosqlite3.h
+++ b/src/digikam/upgradedb_sqlite2tosqlite3.h
diff --git a/digikam/digikam/welcomepageview.cpp b/src/digikam/welcomepageview.cpp
index 6327c947..6327c947 100644
--- a/digikam/digikam/welcomepageview.cpp
+++ b/src/digikam/welcomepageview.cpp
diff --git a/digikam/digikam/welcomepageview.h b/src/digikam/welcomepageview.h
index b69d82a2..b69d82a2 100644
--- a/digikam/digikam/welcomepageview.h
+++ b/src/digikam/welcomepageview.h
diff --git a/digikam/imageplugins/Makefile.am b/src/imageplugins/Makefile.am
index 3e04b062..3e04b062 100644
--- a/digikam/imageplugins/Makefile.am
+++ b/src/imageplugins/Makefile.am
diff --git a/src/imageplugins/adjustcurves/Makefile.am b/src/imageplugins/adjustcurves/Makefile.am
new file mode 100644
index 00000000..f798a7af
--- /dev/null
+++ b/src/imageplugins/adjustcurves/Makefile.am
@@ -0,0 +1,33 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_adjustcurves_la_SOURCES = imageplugin_adjustcurves.cpp \
+	                                         adjustcurvestool.cpp 
+
+digikamimageplugin_adjustcurves_la_LIBADD = $(LIB_TDEPARTS) \
+	                                        $(top_builddir)/src/digikam/libdigikam.la
+
+digikamimageplugin_adjustcurves_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_adjustcurves.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_adjustcurves.la
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_adjustcurves_ui.rc
diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.cpp b/src/imageplugins/adjustcurves/adjustcurves.cpp
index ace9c9b3..ace9c9b3 100644
--- a/digikam/imageplugins/adjustcurves/adjustcurves.cpp
+++ b/src/imageplugins/adjustcurves/adjustcurves.cpp
diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.h b/src/imageplugins/adjustcurves/adjustcurves.h
index f4cad2f2..f4cad2f2 100644
--- a/digikam/imageplugins/adjustcurves/adjustcurves.h
+++ b/src/imageplugins/adjustcurves/adjustcurves.h
diff --git a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp b/src/imageplugins/adjustcurves/adjustcurvestool.cpp
index 7bfd00f7..7bfd00f7 100644
--- a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp
+++ b/src/imageplugins/adjustcurves/adjustcurvestool.cpp
diff --git a/digikam/imageplugins/adjustcurves/adjustcurvestool.h b/src/imageplugins/adjustcurves/adjustcurvestool.h
index 4a380530..4a380530 100644
--- a/digikam/imageplugins/adjustcurves/adjustcurvestool.h
+++ b/src/imageplugins/adjustcurves/adjustcurvestool.h
diff --git a/digikam/imageplugins/adjustcurves/digikamimageplugin_adjustcurves.desktop b/src/imageplugins/adjustcurves/digikamimageplugin_adjustcurves.desktop
index 377c2a33..377c2a33 100644
--- a/digikam/imageplugins/adjustcurves/digikamimageplugin_adjustcurves.desktop
+++ b/src/imageplugins/adjustcurves/digikamimageplugin_adjustcurves.desktop
diff --git a/digikam/imageplugins/adjustcurves/digikamimageplugin_adjustcurves_ui.rc b/src/imageplugins/adjustcurves/digikamimageplugin_adjustcurves_ui.rc
index c87c2c1e..c87c2c1e 100644
--- a/digikam/imageplugins/adjustcurves/digikamimageplugin_adjustcurves_ui.rc
+++ b/src/imageplugins/adjustcurves/digikamimageplugin_adjustcurves_ui.rc
diff --git a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp b/src/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp
index 11b6e53f..11b6e53f 100644
--- a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp
+++ b/src/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp
diff --git a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.h b/src/imageplugins/adjustcurves/imageplugin_adjustcurves.h
index f8e43578..f8e43578 100644
--- a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.h
+++ b/src/imageplugins/adjustcurves/imageplugin_adjustcurves.h
diff --git a/src/imageplugins/adjustlevels/Makefile.am b/src/imageplugins/adjustlevels/Makefile.am
new file mode 100644
index 00000000..2b04f4cc
--- /dev/null
+++ b/src/imageplugins/adjustlevels/Makefile.am
@@ -0,0 +1,34 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_adjustlevels_la_SOURCES = imageplugin_adjustlevels.cpp \
+	                                         adjustlevelstool.cpp 
+
+digikamimageplugin_adjustlevels_la_LIBADD = $(LIB_TDEPARTS) \
+	                                        $(top_builddir)/src/digikam/libdigikam.la 
+
+digikamimageplugin_adjustlevels_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_adjustlevels.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_adjustlevels.la
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_adjustlevels_ui.rc
+
diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.cpp b/src/imageplugins/adjustlevels/adjustlevels.cpp
index 72d5e46b..72d5e46b 100644
--- a/digikam/imageplugins/adjustlevels/adjustlevels.cpp
+++ b/src/imageplugins/adjustlevels/adjustlevels.cpp
diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.h b/src/imageplugins/adjustlevels/adjustlevels.h
index 1b1ad9be..1b1ad9be 100644
--- a/digikam/imageplugins/adjustlevels/adjustlevels.h
+++ b/src/imageplugins/adjustlevels/adjustlevels.h
diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp b/src/imageplugins/adjustlevels/adjustlevelstool.cpp
index 28066774..28066774 100644
--- a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp
+++ b/src/imageplugins/adjustlevels/adjustlevelstool.cpp
diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.h b/src/imageplugins/adjustlevels/adjustlevelstool.h
index 9fdadf91..9fdadf91 100644
--- a/digikam/imageplugins/adjustlevels/adjustlevelstool.h
+++ b/src/imageplugins/adjustlevels/adjustlevelstool.h
diff --git a/digikam/imageplugins/adjustlevels/digikamimageplugin_adjustlevels.desktop b/src/imageplugins/adjustlevels/digikamimageplugin_adjustlevels.desktop
index b601ebbf..b601ebbf 100644
--- a/digikam/imageplugins/adjustlevels/digikamimageplugin_adjustlevels.desktop
+++ b/src/imageplugins/adjustlevels/digikamimageplugin_adjustlevels.desktop
diff --git a/digikam/imageplugins/adjustlevels/digikamimageplugin_adjustlevels_ui.rc b/src/imageplugins/adjustlevels/digikamimageplugin_adjustlevels_ui.rc
index 8036e124..8036e124 100644
--- a/digikam/imageplugins/adjustlevels/digikamimageplugin_adjustlevels_ui.rc
+++ b/src/imageplugins/adjustlevels/digikamimageplugin_adjustlevels_ui.rc
diff --git a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp b/src/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp
index 0f9dcb9e..0f9dcb9e 100644
--- a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp
+++ b/src/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp
diff --git a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.h b/src/imageplugins/adjustlevels/imageplugin_adjustlevels.h
index 16af4f32..16af4f32 100644
--- a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.h
+++ b/src/imageplugins/adjustlevels/imageplugin_adjustlevels.h
diff --git a/src/imageplugins/antivignetting/Makefile.am b/src/imageplugins/antivignetting/Makefile.am
new file mode 100644
index 00000000..54539672
--- /dev/null
+++ b/src/imageplugins/antivignetting/Makefile.am
@@ -0,0 +1,34 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_antivignetting_la_SOURCES = imageplugin_antivignetting.cpp \
+	                                           antivignettingtool.cpp antivignetting.cpp 
+
+digikamimageplugin_antivignetting_la_LIBADD = $(LIB_TDEPARTS) \
+	                                          $(top_builddir)/src/digikam/libdigikam.la 
+
+digikamimageplugin_antivignetting_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_antivignetting.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_antivignetting.la 
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_antivignetting_ui.rc
+
diff --git a/digikam/imageplugins/antivignetting/antivignetting.cpp b/src/imageplugins/antivignetting/antivignetting.cpp
index dec0a9ea..dec0a9ea 100644
--- a/digikam/imageplugins/antivignetting/antivignetting.cpp
+++ b/src/imageplugins/antivignetting/antivignetting.cpp
diff --git a/digikam/imageplugins/antivignetting/antivignetting.h b/src/imageplugins/antivignetting/antivignetting.h
index f5311da0..f5311da0 100644
--- a/digikam/imageplugins/antivignetting/antivignetting.h
+++ b/src/imageplugins/antivignetting/antivignetting.h
diff --git a/digikam/imageplugins/antivignetting/antivignettingtool.cpp b/src/imageplugins/antivignetting/antivignettingtool.cpp
index d8f211c7..d8f211c7 100644
--- a/digikam/imageplugins/antivignetting/antivignettingtool.cpp
+++ b/src/imageplugins/antivignetting/antivignettingtool.cpp
diff --git a/digikam/imageplugins/antivignetting/antivignettingtool.h b/src/imageplugins/antivignetting/antivignettingtool.h
index 467a19da..467a19da 100644
--- a/digikam/imageplugins/antivignetting/antivignettingtool.h
+++ b/src/imageplugins/antivignetting/antivignettingtool.h
diff --git a/digikam/imageplugins/antivignetting/digikamimageplugin_antivignetting.desktop b/src/imageplugins/antivignetting/digikamimageplugin_antivignetting.desktop
index f70a4752..f70a4752 100644
--- a/digikam/imageplugins/antivignetting/digikamimageplugin_antivignetting.desktop
+++ b/src/imageplugins/antivignetting/digikamimageplugin_antivignetting.desktop
diff --git a/digikam/imageplugins/antivignetting/digikamimageplugin_antivignetting_ui.rc b/src/imageplugins/antivignetting/digikamimageplugin_antivignetting_ui.rc
index 7a54a1f3..7a54a1f3 100644
--- a/digikam/imageplugins/antivignetting/digikamimageplugin_antivignetting_ui.rc
+++ b/src/imageplugins/antivignetting/digikamimageplugin_antivignetting_ui.rc
diff --git a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp b/src/imageplugins/antivignetting/imageeffect_antivignetting.cpp
index 7d7a00c6..7d7a00c6 100644
--- a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp
+++ b/src/imageplugins/antivignetting/imageeffect_antivignetting.cpp
diff --git a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.h b/src/imageplugins/antivignetting/imageeffect_antivignetting.h
index 3ee6f158..3ee6f158 100644
--- a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.h
+++ b/src/imageplugins/antivignetting/imageeffect_antivignetting.h
diff --git a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp b/src/imageplugins/antivignetting/imageplugin_antivignetting.cpp
index 239d9842..239d9842 100644
--- a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp
+++ b/src/imageplugins/antivignetting/imageplugin_antivignetting.cpp
diff --git a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h b/src/imageplugins/antivignetting/imageplugin_antivignetting.h
index d8d4eedd..d8d4eedd 100644
--- a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h
+++ b/src/imageplugins/antivignetting/imageplugin_antivignetting.h
diff --git a/src/imageplugins/blurfx/Makefile.am b/src/imageplugins/blurfx/Makefile.am
new file mode 100644
index 00000000..51a78977
--- /dev/null
+++ b/src/imageplugins/blurfx/Makefile.am
@@ -0,0 +1,34 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_blurfx_la_SOURCES = imageplugin_blurfx.cpp \
+	                                   blurfxtool.cpp blurfx.cpp 
+
+digikamimageplugin_blurfx_la_LIBADD = $(LIB_TDEPARTS) \
+	                                  $(top_builddir)/src/digikam/libdigikam.la 
+
+digikamimageplugin_blurfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_blurfx.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_blurfx.la 
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_blurfx_ui.rc     
+       
diff --git a/digikam/imageplugins/blurfx/blurfx.cpp b/src/imageplugins/blurfx/blurfx.cpp
index ec5ff30e..ec5ff30e 100644
--- a/digikam/imageplugins/blurfx/blurfx.cpp
+++ b/src/imageplugins/blurfx/blurfx.cpp
diff --git a/digikam/imageplugins/blurfx/blurfx.h b/src/imageplugins/blurfx/blurfx.h
index 4a4397b4..4a4397b4 100644
--- a/digikam/imageplugins/blurfx/blurfx.h
+++ b/src/imageplugins/blurfx/blurfx.h
diff --git a/digikam/imageplugins/blurfx/blurfxtool.cpp b/src/imageplugins/blurfx/blurfxtool.cpp
index 2998dbde..2998dbde 100644
--- a/digikam/imageplugins/blurfx/blurfxtool.cpp
+++ b/src/imageplugins/blurfx/blurfxtool.cpp
diff --git a/digikam/imageplugins/blurfx/blurfxtool.h b/src/imageplugins/blurfx/blurfxtool.h
index 9726e65d..9726e65d 100644
--- a/digikam/imageplugins/blurfx/blurfxtool.h
+++ b/src/imageplugins/blurfx/blurfxtool.h
diff --git a/digikam/imageplugins/blurfx/digikamimageplugin_blurfx.desktop b/src/imageplugins/blurfx/digikamimageplugin_blurfx.desktop
index e7968a80..e7968a80 100644
--- a/digikam/imageplugins/blurfx/digikamimageplugin_blurfx.desktop
+++ b/src/imageplugins/blurfx/digikamimageplugin_blurfx.desktop
diff --git a/digikam/imageplugins/blurfx/digikamimageplugin_blurfx_ui.rc b/src/imageplugins/blurfx/digikamimageplugin_blurfx_ui.rc
index 085b4c68..085b4c68 100644
--- a/digikam/imageplugins/blurfx/digikamimageplugin_blurfx_ui.rc
+++ b/src/imageplugins/blurfx/digikamimageplugin_blurfx_ui.rc
diff --git a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp b/src/imageplugins/blurfx/imageeffect_blurfx.cpp
index 62bcd525..62bcd525 100644
--- a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp
+++ b/src/imageplugins/blurfx/imageeffect_blurfx.cpp
diff --git a/digikam/imageplugins/blurfx/imageeffect_blurfx.h b/src/imageplugins/blurfx/imageeffect_blurfx.h
index e2517d4f..e2517d4f 100644
--- a/digikam/imageplugins/blurfx/imageeffect_blurfx.h
+++ b/src/imageplugins/blurfx/imageeffect_blurfx.h
diff --git a/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp b/src/imageplugins/blurfx/imageplugin_blurfx.cpp
index 3bbd05e0..3bbd05e0 100644
--- a/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp
+++ b/src/imageplugins/blurfx/imageplugin_blurfx.cpp
diff --git a/digikam/imageplugins/blurfx/imageplugin_blurfx.h b/src/imageplugins/blurfx/imageplugin_blurfx.h
index 13df6534..13df6534 100644
--- a/digikam/imageplugins/blurfx/imageplugin_blurfx.h
+++ b/src/imageplugins/blurfx/imageplugin_blurfx.h
diff --git a/src/imageplugins/border/Makefile.am b/src/imageplugins/border/Makefile.am
new file mode 100644
index 00000000..385acfab
--- /dev/null
+++ b/src/imageplugins/border/Makefile.am
@@ -0,0 +1,34 @@
+METASOURCES = AUTO
+SUBDIRS = patterns
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_border_la_SOURCES = imageplugin_border.cpp \
+	                                   bordertool.cpp border.cpp 
+
+digikamimageplugin_border_la_LIBADD = $(LIB_TDEPARTS) \
+	                                  $(top_builddir)/src/digikam/libdigikam.la 
+
+digikamimageplugin_border_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_border.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_border.la 
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_border_ui.rc
diff --git a/digikam/imageplugins/border/border.cpp b/src/imageplugins/border/border.cpp
index 00726f58..00726f58 100644
--- a/digikam/imageplugins/border/border.cpp
+++ b/src/imageplugins/border/border.cpp
diff --git a/digikam/imageplugins/border/border.h b/src/imageplugins/border/border.h
index b213e27a..b213e27a 100644
--- a/digikam/imageplugins/border/border.h
+++ b/src/imageplugins/border/border.h
diff --git a/digikam/imageplugins/border/bordertool.cpp b/src/imageplugins/border/bordertool.cpp
index 160f5b0a..160f5b0a 100644
--- a/digikam/imageplugins/border/bordertool.cpp
+++ b/src/imageplugins/border/bordertool.cpp
diff --git a/digikam/imageplugins/border/bordertool.h b/src/imageplugins/border/bordertool.h
index a8ec5ccf..a8ec5ccf 100644
--- a/digikam/imageplugins/border/bordertool.h
+++ b/src/imageplugins/border/bordertool.h
diff --git a/digikam/imageplugins/border/digikamimageplugin_border.desktop b/src/imageplugins/border/digikamimageplugin_border.desktop
index 45f32a7e..45f32a7e 100644
--- a/digikam/imageplugins/border/digikamimageplugin_border.desktop
+++ b/src/imageplugins/border/digikamimageplugin_border.desktop
diff --git a/digikam/imageplugins/border/digikamimageplugin_border_ui.rc b/src/imageplugins/border/digikamimageplugin_border_ui.rc
index 8cce0581..8cce0581 100644
--- a/digikam/imageplugins/border/digikamimageplugin_border_ui.rc
+++ b/src/imageplugins/border/digikamimageplugin_border_ui.rc
diff --git a/digikam/imageplugins/border/imageeffect_border.cpp b/src/imageplugins/border/imageeffect_border.cpp
index 9f3dd6c3..9f3dd6c3 100644
--- a/digikam/imageplugins/border/imageeffect_border.cpp
+++ b/src/imageplugins/border/imageeffect_border.cpp
diff --git a/digikam/imageplugins/border/imageeffect_border.h b/src/imageplugins/border/imageeffect_border.h
index 787a76a0..787a76a0 100644
--- a/digikam/imageplugins/border/imageeffect_border.h
+++ b/src/imageplugins/border/imageeffect_border.h
diff --git a/digikam/imageplugins/border/imageplugin_border.cpp b/src/imageplugins/border/imageplugin_border.cpp
index f0c5a236..f0c5a236 100644
--- a/digikam/imageplugins/border/imageplugin_border.cpp
+++ b/src/imageplugins/border/imageplugin_border.cpp
diff --git a/digikam/imageplugins/border/imageplugin_border.h b/src/imageplugins/border/imageplugin_border.h
index e5b3d959..e5b3d959 100644
--- a/digikam/imageplugins/border/imageplugin_border.h
+++ b/src/imageplugins/border/imageplugin_border.h
diff --git a/digikam/imageplugins/border/patterns/Makefile.am b/src/imageplugins/border/patterns/Makefile.am
index 31bb4b2d..31bb4b2d 100644
--- a/digikam/imageplugins/border/patterns/Makefile.am
+++ b/src/imageplugins/border/patterns/Makefile.am
diff --git a/digikam/imageplugins/border/patterns/chalk-pattern.png b/src/imageplugins/border/patterns/chalk-pattern.png
index 31c34f62..31c34f62 100644
--- a/digikam/imageplugins/border/patterns/chalk-pattern.png
+++ b/src/imageplugins/border/patterns/chalk-pattern.png
diff --git a/digikam/imageplugins/border/patterns/craters-pattern.png b/src/imageplugins/border/patterns/craters-pattern.png
index fe8fe792..fe8fe792 100644
--- a/digikam/imageplugins/border/patterns/craters-pattern.png
+++ b/src/imageplugins/border/patterns/craters-pattern.png
diff --git a/digikam/imageplugins/border/patterns/dried-pattern.png b/src/imageplugins/border/patterns/dried-pattern.png
index fca948ff..fca948ff 100644
--- a/digikam/imageplugins/border/patterns/dried-pattern.png
+++ b/src/imageplugins/border/patterns/dried-pattern.png
diff --git a/digikam/imageplugins/border/patterns/granit-pattern.png b/src/imageplugins/border/patterns/granit-pattern.png
index eccbb354..eccbb354 100644
--- a/digikam/imageplugins/border/patterns/granit-pattern.png
+++ b/src/imageplugins/border/patterns/granit-pattern.png
diff --git a/digikam/imageplugins/border/patterns/ice-pattern.png b/src/imageplugins/border/patterns/ice-pattern.png
index 30a67265..30a67265 100644
--- a/digikam/imageplugins/border/patterns/ice-pattern.png
+++ b/src/imageplugins/border/patterns/ice-pattern.png
diff --git a/digikam/imageplugins/border/patterns/leaf-pattern.png b/src/imageplugins/border/patterns/leaf-pattern.png
index b602fceb..b602fceb 100644
--- a/digikam/imageplugins/border/patterns/leaf-pattern.png
+++ b/src/imageplugins/border/patterns/leaf-pattern.png
diff --git a/digikam/imageplugins/border/patterns/marble-pattern.png b/src/imageplugins/border/patterns/marble-pattern.png
index 6346bf1f..6346bf1f 100644
--- a/digikam/imageplugins/border/patterns/marble-pattern.png
+++ b/src/imageplugins/border/patterns/marble-pattern.png
diff --git a/digikam/imageplugins/border/patterns/paper-pattern.png b/src/imageplugins/border/patterns/paper-pattern.png
index 43da3b2f..43da3b2f 100644
--- a/digikam/imageplugins/border/patterns/paper-pattern.png
+++ b/src/imageplugins/border/patterns/paper-pattern.png
diff --git a/digikam/imageplugins/border/patterns/parque-pattern.png b/src/imageplugins/border/patterns/parque-pattern.png
index 2aa5e96f..2aa5e96f 100644
--- a/digikam/imageplugins/border/patterns/parque-pattern.png
+++ b/src/imageplugins/border/patterns/parque-pattern.png
diff --git a/digikam/imageplugins/border/patterns/pine-pattern.png b/src/imageplugins/border/patterns/pine-pattern.png
index 4ae7a687..4ae7a687 100644
--- a/digikam/imageplugins/border/patterns/pine-pattern.png
+++ b/src/imageplugins/border/patterns/pine-pattern.png
diff --git a/digikam/imageplugins/border/patterns/pink-pattern.png b/src/imageplugins/border/patterns/pink-pattern.png
index d0649c85..d0649c85 100644
--- a/digikam/imageplugins/border/patterns/pink-pattern.png
+++ b/src/imageplugins/border/patterns/pink-pattern.png
diff --git a/digikam/imageplugins/border/patterns/rain-pattern.png b/src/imageplugins/border/patterns/rain-pattern.png
index a282c442..a282c442 100644
--- a/digikam/imageplugins/border/patterns/rain-pattern.png
+++ b/src/imageplugins/border/patterns/rain-pattern.png
diff --git a/digikam/imageplugins/border/patterns/rock-pattern.png b/src/imageplugins/border/patterns/rock-pattern.png
index 04dc8b0e..04dc8b0e 100644
--- a/digikam/imageplugins/border/patterns/rock-pattern.png
+++ b/src/imageplugins/border/patterns/rock-pattern.png
diff --git a/digikam/imageplugins/border/patterns/stone-pattern.png b/src/imageplugins/border/patterns/stone-pattern.png
index 98da7c2c..98da7c2c 100644
--- a/digikam/imageplugins/border/patterns/stone-pattern.png
+++ b/src/imageplugins/border/patterns/stone-pattern.png
diff --git a/digikam/imageplugins/border/patterns/wall-pattern.png b/src/imageplugins/border/patterns/wall-pattern.png
index 3c101597..3c101597 100644
--- a/digikam/imageplugins/border/patterns/wall-pattern.png
+++ b/src/imageplugins/border/patterns/wall-pattern.png
diff --git a/digikam/imageplugins/border/patterns/wood-pattern.png b/src/imageplugins/border/patterns/wood-pattern.png
index bfe4c724..bfe4c724 100644
--- a/digikam/imageplugins/border/patterns/wood-pattern.png
+++ b/src/imageplugins/border/patterns/wood-pattern.png
diff --git a/src/imageplugins/channelmixer/Makefile.am b/src/imageplugins/channelmixer/Makefile.am
new file mode 100644
index 00000000..61eaab34
--- /dev/null
+++ b/src/imageplugins/channelmixer/Makefile.am
@@ -0,0 +1,34 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_channelmixer_la_SOURCES = imageplugin_channelmixer.cpp \
+	                                         channelmixertool.cpp 
+
+digikamimageplugin_channelmixer_la_LIBADD = $(LIB_TDEPARTS) \
+	                                        $(top_builddir)/src/digikam/libdigikam.la 
+
+digikamimageplugin_channelmixer_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_channelmixer.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_channelmixer.la
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_channelmixer_ui.rc
+
diff --git a/digikam/imageplugins/channelmixer/channelmixer.cpp b/src/imageplugins/channelmixer/channelmixer.cpp
index 849cc1e8..849cc1e8 100644
--- a/digikam/imageplugins/channelmixer/channelmixer.cpp
+++ b/src/imageplugins/channelmixer/channelmixer.cpp
diff --git a/digikam/imageplugins/channelmixer/channelmixer.h b/src/imageplugins/channelmixer/channelmixer.h
index 9b4396d0..9b4396d0 100644
--- a/digikam/imageplugins/channelmixer/channelmixer.h
+++ b/src/imageplugins/channelmixer/channelmixer.h
diff --git a/digikam/imageplugins/channelmixer/channelmixertool.cpp b/src/imageplugins/channelmixer/channelmixertool.cpp
index c8215178..c8215178 100644
--- a/digikam/imageplugins/channelmixer/channelmixertool.cpp
+++ b/src/imageplugins/channelmixer/channelmixertool.cpp
diff --git a/digikam/imageplugins/channelmixer/channelmixertool.h b/src/imageplugins/channelmixer/channelmixertool.h
index c15a30cd..c15a30cd 100644
--- a/digikam/imageplugins/channelmixer/channelmixertool.h
+++ b/src/imageplugins/channelmixer/channelmixertool.h
diff --git a/digikam/imageplugins/channelmixer/digikamimageplugin_channelmixer.desktop b/src/imageplugins/channelmixer/digikamimageplugin_channelmixer.desktop
index a855fffe..a855fffe 100644
--- a/digikam/imageplugins/channelmixer/digikamimageplugin_channelmixer.desktop
+++ b/src/imageplugins/channelmixer/digikamimageplugin_channelmixer.desktop
diff --git a/digikam/imageplugins/channelmixer/digikamimageplugin_channelmixer_ui.rc b/src/imageplugins/channelmixer/digikamimageplugin_channelmixer_ui.rc
index 1a004c96..1a004c96 100644
--- a/digikam/imageplugins/channelmixer/digikamimageplugin_channelmixer_ui.rc
+++ b/src/imageplugins/channelmixer/digikamimageplugin_channelmixer_ui.rc
diff --git a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp b/src/imageplugins/channelmixer/imageplugin_channelmixer.cpp
index 19fe21a9..19fe21a9 100644
--- a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp
+++ b/src/imageplugins/channelmixer/imageplugin_channelmixer.cpp
diff --git a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h b/src/imageplugins/channelmixer/imageplugin_channelmixer.h
index 444006ab..444006ab 100644
--- a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h
+++ b/src/imageplugins/channelmixer/imageplugin_channelmixer.h
diff --git a/src/imageplugins/charcoal/Makefile.am b/src/imageplugins/charcoal/Makefile.am
new file mode 100644
index 00000000..3d851deb
--- /dev/null
+++ b/src/imageplugins/charcoal/Makefile.am
@@ -0,0 +1,34 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_charcoal_la_SOURCES = imageplugin_charcoal.cpp \
+	                                     charcoaltool.cpp charcoal.cpp 
+
+digikamimageplugin_charcoal_la_LIBADD = $(LIB_TDEPARTS) \
+	                                    $(top_builddir)/src/digikam/libdigikam.la
+
+digikamimageplugin_charcoal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_charcoal.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_charcoal.la
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_charcoal_ui.rc
+       
diff --git a/digikam/imageplugins/charcoal/charcoal.cpp b/src/imageplugins/charcoal/charcoal.cpp
index a4c54a3c..a4c54a3c 100644
--- a/digikam/imageplugins/charcoal/charcoal.cpp
+++ b/src/imageplugins/charcoal/charcoal.cpp
diff --git a/digikam/imageplugins/charcoal/charcoal.h b/src/imageplugins/charcoal/charcoal.h
index 2088ccc4..2088ccc4 100644
--- a/digikam/imageplugins/charcoal/charcoal.h
+++ b/src/imageplugins/charcoal/charcoal.h
diff --git a/digikam/imageplugins/charcoal/charcoaltool.cpp b/src/imageplugins/charcoal/charcoaltool.cpp
index 75ee22df..75ee22df 100644
--- a/digikam/imageplugins/charcoal/charcoaltool.cpp
+++ b/src/imageplugins/charcoal/charcoaltool.cpp
diff --git a/digikam/imageplugins/charcoal/charcoaltool.h b/src/imageplugins/charcoal/charcoaltool.h
index 5833dd06..5833dd06 100644
--- a/digikam/imageplugins/charcoal/charcoaltool.h
+++ b/src/imageplugins/charcoal/charcoaltool.h
diff --git a/digikam/imageplugins/charcoal/digikamimageplugin_charcoal.desktop b/src/imageplugins/charcoal/digikamimageplugin_charcoal.desktop
index e8957bbf..e8957bbf 100644
--- a/digikam/imageplugins/charcoal/digikamimageplugin_charcoal.desktop
+++ b/src/imageplugins/charcoal/digikamimageplugin_charcoal.desktop
diff --git a/digikam/imageplugins/charcoal/digikamimageplugin_charcoal_ui.rc b/src/imageplugins/charcoal/digikamimageplugin_charcoal_ui.rc
index 92ab4752..92ab4752 100644
--- a/digikam/imageplugins/charcoal/digikamimageplugin_charcoal_ui.rc
+++ b/src/imageplugins/charcoal/digikamimageplugin_charcoal_ui.rc
diff --git a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp b/src/imageplugins/charcoal/imageeffect_charcoal.cpp
index 67a0269d..67a0269d 100644
--- a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp
+++ b/src/imageplugins/charcoal/imageeffect_charcoal.cpp
diff --git a/digikam/imageplugins/charcoal/imageeffect_charcoal.h b/src/imageplugins/charcoal/imageeffect_charcoal.h
index 31916ecc..31916ecc 100644
--- a/digikam/imageplugins/charcoal/imageeffect_charcoal.h
+++ b/src/imageplugins/charcoal/imageeffect_charcoal.h
diff --git a/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp b/src/imageplugins/charcoal/imageplugin_charcoal.cpp
index ae28e7ca..ae28e7ca 100644
--- a/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp
+++ b/src/imageplugins/charcoal/imageplugin_charcoal.cpp
diff --git a/digikam/imageplugins/charcoal/imageplugin_charcoal.h b/src/imageplugins/charcoal/imageplugin_charcoal.h
index c642087a..c642087a 100644
--- a/digikam/imageplugins/charcoal/imageplugin_charcoal.h
+++ b/src/imageplugins/charcoal/imageplugin_charcoal.h
diff --git a/src/imageplugins/colorfx/Makefile.am b/src/imageplugins/colorfx/Makefile.am
new file mode 100644
index 00000000..a0d2e4fa
--- /dev/null
+++ b/src/imageplugins/colorfx/Makefile.am
@@ -0,0 +1,34 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_colorfx_la_SOURCES = imageplugin_colorfx.cpp \
+	                                    colorfxtool.cpp 
+
+digikamimageplugin_colorfx_la_LIBADD = $(LIB_TDEPARTS) \
+	                                   $(top_builddir)/src/digikam/libdigikam.la 
+
+digikamimageplugin_colorfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_colorfx.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_colorfx.la
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_colorfx_ui.rc
+       
diff --git a/digikam/imageplugins/colorfx/colorfxtool.cpp b/src/imageplugins/colorfx/colorfxtool.cpp
index dd16e7cf..dd16e7cf 100644
--- a/digikam/imageplugins/colorfx/colorfxtool.cpp
+++ b/src/imageplugins/colorfx/colorfxtool.cpp
diff --git a/digikam/imageplugins/colorfx/colorfxtool.h b/src/imageplugins/colorfx/colorfxtool.h
index 6040f53e..6040f53e 100644
--- a/digikam/imageplugins/colorfx/colorfxtool.h
+++ b/src/imageplugins/colorfx/colorfxtool.h
diff --git a/digikam/imageplugins/colorfx/digikamimageplugin_colorfx.desktop b/src/imageplugins/colorfx/digikamimageplugin_colorfx.desktop
index 7350f6d9..7350f6d9 100644
--- a/digikam/imageplugins/colorfx/digikamimageplugin_colorfx.desktop
+++ b/src/imageplugins/colorfx/digikamimageplugin_colorfx.desktop
diff --git a/digikam/imageplugins/colorfx/digikamimageplugin_colorfx_ui.rc b/src/imageplugins/colorfx/digikamimageplugin_colorfx_ui.rc
index 443a00bd..443a00bd 100644
--- a/digikam/imageplugins/colorfx/digikamimageplugin_colorfx_ui.rc
+++ b/src/imageplugins/colorfx/digikamimageplugin_colorfx_ui.rc
diff --git a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp b/src/imageplugins/colorfx/imageeffect_colorfx.cpp
index a4ab6fe7..a4ab6fe7 100644
--- a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp
+++ b/src/imageplugins/colorfx/imageeffect_colorfx.cpp
diff --git a/digikam/imageplugins/colorfx/imageeffect_colorfx.h b/src/imageplugins/colorfx/imageeffect_colorfx.h
index d6d7d105..d6d7d105 100644
--- a/digikam/imageplugins/colorfx/imageeffect_colorfx.h
+++ b/src/imageplugins/colorfx/imageeffect_colorfx.h
diff --git a/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp b/src/imageplugins/colorfx/imageplugin_colorfx.cpp
index f4725028..f4725028 100644
--- a/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp
+++ b/src/imageplugins/colorfx/imageplugin_colorfx.cpp
diff --git a/digikam/imageplugins/colorfx/imageplugin_colorfx.h b/src/imageplugins/colorfx/imageplugin_colorfx.h
index d7aaa83f..d7aaa83f 100644
--- a/digikam/imageplugins/colorfx/imageplugin_colorfx.h
+++ b/src/imageplugins/colorfx/imageplugin_colorfx.h
diff --git a/src/imageplugins/coreplugin/Makefile.am b/src/imageplugins/coreplugin/Makefile.am
new file mode 100644
index 00000000..b36d6f36
--- /dev/null
+++ b/src/imageplugins/coreplugin/Makefile.am
@@ -0,0 +1,52 @@
+SUBDIRS = sharpnesseditor hsl ratiocrop 
+COMPILE_FIRST = sharpnesseditor hsl ratiocrop 
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       -I$(top_srcdir)/src/imageplugins/coreplugin/sharpnesseditor \
+	       -I$(top_srcdir)/src/imageplugins/coreplugin/hsl \
+	       -I$(top_srcdir)/src/imageplugins/coreplugin/ratiocrop \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_core_la_SOURCES = imageplugin_core.cpp bwsepiatool.cpp \
+	                                 autocorrectiontool.cpp \
+	                                 rgbtool.cpp \
+	                                 redeyetool.cpp blurtool.cpp \
+	                                 iccprooftool.cpp bcgtool.cpp 
+
+noinst_HEADERS = autocorrectiontool.h blurtool.h \
+                 rgbtool.h bcgtool.h \
+                 bwsepiatool.h iccprooftool.h redeyetool.h 
+
+digikamimageplugin_core_la_LIBADD = $(LIB_TDEPARTS) \
+                                    $(top_builddir)/src/imageplugins/coreplugin/sharpnesseditor/libsharpnesseditor.la \
+	                            $(top_builddir)/src/imageplugins/coreplugin/hsl/libhsl.la \
+	                            $(top_builddir)/src/imageplugins/coreplugin/ratiocrop/libratiocrop.la \
+	                            $(top_builddir)/src/digikam/libdigikam.la \
+	                            $(top_builddir)/src/utilities/imageeditor/editor/libdimgeditor.la \
+	                            $(top_builddir)/src/libs/curves/libcurves.la \
+				    $(top_builddir)/src/libs/widgets/common/libcommonwidgets.la \
+				    $(top_builddir)/src/libs/widgets/imageplugins/libimagepluginswidgets.la
+
+digikamimageplugin_core_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio -lkexiv2 -ltdeutils
+
+kde_services_DATA = digikamimageplugin_core.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_core.la
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_core_ui.rc
diff --git a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp b/src/imageplugins/coreplugin/autocorrectiontool.cpp
index 32f00b44..32f00b44 100644
--- a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp
+++ b/src/imageplugins/coreplugin/autocorrectiontool.cpp
diff --git a/digikam/imageplugins/coreplugin/autocorrectiontool.h b/src/imageplugins/coreplugin/autocorrectiontool.h
index 73a388f2..73a388f2 100644
--- a/digikam/imageplugins/coreplugin/autocorrectiontool.h
+++ b/src/imageplugins/coreplugin/autocorrectiontool.h
diff --git a/digikam/imageplugins/coreplugin/bcgtool.cpp b/src/imageplugins/coreplugin/bcgtool.cpp
index 17ecf838..17ecf838 100644
--- a/digikam/imageplugins/coreplugin/bcgtool.cpp
+++ b/src/imageplugins/coreplugin/bcgtool.cpp
diff --git a/digikam/imageplugins/coreplugin/bcgtool.h b/src/imageplugins/coreplugin/bcgtool.h
index 4a1e9d21..4a1e9d21 100644
--- a/digikam/imageplugins/coreplugin/bcgtool.h
+++ b/src/imageplugins/coreplugin/bcgtool.h
diff --git a/digikam/imageplugins/coreplugin/blurtool.cpp b/src/imageplugins/coreplugin/blurtool.cpp
index 85e1dc19..85e1dc19 100644
--- a/digikam/imageplugins/coreplugin/blurtool.cpp
+++ b/src/imageplugins/coreplugin/blurtool.cpp
diff --git a/digikam/imageplugins/coreplugin/blurtool.h b/src/imageplugins/coreplugin/blurtool.h
index 545f4aa2..545f4aa2 100644
--- a/digikam/imageplugins/coreplugin/blurtool.h
+++ b/src/imageplugins/coreplugin/blurtool.h
diff --git a/digikam/imageplugins/coreplugin/bwsepiatool.cpp b/src/imageplugins/coreplugin/bwsepiatool.cpp
index 06c30462..06c30462 100644
--- a/digikam/imageplugins/coreplugin/bwsepiatool.cpp
+++ b/src/imageplugins/coreplugin/bwsepiatool.cpp
diff --git a/digikam/imageplugins/coreplugin/bwsepiatool.h b/src/imageplugins/coreplugin/bwsepiatool.h
index 7145f567..7145f567 100644
--- a/digikam/imageplugins/coreplugin/bwsepiatool.h
+++ b/src/imageplugins/coreplugin/bwsepiatool.h
diff --git a/digikam/imageplugins/coreplugin/digikamimageplugin_core.desktop b/src/imageplugins/coreplugin/digikamimageplugin_core.desktop
index 8f8b3d10..8f8b3d10 100644
--- a/digikam/imageplugins/coreplugin/digikamimageplugin_core.desktop
+++ b/src/imageplugins/coreplugin/digikamimageplugin_core.desktop
diff --git a/digikam/imageplugins/coreplugin/digikamimageplugin_core_ui.rc b/src/imageplugins/coreplugin/digikamimageplugin_core_ui.rc
index cb1148bd..cb1148bd 100644
--- a/digikam/imageplugins/coreplugin/digikamimageplugin_core_ui.rc
+++ b/src/imageplugins/coreplugin/digikamimageplugin_core_ui.rc
diff --git a/src/imageplugins/coreplugin/hsl/Makefile.am b/src/imageplugins/coreplugin/hsl/Makefile.am
new file mode 100644
index 00000000..4465d44c
--- /dev/null
+++ b/src/imageplugins/coreplugin/hsl/Makefile.am
@@ -0,0 +1,26 @@
+noinst_LTLIBRARIES = libhsl.la
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	   -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	   -I$(top_srcdir)/src/libs/histogram \
+	   -I$(top_srcdir)/src/libs/levels \
+	   -I$(top_srcdir)/src/libs/curves \
+	   -I$(top_srcdir)/src/libs/whitebalance \
+	   -I$(top_srcdir)/src/libs/widgets/common \
+	   -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	   -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	   -I$(top_srcdir)/src/libs/dialogs \
+	   -I$(top_srcdir)/src/libs/dimg \
+	   -I$(top_srcdir)/src/libs/dmetadata \
+	   -I$(top_srcdir)/src/libs/dimg/filters \
+	   -I$(top_srcdir)/src/digikam \
+	   $(LIBKDCRAW_CFLAGS) \
+	   $(all_includes) 
+
+libhsl_la_SOURCES = hsltool.cpp hspreviewwidget.cpp 
+
+libhsl_la_LDFLAGS = $(all_libraries)
+
+noinst_HEADERS = hsltool.h hspreviewwidget.h 
+
diff --git a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp b/src/imageplugins/coreplugin/hsl/hsltool.cpp
index 5fa3d746..5fa3d746 100644
--- a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp
+++ b/src/imageplugins/coreplugin/hsl/hsltool.cpp
diff --git a/digikam/imageplugins/coreplugin/hsl/hsltool.h b/src/imageplugins/coreplugin/hsl/hsltool.h
index 751bacf3..751bacf3 100644
--- a/digikam/imageplugins/coreplugin/hsl/hsltool.h
+++ b/src/imageplugins/coreplugin/hsl/hsltool.h
diff --git a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp b/src/imageplugins/coreplugin/hsl/hspreviewwidget.cpp
index 3841ca38..3841ca38 100644
--- a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp
+++ b/src/imageplugins/coreplugin/hsl/hspreviewwidget.cpp
diff --git a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.h b/src/imageplugins/coreplugin/hsl/hspreviewwidget.h
index 3744907c..3744907c 100644
--- a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.h
+++ b/src/imageplugins/coreplugin/hsl/hspreviewwidget.h
diff --git a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp b/src/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp
index e179d36f..e179d36f 100644
--- a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp
+++ b/src/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp
diff --git a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.h b/src/imageplugins/coreplugin/hsl/imageeffect_hsl.h
index 24880f4d..24880f4d 100644
--- a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.h
+++ b/src/imageplugins/coreplugin/hsl/imageeffect_hsl.h
diff --git a/digikam/imageplugins/coreplugin/iccprooftool.cpp b/src/imageplugins/coreplugin/iccprooftool.cpp
index b74adf9a..b74adf9a 100644
--- a/digikam/imageplugins/coreplugin/iccprooftool.cpp
+++ b/src/imageplugins/coreplugin/iccprooftool.cpp
diff --git a/digikam/imageplugins/coreplugin/iccprooftool.h b/src/imageplugins/coreplugin/iccprooftool.h
index 86d93ea9..86d93ea9 100644
--- a/digikam/imageplugins/coreplugin/iccprooftool.h
+++ b/src/imageplugins/coreplugin/iccprooftool.h
diff --git a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp b/src/imageplugins/coreplugin/imageeffect_autocorrection.cpp
index 290b93cb..290b93cb 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp
+++ b/src/imageplugins/coreplugin/imageeffect_autocorrection.cpp
diff --git a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.h b/src/imageplugins/coreplugin/imageeffect_autocorrection.h
index c707ac1b..c707ac1b 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.h
+++ b/src/imageplugins/coreplugin/imageeffect_autocorrection.h
diff --git a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp b/src/imageplugins/coreplugin/imageeffect_bcg.cpp
index 9d21115d..9d21115d 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp
+++ b/src/imageplugins/coreplugin/imageeffect_bcg.cpp
diff --git a/digikam/imageplugins/coreplugin/imageeffect_bcg.h b/src/imageplugins/coreplugin/imageeffect_bcg.h
index a9cd020b..a9cd020b 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_bcg.h
+++ b/src/imageplugins/coreplugin/imageeffect_bcg.h
diff --git a/digikam/imageplugins/coreplugin/imageeffect_blur.cpp b/src/imageplugins/coreplugin/imageeffect_blur.cpp
index bd23854b..bd23854b 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_blur.cpp
+++ b/src/imageplugins/coreplugin/imageeffect_blur.cpp
diff --git a/digikam/imageplugins/coreplugin/imageeffect_blur.h b/src/imageplugins/coreplugin/imageeffect_blur.h
index eab7694e..eab7694e 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_blur.h
+++ b/src/imageplugins/coreplugin/imageeffect_blur.h
diff --git a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp b/src/imageplugins/coreplugin/imageeffect_bwsepia.cpp
index 7dcdf0da..7dcdf0da 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp
+++ b/src/imageplugins/coreplugin/imageeffect_bwsepia.cpp
diff --git a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.h b/src/imageplugins/coreplugin/imageeffect_bwsepia.h
index 74b4edf3..74b4edf3 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.h
+++ b/src/imageplugins/coreplugin/imageeffect_bwsepia.h
diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp b/src/imageplugins/coreplugin/imageeffect_iccproof.cpp
index 79a09983..79a09983 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
+++ b/src/imageplugins/coreplugin/imageeffect_iccproof.cpp
diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.h b/src/imageplugins/coreplugin/imageeffect_iccproof.h
index 58112aef..58112aef 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.h
+++ b/src/imageplugins/coreplugin/imageeffect_iccproof.h
diff --git a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp b/src/imageplugins/coreplugin/imageeffect_redeye.cpp
index df3ae2e7..df3ae2e7 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp
+++ b/src/imageplugins/coreplugin/imageeffect_redeye.cpp
diff --git a/digikam/imageplugins/coreplugin/imageeffect_redeye.h b/src/imageplugins/coreplugin/imageeffect_redeye.h
index 79b517ee..79b517ee 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_redeye.h
+++ b/src/imageplugins/coreplugin/imageeffect_redeye.h
diff --git a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp b/src/imageplugins/coreplugin/imageeffect_rgb.cpp
index fcff9c41..fcff9c41 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp
+++ b/src/imageplugins/coreplugin/imageeffect_rgb.cpp
diff --git a/digikam/imageplugins/coreplugin/imageeffect_rgb.h b/src/imageplugins/coreplugin/imageeffect_rgb.h
index 9f5db52c..9f5db52c 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_rgb.h
+++ b/src/imageplugins/coreplugin/imageeffect_rgb.h
diff --git a/digikam/imageplugins/coreplugin/imageplugin_core.cpp b/src/imageplugins/coreplugin/imageplugin_core.cpp
index 22c63b34..22c63b34 100644
--- a/digikam/imageplugins/coreplugin/imageplugin_core.cpp
+++ b/src/imageplugins/coreplugin/imageplugin_core.cpp
diff --git a/digikam/imageplugins/coreplugin/imageplugin_core.h b/src/imageplugins/coreplugin/imageplugin_core.h
index 41168d26..41168d26 100644
--- a/digikam/imageplugins/coreplugin/imageplugin_core.h
+++ b/src/imageplugins/coreplugin/imageplugin_core.h
diff --git a/src/imageplugins/coreplugin/ratiocrop/Makefile.am b/src/imageplugins/coreplugin/ratiocrop/Makefile.am
new file mode 100644
index 00000000..47ec5b58
--- /dev/null
+++ b/src/imageplugins/coreplugin/ratiocrop/Makefile.am
@@ -0,0 +1,26 @@
+noinst_LTLIBRARIES = libratiocrop.la
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	   -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	   -I$(top_srcdir)/src/libs/histogram \
+	   -I$(top_srcdir)/src/libs/levels \
+	   -I$(top_srcdir)/src/libs/curves \
+	   -I$(top_srcdir)/src/libs/whitebalance \
+	   -I$(top_srcdir)/src/libs/widgets/common \
+	   -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	   -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	   -I$(top_srcdir)/src/libs/dialogs \
+	   -I$(top_srcdir)/src/libs/dimg \
+	   -I$(top_srcdir)/src/libs/dmetadata \
+	   -I$(top_srcdir)/src/libs/dimg/filters \
+	   -I$(top_srcdir)/src/digikam \
+	   $(LIBKDCRAW_CFLAGS) \
+	   $(all_includes) 
+
+libratiocrop_la_SOURCES = ratiocroptool.cpp imageselectionwidget.cpp 
+
+libratiocrop_la_LDFLAGS = $(all_libraries)
+
+noinst_HEADERS = ratiocroptool.h imageselectionwidget.h 
+
diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp b/src/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
index 64bc7a8e..64bc7a8e 100644
--- a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
+++ b/src/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.h b/src/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.h
index ca24eeac..ca24eeac 100644
--- a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.h
+++ b/src/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.h
diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp b/src/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp
index 17eaf415..17eaf415 100644
--- a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp
+++ b/src/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp
diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h b/src/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h
index 0d2bd4fd..0d2bd4fd 100644
--- a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h
+++ b/src/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h
diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp b/src/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
index ed0e670e..ed0e670e 100644
--- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
+++ b/src/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.h b/src/imageplugins/coreplugin/ratiocrop/ratiocroptool.h
index 833677da..833677da 100644
--- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.h
+++ b/src/imageplugins/coreplugin/ratiocrop/ratiocroptool.h
diff --git a/digikam/imageplugins/coreplugin/redeyetool.cpp b/src/imageplugins/coreplugin/redeyetool.cpp
index 5b5af7e7..5b5af7e7 100644
--- a/digikam/imageplugins/coreplugin/redeyetool.cpp
+++ b/src/imageplugins/coreplugin/redeyetool.cpp
diff --git a/digikam/imageplugins/coreplugin/redeyetool.h b/src/imageplugins/coreplugin/redeyetool.h
index eb614fd3..eb614fd3 100644
--- a/digikam/imageplugins/coreplugin/redeyetool.h
+++ b/src/imageplugins/coreplugin/redeyetool.h
diff --git a/digikam/imageplugins/coreplugin/rgbtool.cpp b/src/imageplugins/coreplugin/rgbtool.cpp
index e27e396e..e27e396e 100644
--- a/digikam/imageplugins/coreplugin/rgbtool.cpp
+++ b/src/imageplugins/coreplugin/rgbtool.cpp
diff --git a/digikam/imageplugins/coreplugin/rgbtool.h b/src/imageplugins/coreplugin/rgbtool.h
index dadb6a0e..dadb6a0e 100644
--- a/digikam/imageplugins/coreplugin/rgbtool.h
+++ b/src/imageplugins/coreplugin/rgbtool.h
diff --git a/src/imageplugins/coreplugin/sharpnesseditor/Makefile.am b/src/imageplugins/coreplugin/sharpnesseditor/Makefile.am
new file mode 100644
index 00000000..c02087ee
--- /dev/null
+++ b/src/imageplugins/coreplugin/sharpnesseditor/Makefile.am
@@ -0,0 +1,32 @@
+SUBDIRS = clapack 
+COMPILE_FIRST = clapack 
+
+noinst_LTLIBRARIES = libsharpnesseditor.la
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	   -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	   -I$(top_srcdir)/src/libs/histogram \
+	   -I$(top_srcdir)/src/libs/levels \
+	   -I$(top_srcdir)/src/libs/curves \
+	   -I$(top_srcdir)/src/libs/whitebalance \
+	   -I$(top_srcdir)/src/libs/widgets/common \
+	   -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	   -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	   -I$(top_srcdir)/src/libs/dialogs \
+	   -I$(top_srcdir)/src/libs/dimg \
+	   -I$(top_srcdir)/src/libs/dmetadata \
+	   -I$(top_srcdir)/src/libs/dimg/filters \
+	   -I$(top_srcdir)/src/digikam \
+	   -I$(top_srcdir)/src/imageplugins/coreplugin/sharpnesseditor/clapack \
+	   $(LIBKDCRAW_CFLAGS) \
+	   $(all_includes) 
+
+libsharpnesseditor_la_LIBADD = $(top_builddir)/src/imageplugins/coreplugin/sharpnesseditor/clapack/liblapack.la 
+
+libsharpnesseditor_la_SOURCES = sharpentool.cpp unsharp.cpp matrix.cpp refocus.cpp 
+
+libsharpnesseditor_la_LDFLAGS = $(all_libraries)
+
+noinst_HEADERS = sharpentool.h unsharp.h matrix.h refocus.h 
+
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/LICENCE b/src/imageplugins/coreplugin/sharpnesseditor/clapack/LICENCE
index a338f860..a338f860 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/LICENCE
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/LICENCE
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/Makefile.am b/src/imageplugins/coreplugin/sharpnesseditor/clapack/Makefile.am
index bf478556..bf478556 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/Makefile.am
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/Makefile.am
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/README b/src/imageplugins/coreplugin/sharpnesseditor/clapack/README
index 530f73ee..530f73ee 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/README
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/README
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/abort_.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/abort_.c
index 67278e93..67278e93 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/abort_.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/abort_.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/blaswrap.h b/src/imageplugins/coreplugin/sharpnesseditor/clapack/blaswrap.h
index 84c08d30..84c08d30 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/blaswrap.h
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/blaswrap.h
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/clapack.h b/src/imageplugins/coreplugin/sharpnesseditor/clapack/clapack.h
index cad9a4c2..cad9a4c2 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/clapack.h
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/clapack.h
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/close.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/close.c
index d305ccf8..d305ccf8 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/close.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/close.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dgemm.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dgemm.c
index 964a278a..964a278a 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dgemm.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dgemm.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dger.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dger.c
index c53835fa..c53835fa 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dger.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dger.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dgesv.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dgesv.c
index 5c0dc52b..5c0dc52b 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dgesv.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dgesv.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dgetf2.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dgetf2.c
index 83bf1872..83bf1872 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dgetf2.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dgetf2.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dgetrf.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dgetrf.c
index 13175f01..13175f01 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dgetrf.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dgetrf.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dgetrs.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dgetrs.c
index c4dd0b38..c4dd0b38 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dgetrs.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dgetrs.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dlaswp.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dlaswp.c
index 4dd6fd7b..4dd6fd7b 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dlaswp.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dlaswp.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dscal.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dscal.c
index e0e6ffb9..e0e6ffb9 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dscal.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dscal.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dswap.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dswap.c
index 5aacf29b..5aacf29b 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dswap.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dswap.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dtrsm.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dtrsm.c
index d178c1ed..d178c1ed 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/dtrsm.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/dtrsm.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/endfile.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/endfile.c
index d309fc26..d309fc26 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/endfile.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/endfile.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/err.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/err.c
index 90af7cae..90af7cae 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/err.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/err.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/f2c.h b/src/imageplugins/coreplugin/sharpnesseditor/clapack/f2c.h
index 6514cd91..6514cd91 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/f2c.h
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/f2c.h
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fio.h b/src/imageplugins/coreplugin/sharpnesseditor/clapack/fio.h
index b1632d50..b1632d50 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fio.h
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/fio.h
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.c
index a4fcbc38..a4fcbc38 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.h b/src/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.h
index b46bc9c5..b46bc9c5 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.h
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.h
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c
index 8343337b..8343337b 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fp.h b/src/imageplugins/coreplugin/sharpnesseditor/clapack/fp.h
index 40743d79..40743d79 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fp.h
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/fp.h
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/idamax.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/idamax.c
index 2cc54813..2cc54813 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/idamax.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/idamax.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/ieeeck.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/ieeeck.c
index 39256a48..39256a48 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/ieeeck.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/ieeeck.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/ilaenv.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/ilaenv.c
index 58299fff..58299fff 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/ilaenv.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/ilaenv.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/lsame.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/lsame.c
index d9baaa3f..d9baaa3f 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/lsame.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/lsame.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/open.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/open.c
index e7810757..e7810757 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/open.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/open.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_cmp.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/s_cmp.c
index cd6a7dc4..cd6a7dc4 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_cmp.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/s_cmp.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_copy.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/s_copy.c
index 289c67dd..289c67dd 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_copy.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/s_copy.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_stop.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/s_stop.c
index 049f71b6..049f71b6 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_stop.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/s_stop.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/sfe.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/sfe.c
index 4f8907ea..4f8907ea 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/sfe.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/sfe.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/sig_die.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/sig_die.c
index 78335200..78335200 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/sig_die.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/sig_die.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/util.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/util.c
index 684cdfc4..684cdfc4 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/util.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/util.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wref.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/wref.c
index 636489c3..636489c3 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wref.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/wref.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c
index 74d1131a..74d1131a 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wsfe.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/wsfe.c
index b772df32..b772df32 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wsfe.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/wsfe.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/xerbla.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/xerbla.c
index d8ef512b..d8ef512b 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/xerbla.c
+++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/xerbla.c
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp b/src/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp
index b2ae9a62..b2ae9a62 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp
+++ b/src/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.h b/src/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.h
index fa926383..fa926383 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.h
+++ b/src/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.h
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp b/src/imageplugins/coreplugin/sharpnesseditor/matrix.cpp
index cfb8afe4..cfb8afe4 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp
+++ b/src/imageplugins/coreplugin/sharpnesseditor/matrix.cpp
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.h b/src/imageplugins/coreplugin/sharpnesseditor/matrix.h
index 6b2f65cb..6b2f65cb 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.h
+++ b/src/imageplugins/coreplugin/sharpnesseditor/matrix.h
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.cpp b/src/imageplugins/coreplugin/sharpnesseditor/refocus.cpp
index 7e99d663..7e99d663 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.cpp
+++ b/src/imageplugins/coreplugin/sharpnesseditor/refocus.cpp
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.h b/src/imageplugins/coreplugin/sharpnesseditor/refocus.h
index 323b24b9..323b24b9 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.h
+++ b/src/imageplugins/coreplugin/sharpnesseditor/refocus.h
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp b/src/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp
index aee5d841..aee5d841 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp
+++ b/src/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.h b/src/imageplugins/coreplugin/sharpnesseditor/sharpentool.h
index 8dbca1c5..8dbca1c5 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.h
+++ b/src/imageplugins/coreplugin/sharpnesseditor/sharpentool.h
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.cpp b/src/imageplugins/coreplugin/sharpnesseditor/unsharp.cpp
index fb1b9d21..fb1b9d21 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.cpp
+++ b/src/imageplugins/coreplugin/sharpnesseditor/unsharp.cpp
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.h b/src/imageplugins/coreplugin/sharpnesseditor/unsharp.h
index a1780ab4..a1780ab4 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.h
+++ b/src/imageplugins/coreplugin/sharpnesseditor/unsharp.h
diff --git a/src/imageplugins/distortionfx/Makefile.am b/src/imageplugins/distortionfx/Makefile.am
new file mode 100644
index 00000000..fcb7b74a
--- /dev/null
+++ b/src/imageplugins/distortionfx/Makefile.am
@@ -0,0 +1,34 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_distortionfx_la_SOURCES = imageplugin_distortionfx.cpp \
+	                                         distortionfxtool.cpp distortionfx.cpp
+
+digikamimageplugin_distortionfx_la_LIBADD = $(LIB_TDEPARTS) \
+	                                        $(top_builddir)/src/digikam/libdigikam.la
+
+digikamimageplugin_distortionfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_distortionfx.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_distortionfx.la 
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_distortionfx_ui.rc     
+       
diff --git a/digikam/imageplugins/distortionfx/digikamimageplugin_distortionfx.desktop b/src/imageplugins/distortionfx/digikamimageplugin_distortionfx.desktop
index 8baca4eb..8baca4eb 100644
--- a/digikam/imageplugins/distortionfx/digikamimageplugin_distortionfx.desktop
+++ b/src/imageplugins/distortionfx/digikamimageplugin_distortionfx.desktop
diff --git a/digikam/imageplugins/distortionfx/digikamimageplugin_distortionfx_ui.rc b/src/imageplugins/distortionfx/digikamimageplugin_distortionfx_ui.rc
index 99b905ad..99b905ad 100644
--- a/digikam/imageplugins/distortionfx/digikamimageplugin_distortionfx_ui.rc
+++ b/src/imageplugins/distortionfx/digikamimageplugin_distortionfx_ui.rc
diff --git a/digikam/imageplugins/distortionfx/distortionfx.cpp b/src/imageplugins/distortionfx/distortionfx.cpp
index d17abd4f..d17abd4f 100644
--- a/digikam/imageplugins/distortionfx/distortionfx.cpp
+++ b/src/imageplugins/distortionfx/distortionfx.cpp
diff --git a/digikam/imageplugins/distortionfx/distortionfx.h b/src/imageplugins/distortionfx/distortionfx.h
index 073f4df2..073f4df2 100644
--- a/digikam/imageplugins/distortionfx/distortionfx.h
+++ b/src/imageplugins/distortionfx/distortionfx.h
diff --git a/digikam/imageplugins/distortionfx/distortionfxtool.cpp b/src/imageplugins/distortionfx/distortionfxtool.cpp
index 45ff0e45..45ff0e45 100644
--- a/digikam/imageplugins/distortionfx/distortionfxtool.cpp
+++ b/src/imageplugins/distortionfx/distortionfxtool.cpp
diff --git a/digikam/imageplugins/distortionfx/distortionfxtool.h b/src/imageplugins/distortionfx/distortionfxtool.h
index bcdd6088..bcdd6088 100644
--- a/digikam/imageplugins/distortionfx/distortionfxtool.h
+++ b/src/imageplugins/distortionfx/distortionfxtool.h
diff --git a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp b/src/imageplugins/distortionfx/imageeffect_distortionfx.cpp
index 695e7749..695e7749 100644
--- a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp
+++ b/src/imageplugins/distortionfx/imageeffect_distortionfx.cpp
diff --git a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.h b/src/imageplugins/distortionfx/imageeffect_distortionfx.h
index 652b372b..652b372b 100644
--- a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.h
+++ b/src/imageplugins/distortionfx/imageeffect_distortionfx.h
diff --git a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp b/src/imageplugins/distortionfx/imageplugin_distortionfx.cpp
index 582e1b99..582e1b99 100644
--- a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp
+++ b/src/imageplugins/distortionfx/imageplugin_distortionfx.cpp
diff --git a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h b/src/imageplugins/distortionfx/imageplugin_distortionfx.h
index 2af33a14..2af33a14 100644
--- a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h
+++ b/src/imageplugins/distortionfx/imageplugin_distortionfx.h
diff --git a/src/imageplugins/emboss/Makefile.am b/src/imageplugins/emboss/Makefile.am
new file mode 100644
index 00000000..c595aa30
--- /dev/null
+++ b/src/imageplugins/emboss/Makefile.am
@@ -0,0 +1,34 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_emboss_la_SOURCES = imageplugin_emboss.cpp \
+	                                   embosstool.cpp emboss.cpp 
+
+digikamimageplugin_emboss_la_LIBADD = $(LIB_TDEPARTS) \
+	                                  $(top_builddir)/src/digikam/libdigikam.la 
+
+digikamimageplugin_emboss_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_emboss.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_emboss.la
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_emboss_ui.rc        
+
diff --git a/digikam/imageplugins/emboss/digikamimageplugin_emboss.desktop b/src/imageplugins/emboss/digikamimageplugin_emboss.desktop
index 414f235b..414f235b 100644
--- a/digikam/imageplugins/emboss/digikamimageplugin_emboss.desktop
+++ b/src/imageplugins/emboss/digikamimageplugin_emboss.desktop
diff --git a/digikam/imageplugins/emboss/digikamimageplugin_emboss_ui.rc b/src/imageplugins/emboss/digikamimageplugin_emboss_ui.rc
index 1a6943c6..1a6943c6 100644
--- a/digikam/imageplugins/emboss/digikamimageplugin_emboss_ui.rc
+++ b/src/imageplugins/emboss/digikamimageplugin_emboss_ui.rc
diff --git a/digikam/imageplugins/emboss/emboss.cpp b/src/imageplugins/emboss/emboss.cpp
index d4225148..d4225148 100644
--- a/digikam/imageplugins/emboss/emboss.cpp
+++ b/src/imageplugins/emboss/emboss.cpp
diff --git a/digikam/imageplugins/emboss/emboss.h b/src/imageplugins/emboss/emboss.h
index 470755a6..470755a6 100644
--- a/digikam/imageplugins/emboss/emboss.h
+++ b/src/imageplugins/emboss/emboss.h
diff --git a/digikam/imageplugins/emboss/embosstool.cpp b/src/imageplugins/emboss/embosstool.cpp
index f16ef4de..f16ef4de 100644
--- a/digikam/imageplugins/emboss/embosstool.cpp
+++ b/src/imageplugins/emboss/embosstool.cpp
diff --git a/digikam/imageplugins/emboss/embosstool.h b/src/imageplugins/emboss/embosstool.h
index 224858f7..224858f7 100644
--- a/digikam/imageplugins/emboss/embosstool.h
+++ b/src/imageplugins/emboss/embosstool.h
diff --git a/digikam/imageplugins/emboss/imageeffect_emboss.cpp b/src/imageplugins/emboss/imageeffect_emboss.cpp
index b4557c80..b4557c80 100644
--- a/digikam/imageplugins/emboss/imageeffect_emboss.cpp
+++ b/src/imageplugins/emboss/imageeffect_emboss.cpp
diff --git a/digikam/imageplugins/emboss/imageeffect_emboss.h b/src/imageplugins/emboss/imageeffect_emboss.h
index 19cf4f77..19cf4f77 100644
--- a/digikam/imageplugins/emboss/imageeffect_emboss.h
+++ b/src/imageplugins/emboss/imageeffect_emboss.h
diff --git a/digikam/imageplugins/emboss/imageplugin_emboss.cpp b/src/imageplugins/emboss/imageplugin_emboss.cpp
index 6bd616d6..6bd616d6 100644
--- a/digikam/imageplugins/emboss/imageplugin_emboss.cpp
+++ b/src/imageplugins/emboss/imageplugin_emboss.cpp
diff --git a/digikam/imageplugins/emboss/imageplugin_emboss.h b/src/imageplugins/emboss/imageplugin_emboss.h
index 1ccac064..1ccac064 100644
--- a/digikam/imageplugins/emboss/imageplugin_emboss.h
+++ b/src/imageplugins/emboss/imageplugin_emboss.h
diff --git a/src/imageplugins/filmgrain/Makefile.am b/src/imageplugins/filmgrain/Makefile.am
new file mode 100644
index 00000000..c23c9d8e
--- /dev/null
+++ b/src/imageplugins/filmgrain/Makefile.am
@@ -0,0 +1,34 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_filmgrain_la_SOURCES = imageplugin_filmgrain.cpp \
+	                                      filmgraintool.cpp filmgrain.cpp 
+
+digikamimageplugin_filmgrain_la_LIBADD = $(LIB_TDEPARTS) \
+	                                     $(top_builddir)/src/digikam/libdigikam.la 
+
+digikamimageplugin_filmgrain_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_filmgrain.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_filmgrain.la
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_filmgrain_ui.rc        
+
diff --git a/digikam/imageplugins/filmgrain/digikamimageplugin_filmgrain.desktop b/src/imageplugins/filmgrain/digikamimageplugin_filmgrain.desktop
index 5ad6582b..5ad6582b 100644
--- a/digikam/imageplugins/filmgrain/digikamimageplugin_filmgrain.desktop
+++ b/src/imageplugins/filmgrain/digikamimageplugin_filmgrain.desktop
diff --git a/digikam/imageplugins/filmgrain/digikamimageplugin_filmgrain_ui.rc b/src/imageplugins/filmgrain/digikamimageplugin_filmgrain_ui.rc
index 770c2dbd..770c2dbd 100644
--- a/digikam/imageplugins/filmgrain/digikamimageplugin_filmgrain_ui.rc
+++ b/src/imageplugins/filmgrain/digikamimageplugin_filmgrain_ui.rc
diff --git a/digikam/imageplugins/filmgrain/filmgrain.cpp b/src/imageplugins/filmgrain/filmgrain.cpp
index 57616eb9..57616eb9 100644
--- a/digikam/imageplugins/filmgrain/filmgrain.cpp
+++ b/src/imageplugins/filmgrain/filmgrain.cpp
diff --git a/digikam/imageplugins/filmgrain/filmgrain.h b/src/imageplugins/filmgrain/filmgrain.h
index 42bcf03c..42bcf03c 100644
--- a/digikam/imageplugins/filmgrain/filmgrain.h
+++ b/src/imageplugins/filmgrain/filmgrain.h
diff --git a/digikam/imageplugins/filmgrain/filmgraintool.cpp b/src/imageplugins/filmgrain/filmgraintool.cpp
index 5799d814..5799d814 100644
--- a/digikam/imageplugins/filmgrain/filmgraintool.cpp
+++ b/src/imageplugins/filmgrain/filmgraintool.cpp
diff --git a/digikam/imageplugins/filmgrain/filmgraintool.h b/src/imageplugins/filmgrain/filmgraintool.h
index 1a179b53..1a179b53 100644
--- a/digikam/imageplugins/filmgrain/filmgraintool.h
+++ b/src/imageplugins/filmgrain/filmgraintool.h
diff --git a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp b/src/imageplugins/filmgrain/imageeffect_filmgrain.cpp
index e008095a..e008095a 100644
--- a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp
+++ b/src/imageplugins/filmgrain/imageeffect_filmgrain.cpp
diff --git a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.h b/src/imageplugins/filmgrain/imageeffect_filmgrain.h
index ba66e0a2..ba66e0a2 100644
--- a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.h
+++ b/src/imageplugins/filmgrain/imageeffect_filmgrain.h
diff --git a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp b/src/imageplugins/filmgrain/imageplugin_filmgrain.cpp
index efa2c35d..efa2c35d 100644
--- a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp
+++ b/src/imageplugins/filmgrain/imageplugin_filmgrain.cpp
diff --git a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.h b/src/imageplugins/filmgrain/imageplugin_filmgrain.h
index 495da122..495da122 100644
--- a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.h
+++ b/src/imageplugins/filmgrain/imageplugin_filmgrain.h
diff --git a/src/imageplugins/freerotation/Makefile.am b/src/imageplugins/freerotation/Makefile.am
new file mode 100644
index 00000000..e2b67283
--- /dev/null
+++ b/src/imageplugins/freerotation/Makefile.am
@@ -0,0 +1,34 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes)
+
+digikamimageplugin_freerotation_la_SOURCES = imageplugin_freerotation.cpp \
+	                                         freerotationtool.cpp freerotation.cpp 
+
+digikamimageplugin_freerotation_la_LIBADD = $(LIB_TDEPARTS) \
+	                                        $(top_builddir)/src/digikam/libdigikam.la 
+
+digikamimageplugin_freerotation_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_freerotation.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_freerotation.la
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_freerotation_ui.rc
+
diff --git a/digikam/imageplugins/freerotation/digikamimageplugin_freerotation.desktop b/src/imageplugins/freerotation/digikamimageplugin_freerotation.desktop
index 47659a0d..47659a0d 100644
--- a/digikam/imageplugins/freerotation/digikamimageplugin_freerotation.desktop
+++ b/src/imageplugins/freerotation/digikamimageplugin_freerotation.desktop
diff --git a/digikam/imageplugins/freerotation/digikamimageplugin_freerotation_ui.rc b/src/imageplugins/freerotation/digikamimageplugin_freerotation_ui.rc
index fbbf9605..fbbf9605 100644
--- a/digikam/imageplugins/freerotation/digikamimageplugin_freerotation_ui.rc
+++ b/src/imageplugins/freerotation/digikamimageplugin_freerotation_ui.rc
diff --git a/digikam/imageplugins/freerotation/freerotation.cpp b/src/imageplugins/freerotation/freerotation.cpp
index 3f8803d5..3f8803d5 100644
--- a/digikam/imageplugins/freerotation/freerotation.cpp
+++ b/src/imageplugins/freerotation/freerotation.cpp
diff --git a/digikam/imageplugins/freerotation/freerotation.h b/src/imageplugins/freerotation/freerotation.h
index 7dc4cc8c..7dc4cc8c 100644
--- a/digikam/imageplugins/freerotation/freerotation.h
+++ b/src/imageplugins/freerotation/freerotation.h
diff --git a/digikam/imageplugins/freerotation/freerotationtool.cpp b/src/imageplugins/freerotation/freerotationtool.cpp
index b25f2196..b25f2196 100644
--- a/digikam/imageplugins/freerotation/freerotationtool.cpp
+++ b/src/imageplugins/freerotation/freerotationtool.cpp
diff --git a/digikam/imageplugins/freerotation/freerotationtool.h b/src/imageplugins/freerotation/freerotationtool.h
index fd17f4ff..fd17f4ff 100644
--- a/digikam/imageplugins/freerotation/freerotationtool.h
+++ b/src/imageplugins/freerotation/freerotationtool.h
diff --git a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp b/src/imageplugins/freerotation/imageeffect_freerotation.cpp
index bce50f07..bce50f07 100644
--- a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp
+++ b/src/imageplugins/freerotation/imageeffect_freerotation.cpp
diff --git a/digikam/imageplugins/freerotation/imageeffect_freerotation.h b/src/imageplugins/freerotation/imageeffect_freerotation.h
index a90be09d..a90be09d 100644
--- a/digikam/imageplugins/freerotation/imageeffect_freerotation.h
+++ b/src/imageplugins/freerotation/imageeffect_freerotation.h
diff --git a/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp b/src/imageplugins/freerotation/imageplugin_freerotation.cpp
index 0c04a2ca..0c04a2ca 100644
--- a/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp
+++ b/src/imageplugins/freerotation/imageplugin_freerotation.cpp
diff --git a/digikam/imageplugins/freerotation/imageplugin_freerotation.h b/src/imageplugins/freerotation/imageplugin_freerotation.h
index 2a0c2627..2a0c2627 100644
--- a/digikam/imageplugins/freerotation/imageplugin_freerotation.h
+++ b/src/imageplugins/freerotation/imageplugin_freerotation.h
diff --git a/src/imageplugins/hotpixels/Makefile.am b/src/imageplugins/hotpixels/Makefile.am
new file mode 100644
index 00000000..711fe84e
--- /dev/null
+++ b/src/imageplugins/hotpixels/Makefile.am
@@ -0,0 +1,36 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/threadimageio \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+        
+digikamimageplugin_hotpixels_la_SOURCES = blackframeparser.cpp weights.cpp \
+	                                      hotpixelfixer.cpp imageplugin_hotpixels.cpp \
+					      blackframelistview.cpp hotpixelstool.cpp 
+
+digikamimageplugin_hotpixels_la_LIBADD = $(LIB_TDEPARTS) \
+	                                     $(top_builddir)/src/digikam/libdigikam.la 
+
+digikamimageplugin_hotpixels_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_hotpixels.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_hotpixels.la 
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_hotpixels_ui.rc
+       
diff --git a/digikam/imageplugins/hotpixels/TODO b/src/imageplugins/hotpixels/TODO
index 880e1a36..880e1a36 100644
--- a/digikam/imageplugins/hotpixels/TODO
+++ b/src/imageplugins/hotpixels/TODO
diff --git a/digikam/imageplugins/hotpixels/blackframelistview.cpp b/src/imageplugins/hotpixels/blackframelistview.cpp
index 1202b094..1202b094 100644
--- a/digikam/imageplugins/hotpixels/blackframelistview.cpp
+++ b/src/imageplugins/hotpixels/blackframelistview.cpp
diff --git a/digikam/imageplugins/hotpixels/blackframelistview.h b/src/imageplugins/hotpixels/blackframelistview.h
index 977d226d..977d226d 100644
--- a/digikam/imageplugins/hotpixels/blackframelistview.h
+++ b/src/imageplugins/hotpixels/blackframelistview.h
diff --git a/digikam/imageplugins/hotpixels/blackframeparser.cpp b/src/imageplugins/hotpixels/blackframeparser.cpp
index 7306f4e6..7306f4e6 100644
--- a/digikam/imageplugins/hotpixels/blackframeparser.cpp
+++ b/src/imageplugins/hotpixels/blackframeparser.cpp
diff --git a/digikam/imageplugins/hotpixels/blackframeparser.h b/src/imageplugins/hotpixels/blackframeparser.h
index f13ebdc4..f13ebdc4 100644
--- a/digikam/imageplugins/hotpixels/blackframeparser.h
+++ b/src/imageplugins/hotpixels/blackframeparser.h
diff --git a/digikam/imageplugins/hotpixels/digikamimageplugin_hotpixels.desktop b/src/imageplugins/hotpixels/digikamimageplugin_hotpixels.desktop
index 5b12fe2c..5b12fe2c 100644
--- a/digikam/imageplugins/hotpixels/digikamimageplugin_hotpixels.desktop
+++ b/src/imageplugins/hotpixels/digikamimageplugin_hotpixels.desktop
diff --git a/digikam/imageplugins/hotpixels/digikamimageplugin_hotpixels_ui.rc b/src/imageplugins/hotpixels/digikamimageplugin_hotpixels_ui.rc
index b80d7f5a..b80d7f5a 100644
--- a/digikam/imageplugins/hotpixels/digikamimageplugin_hotpixels_ui.rc
+++ b/src/imageplugins/hotpixels/digikamimageplugin_hotpixels_ui.rc
diff --git a/digikam/imageplugins/hotpixels/hotpixel.h b/src/imageplugins/hotpixels/hotpixel.h
index bceb539f..bceb539f 100644
--- a/digikam/imageplugins/hotpixels/hotpixel.h
+++ b/src/imageplugins/hotpixels/hotpixel.h
diff --git a/digikam/imageplugins/hotpixels/hotpixelfixer.cpp b/src/imageplugins/hotpixels/hotpixelfixer.cpp
index d29b8525..d29b8525 100644
--- a/digikam/imageplugins/hotpixels/hotpixelfixer.cpp
+++ b/src/imageplugins/hotpixels/hotpixelfixer.cpp
diff --git a/digikam/imageplugins/hotpixels/hotpixelfixer.h b/src/imageplugins/hotpixels/hotpixelfixer.h
index 2bf8131c..2bf8131c 100644
--- a/digikam/imageplugins/hotpixels/hotpixelfixer.h
+++ b/src/imageplugins/hotpixels/hotpixelfixer.h
diff --git a/digikam/imageplugins/hotpixels/hotpixelstool.cpp b/src/imageplugins/hotpixels/hotpixelstool.cpp
index fbcc6c9f..fbcc6c9f 100644
--- a/digikam/imageplugins/hotpixels/hotpixelstool.cpp
+++ b/src/imageplugins/hotpixels/hotpixelstool.cpp
diff --git a/digikam/imageplugins/hotpixels/hotpixelstool.h b/src/imageplugins/hotpixels/hotpixelstool.h
index 727c6387..727c6387 100644
--- a/digikam/imageplugins/hotpixels/hotpixelstool.h
+++ b/src/imageplugins/hotpixels/hotpixelstool.h
diff --git a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp b/src/imageplugins/hotpixels/imageeffect_hotpixels.cpp
index 67e9a1b2..67e9a1b2 100644
--- a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp
+++ b/src/imageplugins/hotpixels/imageeffect_hotpixels.cpp
diff --git a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.h b/src/imageplugins/hotpixels/imageeffect_hotpixels.h
index 4a8b0868..4a8b0868 100644
--- a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.h
+++ b/src/imageplugins/hotpixels/imageeffect_hotpixels.h
diff --git a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp b/src/imageplugins/hotpixels/imageplugin_hotpixels.cpp
index 864b59dc..864b59dc 100644
--- a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp
+++ b/src/imageplugins/hotpixels/imageplugin_hotpixels.cpp
diff --git a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.h b/src/imageplugins/hotpixels/imageplugin_hotpixels.h
index c639b830..c639b830 100644
--- a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.h
+++ b/src/imageplugins/hotpixels/imageplugin_hotpixels.h
diff --git a/digikam/imageplugins/hotpixels/weights.cpp b/src/imageplugins/hotpixels/weights.cpp
index e0d3f246..e0d3f246 100644
--- a/digikam/imageplugins/hotpixels/weights.cpp
+++ b/src/imageplugins/hotpixels/weights.cpp
diff --git a/digikam/imageplugins/hotpixels/weights.h b/src/imageplugins/hotpixels/weights.h
index b82fde89..b82fde89 100644
--- a/digikam/imageplugins/hotpixels/weights.h
+++ b/src/imageplugins/hotpixels/weights.h
diff --git a/src/imageplugins/infrared/Makefile.am b/src/imageplugins/infrared/Makefile.am
new file mode 100644
index 00000000..1e9cd294
--- /dev/null
+++ b/src/imageplugins/infrared/Makefile.am
@@ -0,0 +1,34 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_infrared_la_SOURCES = imageplugin_infrared.cpp \
+	                                     infraredtool.cpp infrared.cpp 
+
+digikamimageplugin_infrared_la_LIBADD = $(LIB_TDEPARTS) \
+	                                    $(top_builddir)/src/digikam/libdigikam.la
+
+digikamimageplugin_infrared_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_infrared.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_infrared.la
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_infrared_ui.rc        
+
diff --git a/digikam/imageplugins/infrared/digikamimageplugin_infrared.desktop b/src/imageplugins/infrared/digikamimageplugin_infrared.desktop
index 716de474..716de474 100644
--- a/digikam/imageplugins/infrared/digikamimageplugin_infrared.desktop
+++ b/src/imageplugins/infrared/digikamimageplugin_infrared.desktop
diff --git a/digikam/imageplugins/infrared/digikamimageplugin_infrared_ui.rc b/src/imageplugins/infrared/digikamimageplugin_infrared_ui.rc
index 1df83fa6..1df83fa6 100644
--- a/digikam/imageplugins/infrared/digikamimageplugin_infrared_ui.rc
+++ b/src/imageplugins/infrared/digikamimageplugin_infrared_ui.rc
diff --git a/digikam/imageplugins/infrared/imageeffect_infrared.cpp b/src/imageplugins/infrared/imageeffect_infrared.cpp
index f8069255..f8069255 100644
--- a/digikam/imageplugins/infrared/imageeffect_infrared.cpp
+++ b/src/imageplugins/infrared/imageeffect_infrared.cpp
diff --git a/digikam/imageplugins/infrared/imageeffect_infrared.h b/src/imageplugins/infrared/imageeffect_infrared.h
index d6c28237..d6c28237 100644
--- a/digikam/imageplugins/infrared/imageeffect_infrared.h
+++ b/src/imageplugins/infrared/imageeffect_infrared.h
diff --git a/digikam/imageplugins/infrared/imageplugin_infrared.cpp b/src/imageplugins/infrared/imageplugin_infrared.cpp
index 4b845908..4b845908 100644
--- a/digikam/imageplugins/infrared/imageplugin_infrared.cpp
+++ b/src/imageplugins/infrared/imageplugin_infrared.cpp
diff --git a/digikam/imageplugins/infrared/imageplugin_infrared.h b/src/imageplugins/infrared/imageplugin_infrared.h
index 7b6fa12a..7b6fa12a 100644
--- a/digikam/imageplugins/infrared/imageplugin_infrared.h
+++ b/src/imageplugins/infrared/imageplugin_infrared.h
diff --git a/digikam/imageplugins/infrared/infrared.cpp b/src/imageplugins/infrared/infrared.cpp
index fa2983d5..fa2983d5 100644
--- a/digikam/imageplugins/infrared/infrared.cpp
+++ b/src/imageplugins/infrared/infrared.cpp
diff --git a/digikam/imageplugins/infrared/infrared.h b/src/imageplugins/infrared/infrared.h
index fc2f89ee..fc2f89ee 100644
--- a/digikam/imageplugins/infrared/infrared.h
+++ b/src/imageplugins/infrared/infrared.h
diff --git a/digikam/imageplugins/infrared/infraredtool.cpp b/src/imageplugins/infrared/infraredtool.cpp
index f34d1c8a..f34d1c8a 100644
--- a/digikam/imageplugins/infrared/infraredtool.cpp
+++ b/src/imageplugins/infrared/infraredtool.cpp
diff --git a/digikam/imageplugins/infrared/infraredtool.h b/src/imageplugins/infrared/infraredtool.h
index ddb5144b..ddb5144b 100644
--- a/digikam/imageplugins/infrared/infraredtool.h
+++ b/src/imageplugins/infrared/infraredtool.h
diff --git a/src/imageplugins/inpainting/Makefile.am b/src/imageplugins/inpainting/Makefile.am
new file mode 100644
index 00000000..243253a8
--- /dev/null
+++ b/src/imageplugins/inpainting/Makefile.am
@@ -0,0 +1,34 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       -I$(top_srcdir)/src/libs/greycstoration \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_inpainting_la_SOURCES = imageplugin_inpainting.cpp \
+	                                       inpaintingtool.cpp 
+
+digikamimageplugin_inpainting_la_LIBADD = $(LIB_TDEPARTS) \
+	                                      $(top_builddir)/src/digikam/libdigikam.la  
+
+digikamimageplugin_inpainting_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -no-undefined -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_inpainting.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_inpainting.la
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_inpainting_ui.rc
diff --git a/digikam/imageplugins/inpainting/digikamimageplugin_inpainting.desktop b/src/imageplugins/inpainting/digikamimageplugin_inpainting.desktop
index 09f891a7..09f891a7 100644
--- a/digikam/imageplugins/inpainting/digikamimageplugin_inpainting.desktop
+++ b/src/imageplugins/inpainting/digikamimageplugin_inpainting.desktop
diff --git a/digikam/imageplugins/inpainting/digikamimageplugin_inpainting_ui.rc b/src/imageplugins/inpainting/digikamimageplugin_inpainting_ui.rc
index a4c13901..a4c13901 100644
--- a/digikam/imageplugins/inpainting/digikamimageplugin_inpainting_ui.rc
+++ b/src/imageplugins/inpainting/digikamimageplugin_inpainting_ui.rc
diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp b/src/imageplugins/inpainting/imageeffect_inpainting.cpp
index d7f2f5fe..d7f2f5fe 100644
--- a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
+++ b/src/imageplugins/inpainting/imageeffect_inpainting.cpp
diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.h b/src/imageplugins/inpainting/imageeffect_inpainting.h
index 542e9504..542e9504 100644
--- a/digikam/imageplugins/inpainting/imageeffect_inpainting.h
+++ b/src/imageplugins/inpainting/imageeffect_inpainting.h
diff --git a/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp b/src/imageplugins/inpainting/imageplugin_inpainting.cpp
index 2c1e30f3..2c1e30f3 100644
--- a/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp
+++ b/src/imageplugins/inpainting/imageplugin_inpainting.cpp
diff --git a/digikam/imageplugins/inpainting/imageplugin_inpainting.h b/src/imageplugins/inpainting/imageplugin_inpainting.h
index fb2b1f5c..fb2b1f5c 100644
--- a/digikam/imageplugins/inpainting/imageplugin_inpainting.h
+++ b/src/imageplugins/inpainting/imageplugin_inpainting.h
diff --git a/digikam/imageplugins/inpainting/inpaintingtool.cpp b/src/imageplugins/inpainting/inpaintingtool.cpp
index 2ada52bf..2ada52bf 100644
--- a/digikam/imageplugins/inpainting/inpaintingtool.cpp
+++ b/src/imageplugins/inpainting/inpaintingtool.cpp
diff --git a/digikam/imageplugins/inpainting/inpaintingtool.h b/src/imageplugins/inpainting/inpaintingtool.h
index 44202c5d..44202c5d 100644
--- a/digikam/imageplugins/inpainting/inpaintingtool.h
+++ b/src/imageplugins/inpainting/inpaintingtool.h
diff --git a/src/imageplugins/inserttext/Makefile.am b/src/imageplugins/inserttext/Makefile.am
new file mode 100644
index 00000000..2753def7
--- /dev/null
+++ b/src/imageplugins/inserttext/Makefile.am
@@ -0,0 +1,34 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes)   
+
+digikamimageplugin_inserttext_la_SOURCES = imageplugin_inserttext.cpp inserttextwidget.cpp \
+	                                       inserttexttool.cpp fontchooserwidget.cpp 
+
+digikamimageplugin_inserttext_la_LIBADD = $(LIB_TDEPARTS) \
+	                                      $(top_builddir)/src/digikam/libdigikam.la 
+
+digikamimageplugin_inserttext_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_inserttext.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_inserttext.la 
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_inserttext_ui.rc
+
diff --git a/digikam/imageplugins/inserttext/digikamimageplugin_inserttext.desktop b/src/imageplugins/inserttext/digikamimageplugin_inserttext.desktop
index e9ca6cfd..e9ca6cfd 100644
--- a/digikam/imageplugins/inserttext/digikamimageplugin_inserttext.desktop
+++ b/src/imageplugins/inserttext/digikamimageplugin_inserttext.desktop
diff --git a/digikam/imageplugins/inserttext/digikamimageplugin_inserttext_ui.rc b/src/imageplugins/inserttext/digikamimageplugin_inserttext_ui.rc
index 4fa71fcc..4fa71fcc 100644
--- a/digikam/imageplugins/inserttext/digikamimageplugin_inserttext_ui.rc
+++ b/src/imageplugins/inserttext/digikamimageplugin_inserttext_ui.rc
diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.cpp b/src/imageplugins/inserttext/fontchooserwidget.cpp
index aa76ea8e..aa76ea8e 100644
--- a/digikam/imageplugins/inserttext/fontchooserwidget.cpp
+++ b/src/imageplugins/inserttext/fontchooserwidget.cpp
diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.h b/src/imageplugins/inserttext/fontchooserwidget.h
index 4585c231..4585c231 100644
--- a/digikam/imageplugins/inserttext/fontchooserwidget.h
+++ b/src/imageplugins/inserttext/fontchooserwidget.h
diff --git a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp b/src/imageplugins/inserttext/imageeffect_inserttext.cpp
index 3f88644b..3f88644b 100644
--- a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp
+++ b/src/imageplugins/inserttext/imageeffect_inserttext.cpp
diff --git a/digikam/imageplugins/inserttext/imageeffect_inserttext.h b/src/imageplugins/inserttext/imageeffect_inserttext.h
index 2b7c204c..2b7c204c 100644
--- a/digikam/imageplugins/inserttext/imageeffect_inserttext.h
+++ b/src/imageplugins/inserttext/imageeffect_inserttext.h
diff --git a/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp b/src/imageplugins/inserttext/imageplugin_inserttext.cpp
index a7a5ab6b..a7a5ab6b 100644
--- a/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp
+++ b/src/imageplugins/inserttext/imageplugin_inserttext.cpp
diff --git a/digikam/imageplugins/inserttext/imageplugin_inserttext.h b/src/imageplugins/inserttext/imageplugin_inserttext.h
index 427b47c6..427b47c6 100644
--- a/digikam/imageplugins/inserttext/imageplugin_inserttext.h
+++ b/src/imageplugins/inserttext/imageplugin_inserttext.h
diff --git a/digikam/imageplugins/inserttext/inserttexttool.cpp b/src/imageplugins/inserttext/inserttexttool.cpp
index 3c854896..3c854896 100644
--- a/digikam/imageplugins/inserttext/inserttexttool.cpp
+++ b/src/imageplugins/inserttext/inserttexttool.cpp
diff --git a/digikam/imageplugins/inserttext/inserttexttool.h b/src/imageplugins/inserttext/inserttexttool.h
index c148aa60..c148aa60 100644
--- a/digikam/imageplugins/inserttext/inserttexttool.h
+++ b/src/imageplugins/inserttext/inserttexttool.h
diff --git a/digikam/imageplugins/inserttext/inserttextwidget.cpp b/src/imageplugins/inserttext/inserttextwidget.cpp
index dc5b65f4..dc5b65f4 100644
--- a/digikam/imageplugins/inserttext/inserttextwidget.cpp
+++ b/src/imageplugins/inserttext/inserttextwidget.cpp
diff --git a/digikam/imageplugins/inserttext/inserttextwidget.h b/src/imageplugins/inserttext/inserttextwidget.h
index bbce9189..bbce9189 100644
--- a/digikam/imageplugins/inserttext/inserttextwidget.h
+++ b/src/imageplugins/inserttext/inserttextwidget.h
diff --git a/src/imageplugins/lensdistortion/Makefile.am b/src/imageplugins/lensdistortion/Makefile.am
new file mode 100644
index 00000000..cd157aa1
--- /dev/null
+++ b/src/imageplugins/lensdistortion/Makefile.am
@@ -0,0 +1,34 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_lensdistortion_la_SOURCES = imageplugin_lensdistortion.cpp \
+	                                           lensdistortiontool.cpp \
+	                                           lensdistortion.cpp pixelaccess.cpp 
+
+digikamimageplugin_lensdistortion_la_LIBADD = $(LIB_TDEPARTS) \
+	                                          $(top_builddir)/src/digikam/libdigikam.la 
+
+digikamimageplugin_lensdistortion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_lensdistortion.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_lensdistortion.la 
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_lensdistortion_ui.rc
diff --git a/digikam/imageplugins/lensdistortion/digikamimageplugin_lensdistortion.desktop b/src/imageplugins/lensdistortion/digikamimageplugin_lensdistortion.desktop
index da529559..da529559 100644
--- a/digikam/imageplugins/lensdistortion/digikamimageplugin_lensdistortion.desktop
+++ b/src/imageplugins/lensdistortion/digikamimageplugin_lensdistortion.desktop
diff --git a/digikam/imageplugins/lensdistortion/digikamimageplugin_lensdistortion_ui.rc b/src/imageplugins/lensdistortion/digikamimageplugin_lensdistortion_ui.rc
index 4705467e..4705467e 100644
--- a/digikam/imageplugins/lensdistortion/digikamimageplugin_lensdistortion_ui.rc
+++ b/src/imageplugins/lensdistortion/digikamimageplugin_lensdistortion_ui.rc
diff --git a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp b/src/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
index 89420a9c..89420a9c 100644
--- a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
+++ b/src/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
diff --git a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.h b/src/imageplugins/lensdistortion/imageeffect_lensdistortion.h
index 2688a5df..2688a5df 100644
--- a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.h
+++ b/src/imageplugins/lensdistortion/imageeffect_lensdistortion.h
diff --git a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp b/src/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp
index 73403fa7..73403fa7 100644
--- a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp
+++ b/src/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp
diff --git a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h b/src/imageplugins/lensdistortion/imageplugin_lensdistortion.h
index ceb24756..ceb24756 100644
--- a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h
+++ b/src/imageplugins/lensdistortion/imageplugin_lensdistortion.h
diff --git a/digikam/imageplugins/lensdistortion/lensdistortion.cpp b/src/imageplugins/lensdistortion/lensdistortion.cpp
index 7b18cc93..7b18cc93 100644
--- a/digikam/imageplugins/lensdistortion/lensdistortion.cpp
+++ b/src/imageplugins/lensdistortion/lensdistortion.cpp
diff --git a/digikam/imageplugins/lensdistortion/lensdistortion.h b/src/imageplugins/lensdistortion/lensdistortion.h
index cbc46105..cbc46105 100644
--- a/digikam/imageplugins/lensdistortion/lensdistortion.h
+++ b/src/imageplugins/lensdistortion/lensdistortion.h
diff --git a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp b/src/imageplugins/lensdistortion/lensdistortiontool.cpp
index 8d33e1df..8d33e1df 100644
--- a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp
+++ b/src/imageplugins/lensdistortion/lensdistortiontool.cpp
diff --git a/digikam/imageplugins/lensdistortion/lensdistortiontool.h b/src/imageplugins/lensdistortion/lensdistortiontool.h
index f3c7b67f..f3c7b67f 100644
--- a/digikam/imageplugins/lensdistortion/lensdistortiontool.h
+++ b/src/imageplugins/lensdistortion/lensdistortiontool.h
diff --git a/digikam/imageplugins/lensdistortion/pixelaccess.cpp b/src/imageplugins/lensdistortion/pixelaccess.cpp
index a6041f94..a6041f94 100644
--- a/digikam/imageplugins/lensdistortion/pixelaccess.cpp
+++ b/src/imageplugins/lensdistortion/pixelaccess.cpp
diff --git a/digikam/imageplugins/lensdistortion/pixelaccess.h b/src/imageplugins/lensdistortion/pixelaccess.h
index 734d0779..734d0779 100644
--- a/digikam/imageplugins/lensdistortion/pixelaccess.h
+++ b/src/imageplugins/lensdistortion/pixelaccess.h
diff --git a/src/imageplugins/noisereduction/Makefile.am b/src/imageplugins/noisereduction/Makefile.am
new file mode 100644
index 00000000..c1b6ac08
--- /dev/null
+++ b/src/imageplugins/noisereduction/Makefile.am
@@ -0,0 +1,34 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_noisereduction_la_SOURCES = imageplugin_noisereduction.cpp \
+	                                           noisereductiontool.cpp noisereduction.cpp
+
+digikamimageplugin_noisereduction_la_LIBADD = $(LIB_TDEPARTS) \
+	                                          $(top_builddir)/src/digikam/libdigikam.la 
+
+digikamimageplugin_noisereduction_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_noisereduction.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_noisereduction.la
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_noisereduction_ui.rc
+       
diff --git a/digikam/imageplugins/noisereduction/digikamimageplugin_noisereduction.desktop b/src/imageplugins/noisereduction/digikamimageplugin_noisereduction.desktop
index 9cf408e3..9cf408e3 100644
--- a/digikam/imageplugins/noisereduction/digikamimageplugin_noisereduction.desktop
+++ b/src/imageplugins/noisereduction/digikamimageplugin_noisereduction.desktop
diff --git a/digikam/imageplugins/noisereduction/digikamimageplugin_noisereduction_ui.rc b/src/imageplugins/noisereduction/digikamimageplugin_noisereduction_ui.rc
index b6a663e3..b6a663e3 100644
--- a/digikam/imageplugins/noisereduction/digikamimageplugin_noisereduction_ui.rc
+++ b/src/imageplugins/noisereduction/digikamimageplugin_noisereduction_ui.rc
diff --git a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp b/src/imageplugins/noisereduction/imageeffect_noisereduction.cpp
index 707b05db..707b05db 100644
--- a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp
+++ b/src/imageplugins/noisereduction/imageeffect_noisereduction.cpp
diff --git a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.h b/src/imageplugins/noisereduction/imageeffect_noisereduction.h
index b7ee1bb6..b7ee1bb6 100644
--- a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.h
+++ b/src/imageplugins/noisereduction/imageeffect_noisereduction.h
diff --git a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp b/src/imageplugins/noisereduction/imageplugin_noisereduction.cpp
index 8392933d..8392933d 100644
--- a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp
+++ b/src/imageplugins/noisereduction/imageplugin_noisereduction.cpp
diff --git a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.h b/src/imageplugins/noisereduction/imageplugin_noisereduction.h
index 3cbcb312..3cbcb312 100644
--- a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.h
+++ b/src/imageplugins/noisereduction/imageplugin_noisereduction.h
diff --git a/digikam/imageplugins/noisereduction/noisereduction.cpp b/src/imageplugins/noisereduction/noisereduction.cpp
index b9be4729..b9be4729 100644
--- a/digikam/imageplugins/noisereduction/noisereduction.cpp
+++ b/src/imageplugins/noisereduction/noisereduction.cpp
diff --git a/digikam/imageplugins/noisereduction/noisereduction.h b/src/imageplugins/noisereduction/noisereduction.h
index 69e14123..69e14123 100644
--- a/digikam/imageplugins/noisereduction/noisereduction.h
+++ b/src/imageplugins/noisereduction/noisereduction.h
diff --git a/digikam/imageplugins/noisereduction/noisereductiontool.cpp b/src/imageplugins/noisereduction/noisereductiontool.cpp
index d1e4908a..d1e4908a 100644
--- a/digikam/imageplugins/noisereduction/noisereductiontool.cpp
+++ b/src/imageplugins/noisereduction/noisereductiontool.cpp
diff --git a/digikam/imageplugins/noisereduction/noisereductiontool.h b/src/imageplugins/noisereduction/noisereductiontool.h
index 8d7d5828..8d7d5828 100644
--- a/digikam/imageplugins/noisereduction/noisereductiontool.h
+++ b/src/imageplugins/noisereduction/noisereductiontool.h
diff --git a/src/imageplugins/oilpaint/Makefile.am b/src/imageplugins/oilpaint/Makefile.am
new file mode 100644
index 00000000..f50d7408
--- /dev/null
+++ b/src/imageplugins/oilpaint/Makefile.am
@@ -0,0 +1,34 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_oilpaint_la_SOURCES = imageplugin_oilpaint.cpp \
+	                                     oilpainttool.cpp oilpaint.cpp 
+
+digikamimageplugin_oilpaint_la_LIBADD = $(LIB_TDEPARTS) \
+	                                    $(top_builddir)/src/digikam/libdigikam.la 
+
+digikamimageplugin_oilpaint_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_oilpaint.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_oilpaint.la 
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_oilpaint_ui.rc        
+       
diff --git a/digikam/imageplugins/oilpaint/digikamimageplugin_oilpaint.desktop b/src/imageplugins/oilpaint/digikamimageplugin_oilpaint.desktop
index 875c7f16..875c7f16 100644
--- a/digikam/imageplugins/oilpaint/digikamimageplugin_oilpaint.desktop
+++ b/src/imageplugins/oilpaint/digikamimageplugin_oilpaint.desktop
diff --git a/digikam/imageplugins/oilpaint/digikamimageplugin_oilpaint_ui.rc b/src/imageplugins/oilpaint/digikamimageplugin_oilpaint_ui.rc
index 864c09db..864c09db 100644
--- a/digikam/imageplugins/oilpaint/digikamimageplugin_oilpaint_ui.rc
+++ b/src/imageplugins/oilpaint/digikamimageplugin_oilpaint_ui.rc
diff --git a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp b/src/imageplugins/oilpaint/imageeffect_oilpaint.cpp
index da07be05..da07be05 100644
--- a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp
+++ b/src/imageplugins/oilpaint/imageeffect_oilpaint.cpp
diff --git a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.h b/src/imageplugins/oilpaint/imageeffect_oilpaint.h
index 527cc2ef..527cc2ef 100644
--- a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.h
+++ b/src/imageplugins/oilpaint/imageeffect_oilpaint.h
diff --git a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp b/src/imageplugins/oilpaint/imageplugin_oilpaint.cpp
index 740e89fc..740e89fc 100644
--- a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp
+++ b/src/imageplugins/oilpaint/imageplugin_oilpaint.cpp
diff --git a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.h b/src/imageplugins/oilpaint/imageplugin_oilpaint.h
index 032ee065..032ee065 100644
--- a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.h
+++ b/src/imageplugins/oilpaint/imageplugin_oilpaint.h
diff --git a/digikam/imageplugins/oilpaint/oilpaint.cpp b/src/imageplugins/oilpaint/oilpaint.cpp
index be9697fa..be9697fa 100644
--- a/digikam/imageplugins/oilpaint/oilpaint.cpp
+++ b/src/imageplugins/oilpaint/oilpaint.cpp
diff --git a/digikam/imageplugins/oilpaint/oilpaint.h b/src/imageplugins/oilpaint/oilpaint.h
index 998522a5..998522a5 100644
--- a/digikam/imageplugins/oilpaint/oilpaint.h
+++ b/src/imageplugins/oilpaint/oilpaint.h
diff --git a/digikam/imageplugins/oilpaint/oilpainttool.cpp b/src/imageplugins/oilpaint/oilpainttool.cpp
index 25bea302..25bea302 100644
--- a/digikam/imageplugins/oilpaint/oilpainttool.cpp
+++ b/src/imageplugins/oilpaint/oilpainttool.cpp
diff --git a/digikam/imageplugins/oilpaint/oilpainttool.h b/src/imageplugins/oilpaint/oilpainttool.h
index 9c488a57..9c488a57 100644
--- a/digikam/imageplugins/oilpaint/oilpainttool.h
+++ b/src/imageplugins/oilpaint/oilpainttool.h
diff --git a/src/imageplugins/perspective/Makefile.am b/src/imageplugins/perspective/Makefile.am
new file mode 100644
index 00000000..028add37
--- /dev/null
+++ b/src/imageplugins/perspective/Makefile.am
@@ -0,0 +1,35 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes)  
+
+digikamimageplugin_perspective_la_SOURCES = imageplugin_perspective.cpp \
+	                                        perspectivetool.cpp \
+					        perspectivewidget.cpp triangle.cpp matrix.cpp
+
+digikamimageplugin_perspective_la_LIBADD = $(LIB_TDEPARTS) \
+	                                       $(top_builddir)/src/digikam/libdigikam.la 
+	
+digikamimageplugin_perspective_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_perspective.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_perspective.la
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_perspective_ui.rc
+
diff --git a/digikam/imageplugins/perspective/digikamimageplugin_perspective.desktop b/src/imageplugins/perspective/digikamimageplugin_perspective.desktop
index a6fcc4d3..a6fcc4d3 100644
--- a/digikam/imageplugins/perspective/digikamimageplugin_perspective.desktop
+++ b/src/imageplugins/perspective/digikamimageplugin_perspective.desktop
diff --git a/digikam/imageplugins/perspective/digikamimageplugin_perspective_ui.rc b/src/imageplugins/perspective/digikamimageplugin_perspective_ui.rc
index 0f3bca57..0f3bca57 100644
--- a/digikam/imageplugins/perspective/digikamimageplugin_perspective_ui.rc
+++ b/src/imageplugins/perspective/digikamimageplugin_perspective_ui.rc
diff --git a/digikam/imageplugins/perspective/imageeffect_perspective.cpp b/src/imageplugins/perspective/imageeffect_perspective.cpp
index 15bef877..15bef877 100644
--- a/digikam/imageplugins/perspective/imageeffect_perspective.cpp
+++ b/src/imageplugins/perspective/imageeffect_perspective.cpp
diff --git a/digikam/imageplugins/perspective/imageeffect_perspective.h b/src/imageplugins/perspective/imageeffect_perspective.h
index 41388aa7..41388aa7 100644
--- a/digikam/imageplugins/perspective/imageeffect_perspective.h
+++ b/src/imageplugins/perspective/imageeffect_perspective.h
diff --git a/digikam/imageplugins/perspective/imageplugin_perspective.cpp b/src/imageplugins/perspective/imageplugin_perspective.cpp
index bb5d0444..bb5d0444 100644
--- a/digikam/imageplugins/perspective/imageplugin_perspective.cpp
+++ b/src/imageplugins/perspective/imageplugin_perspective.cpp
diff --git a/digikam/imageplugins/perspective/imageplugin_perspective.h b/src/imageplugins/perspective/imageplugin_perspective.h
index 5dee7b1b..5dee7b1b 100644
--- a/digikam/imageplugins/perspective/imageplugin_perspective.h
+++ b/src/imageplugins/perspective/imageplugin_perspective.h
diff --git a/digikam/imageplugins/perspective/matrix.cpp b/src/imageplugins/perspective/matrix.cpp
index 65723c56..65723c56 100644
--- a/digikam/imageplugins/perspective/matrix.cpp
+++ b/src/imageplugins/perspective/matrix.cpp
diff --git a/digikam/imageplugins/perspective/matrix.h b/src/imageplugins/perspective/matrix.h
index fbc5a1aa..fbc5a1aa 100644
--- a/digikam/imageplugins/perspective/matrix.h
+++ b/src/imageplugins/perspective/matrix.h
diff --git a/digikam/imageplugins/perspective/perspectivetool.cpp b/src/imageplugins/perspective/perspectivetool.cpp
index 30d0a2cf..30d0a2cf 100644
--- a/digikam/imageplugins/perspective/perspectivetool.cpp
+++ b/src/imageplugins/perspective/perspectivetool.cpp
diff --git a/digikam/imageplugins/perspective/perspectivetool.h b/src/imageplugins/perspective/perspectivetool.h
index 6186712f..6186712f 100644
--- a/digikam/imageplugins/perspective/perspectivetool.h
+++ b/src/imageplugins/perspective/perspectivetool.h
diff --git a/digikam/imageplugins/perspective/perspectivewidget.cpp b/src/imageplugins/perspective/perspectivewidget.cpp
index ae2c5c03..ae2c5c03 100644
--- a/digikam/imageplugins/perspective/perspectivewidget.cpp
+++ b/src/imageplugins/perspective/perspectivewidget.cpp
diff --git a/digikam/imageplugins/perspective/perspectivewidget.h b/src/imageplugins/perspective/perspectivewidget.h
index 0047c3e8..0047c3e8 100644
--- a/digikam/imageplugins/perspective/perspectivewidget.h
+++ b/src/imageplugins/perspective/perspectivewidget.h
diff --git a/digikam/imageplugins/perspective/triangle.cpp b/src/imageplugins/perspective/triangle.cpp
index 84f80a07..84f80a07 100644
--- a/digikam/imageplugins/perspective/triangle.cpp
+++ b/src/imageplugins/perspective/triangle.cpp
diff --git a/digikam/imageplugins/perspective/triangle.h b/src/imageplugins/perspective/triangle.h
index 27fcc087..27fcc087 100644
--- a/digikam/imageplugins/perspective/triangle.h
+++ b/src/imageplugins/perspective/triangle.h
diff --git a/src/imageplugins/raindrop/Makefile.am b/src/imageplugins/raindrop/Makefile.am
new file mode 100644
index 00000000..29899232
--- /dev/null
+++ b/src/imageplugins/raindrop/Makefile.am
@@ -0,0 +1,34 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_raindrop_la_SOURCES = imageplugin_raindrop.cpp \
+	                                     raindroptool.cpp raindrop.cpp 
+
+digikamimageplugin_raindrop_la_LIBADD = $(LIB_TDEPARTS) \
+	                                    $(top_builddir)/src/digikam/libdigikam.la
+
+digikamimageplugin_raindrop_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_raindrop.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_raindrop.la 
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_raindrop_ui.rc     
+       
diff --git a/digikam/imageplugins/raindrop/digikamimageplugin_raindrop.desktop b/src/imageplugins/raindrop/digikamimageplugin_raindrop.desktop
index 847411b7..847411b7 100644
--- a/digikam/imageplugins/raindrop/digikamimageplugin_raindrop.desktop
+++ b/src/imageplugins/raindrop/digikamimageplugin_raindrop.desktop
diff --git a/digikam/imageplugins/raindrop/digikamimageplugin_raindrop_ui.rc b/src/imageplugins/raindrop/digikamimageplugin_raindrop_ui.rc
index cf28a3f6..cf28a3f6 100644
--- a/digikam/imageplugins/raindrop/digikamimageplugin_raindrop_ui.rc
+++ b/src/imageplugins/raindrop/digikamimageplugin_raindrop_ui.rc
diff --git a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp b/src/imageplugins/raindrop/imageeffect_raindrop.cpp
index 8a82829d..8a82829d 100644
--- a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp
+++ b/src/imageplugins/raindrop/imageeffect_raindrop.cpp
diff --git a/digikam/imageplugins/raindrop/imageeffect_raindrop.h b/src/imageplugins/raindrop/imageeffect_raindrop.h
index fe567ba3..fe567ba3 100644
--- a/digikam/imageplugins/raindrop/imageeffect_raindrop.h
+++ b/src/imageplugins/raindrop/imageeffect_raindrop.h
diff --git a/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp b/src/imageplugins/raindrop/imageplugin_raindrop.cpp
index 20744961..20744961 100644
--- a/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp
+++ b/src/imageplugins/raindrop/imageplugin_raindrop.cpp
diff --git a/digikam/imageplugins/raindrop/imageplugin_raindrop.h b/src/imageplugins/raindrop/imageplugin_raindrop.h
index a85076f8..a85076f8 100644
--- a/digikam/imageplugins/raindrop/imageplugin_raindrop.h
+++ b/src/imageplugins/raindrop/imageplugin_raindrop.h
diff --git a/digikam/imageplugins/raindrop/raindrop.cpp b/src/imageplugins/raindrop/raindrop.cpp
index 7be977fc..7be977fc 100644
--- a/digikam/imageplugins/raindrop/raindrop.cpp
+++ b/src/imageplugins/raindrop/raindrop.cpp
diff --git a/digikam/imageplugins/raindrop/raindrop.h b/src/imageplugins/raindrop/raindrop.h
index 9baca0d1..9baca0d1 100644
--- a/digikam/imageplugins/raindrop/raindrop.h
+++ b/src/imageplugins/raindrop/raindrop.h
diff --git a/digikam/imageplugins/raindrop/raindroptool.cpp b/src/imageplugins/raindrop/raindroptool.cpp
index 3d19238d..3d19238d 100644
--- a/digikam/imageplugins/raindrop/raindroptool.cpp
+++ b/src/imageplugins/raindrop/raindroptool.cpp
diff --git a/digikam/imageplugins/raindrop/raindroptool.h b/src/imageplugins/raindrop/raindroptool.h
index d083eb9c..d083eb9c 100644
--- a/digikam/imageplugins/raindrop/raindroptool.h
+++ b/src/imageplugins/raindrop/raindroptool.h
diff --git a/src/imageplugins/restoration/Makefile.am b/src/imageplugins/restoration/Makefile.am
new file mode 100644
index 00000000..695609be
--- /dev/null
+++ b/src/imageplugins/restoration/Makefile.am
@@ -0,0 +1,35 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       -I$(top_srcdir)/src/libs/greycstoration \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_restoration_la_SOURCES = imageplugin_restoration.cpp \
+	                                        restorationtool.cpp 
+
+digikamimageplugin_restoration_la_LIBADD = $(LIB_TDEPARTS) \
+	                                       $(top_builddir)/src/digikam/libdigikam.la 
+
+digikamimageplugin_restoration_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -no-undefined -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_restoration.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_restoration.la
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_restoration_ui.rc
+
diff --git a/digikam/imageplugins/restoration/digikamimageplugin_restoration.desktop b/src/imageplugins/restoration/digikamimageplugin_restoration.desktop
index 8d0e7bd8..8d0e7bd8 100644
--- a/digikam/imageplugins/restoration/digikamimageplugin_restoration.desktop
+++ b/src/imageplugins/restoration/digikamimageplugin_restoration.desktop
diff --git a/digikam/imageplugins/restoration/digikamimageplugin_restoration_ui.rc b/src/imageplugins/restoration/digikamimageplugin_restoration_ui.rc
index 27185294..27185294 100644
--- a/digikam/imageplugins/restoration/digikamimageplugin_restoration_ui.rc
+++ b/src/imageplugins/restoration/digikamimageplugin_restoration_ui.rc
diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.cpp b/src/imageplugins/restoration/imageeffect_restoration.cpp
index 825ef23d..825ef23d 100644
--- a/digikam/imageplugins/restoration/imageeffect_restoration.cpp
+++ b/src/imageplugins/restoration/imageeffect_restoration.cpp
diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.h b/src/imageplugins/restoration/imageeffect_restoration.h
index 7c28bd92..7c28bd92 100644
--- a/digikam/imageplugins/restoration/imageeffect_restoration.h
+++ b/src/imageplugins/restoration/imageeffect_restoration.h
diff --git a/digikam/imageplugins/restoration/imageplugin_restoration.cpp b/src/imageplugins/restoration/imageplugin_restoration.cpp
index 01cd52f7..01cd52f7 100644
--- a/digikam/imageplugins/restoration/imageplugin_restoration.cpp
+++ b/src/imageplugins/restoration/imageplugin_restoration.cpp
diff --git a/digikam/imageplugins/restoration/imageplugin_restoration.h b/src/imageplugins/restoration/imageplugin_restoration.h
index 50ac8326..50ac8326 100644
--- a/digikam/imageplugins/restoration/imageplugin_restoration.h
+++ b/src/imageplugins/restoration/imageplugin_restoration.h
diff --git a/digikam/imageplugins/restoration/restorationtool.cpp b/src/imageplugins/restoration/restorationtool.cpp
index a6896135..a6896135 100644
--- a/digikam/imageplugins/restoration/restorationtool.cpp
+++ b/src/imageplugins/restoration/restorationtool.cpp
diff --git a/digikam/imageplugins/restoration/restorationtool.h b/src/imageplugins/restoration/restorationtool.h
index 6242a2b6..6242a2b6 100644
--- a/digikam/imageplugins/restoration/restorationtool.h
+++ b/src/imageplugins/restoration/restorationtool.h
diff --git a/src/imageplugins/sheartool/Makefile.am b/src/imageplugins/sheartool/Makefile.am
new file mode 100644
index 00000000..a601b8a5
--- /dev/null
+++ b/src/imageplugins/sheartool/Makefile.am
@@ -0,0 +1,33 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes)  
+
+digikamimageplugin_sheartool_la_SOURCES = imageplugin_sheartool.cpp shear.cpp \
+	                                      sheartool.cpp 
+
+digikamimageplugin_sheartool_la_LIBADD = $(LIB_TDEPARTS) \
+	                                     $(top_builddir)/src/digikam/libdigikam.la 
+
+digikamimageplugin_sheartool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_sheartool.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_sheartool.la
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_sheartool_ui.rc
diff --git a/digikam/imageplugins/sheartool/digikamimageplugin_sheartool.desktop b/src/imageplugins/sheartool/digikamimageplugin_sheartool.desktop
index 8884ef27..8884ef27 100644
--- a/digikam/imageplugins/sheartool/digikamimageplugin_sheartool.desktop
+++ b/src/imageplugins/sheartool/digikamimageplugin_sheartool.desktop
diff --git a/digikam/imageplugins/sheartool/digikamimageplugin_sheartool_ui.rc b/src/imageplugins/sheartool/digikamimageplugin_sheartool_ui.rc
index 0a2cf60a..0a2cf60a 100644
--- a/digikam/imageplugins/sheartool/digikamimageplugin_sheartool_ui.rc
+++ b/src/imageplugins/sheartool/digikamimageplugin_sheartool_ui.rc
diff --git a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp b/src/imageplugins/sheartool/imageeffect_sheartool.cpp
index e65bd91b..e65bd91b 100644
--- a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp
+++ b/src/imageplugins/sheartool/imageeffect_sheartool.cpp
diff --git a/digikam/imageplugins/sheartool/imageeffect_sheartool.h b/src/imageplugins/sheartool/imageeffect_sheartool.h
index 311b4e0d..311b4e0d 100644
--- a/digikam/imageplugins/sheartool/imageeffect_sheartool.h
+++ b/src/imageplugins/sheartool/imageeffect_sheartool.h
diff --git a/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp b/src/imageplugins/sheartool/imageplugin_sheartool.cpp
index 34030899..34030899 100644
--- a/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp
+++ b/src/imageplugins/sheartool/imageplugin_sheartool.cpp
diff --git a/digikam/imageplugins/sheartool/imageplugin_sheartool.h b/src/imageplugins/sheartool/imageplugin_sheartool.h
index 2423a1b1..2423a1b1 100644
--- a/digikam/imageplugins/sheartool/imageplugin_sheartool.h
+++ b/src/imageplugins/sheartool/imageplugin_sheartool.h
diff --git a/digikam/imageplugins/sheartool/shear.cpp b/src/imageplugins/sheartool/shear.cpp
index 29af5390..29af5390 100644
--- a/digikam/imageplugins/sheartool/shear.cpp
+++ b/src/imageplugins/sheartool/shear.cpp
diff --git a/digikam/imageplugins/sheartool/shear.h b/src/imageplugins/sheartool/shear.h
index 480d1084..480d1084 100644
--- a/digikam/imageplugins/sheartool/shear.h
+++ b/src/imageplugins/sheartool/shear.h
diff --git a/digikam/imageplugins/sheartool/sheartool.cpp b/src/imageplugins/sheartool/sheartool.cpp
index 9f65b6d3..9f65b6d3 100644
--- a/digikam/imageplugins/sheartool/sheartool.cpp
+++ b/src/imageplugins/sheartool/sheartool.cpp
diff --git a/digikam/imageplugins/sheartool/sheartool.h b/src/imageplugins/sheartool/sheartool.h
index 1c8161b4..1c8161b4 100644
--- a/digikam/imageplugins/sheartool/sheartool.h
+++ b/src/imageplugins/sheartool/sheartool.h
diff --git a/src/imageplugins/superimpose/Makefile.am b/src/imageplugins/superimpose/Makefile.am
new file mode 100644
index 00000000..686eff2a
--- /dev/null
+++ b/src/imageplugins/superimpose/Makefile.am
@@ -0,0 +1,35 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/libs/thumbbar \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_superimpose_la_SOURCES = superimposewidget.cpp superimpose.cpp dirselectwidget.cpp \
+	                                        imageplugin_superimpose.cpp superimposetool.cpp 
+	                                        
+
+digikamimageplugin_superimpose_la_LIBADD = $(LIB_TDEPARTS) \
+	                                       $(top_builddir)/src/digikam/libdigikam.la 
+
+digikamimageplugin_superimpose_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_superimpose.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_superimpose.la
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_superimpose_ui.rc
diff --git a/digikam/imageplugins/superimpose/digikamimageplugin_superimpose.desktop b/src/imageplugins/superimpose/digikamimageplugin_superimpose.desktop
index ef395a4a..ef395a4a 100644
--- a/digikam/imageplugins/superimpose/digikamimageplugin_superimpose.desktop
+++ b/src/imageplugins/superimpose/digikamimageplugin_superimpose.desktop
diff --git a/digikam/imageplugins/superimpose/digikamimageplugin_superimpose_ui.rc b/src/imageplugins/superimpose/digikamimageplugin_superimpose_ui.rc
index ced7edac..ced7edac 100644
--- a/digikam/imageplugins/superimpose/digikamimageplugin_superimpose_ui.rc
+++ b/src/imageplugins/superimpose/digikamimageplugin_superimpose_ui.rc
diff --git a/digikam/imageplugins/superimpose/dirselectwidget.cpp b/src/imageplugins/superimpose/dirselectwidget.cpp
index 4856d73c..4856d73c 100644
--- a/digikam/imageplugins/superimpose/dirselectwidget.cpp
+++ b/src/imageplugins/superimpose/dirselectwidget.cpp
diff --git a/digikam/imageplugins/superimpose/dirselectwidget.h b/src/imageplugins/superimpose/dirselectwidget.h
index 1ee4abc2..1ee4abc2 100644
--- a/digikam/imageplugins/superimpose/dirselectwidget.h
+++ b/src/imageplugins/superimpose/dirselectwidget.h
diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp b/src/imageplugins/superimpose/imageeffect_superimpose.cpp
index 1cea3e08..1cea3e08 100644
--- a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
+++ b/src/imageplugins/superimpose/imageeffect_superimpose.cpp
diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.h b/src/imageplugins/superimpose/imageeffect_superimpose.h
index 8eb8c18f..8eb8c18f 100644
--- a/digikam/imageplugins/superimpose/imageeffect_superimpose.h
+++ b/src/imageplugins/superimpose/imageeffect_superimpose.h
diff --git a/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp b/src/imageplugins/superimpose/imageplugin_superimpose.cpp
index ceba44ef..ceba44ef 100644
--- a/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp
+++ b/src/imageplugins/superimpose/imageplugin_superimpose.cpp
diff --git a/digikam/imageplugins/superimpose/imageplugin_superimpose.h b/src/imageplugins/superimpose/imageplugin_superimpose.h
index 6f3c3a69..6f3c3a69 100644
--- a/digikam/imageplugins/superimpose/imageplugin_superimpose.h
+++ b/src/imageplugins/superimpose/imageplugin_superimpose.h
diff --git a/digikam/imageplugins/superimpose/superimpose.cpp b/src/imageplugins/superimpose/superimpose.cpp
index 7c0ac74b..7c0ac74b 100644
--- a/digikam/imageplugins/superimpose/superimpose.cpp
+++ b/src/imageplugins/superimpose/superimpose.cpp
diff --git a/digikam/imageplugins/superimpose/superimpose.h b/src/imageplugins/superimpose/superimpose.h
index a0b7b6da..a0b7b6da 100644
--- a/digikam/imageplugins/superimpose/superimpose.h
+++ b/src/imageplugins/superimpose/superimpose.h
diff --git a/digikam/imageplugins/superimpose/superimposetool.cpp b/src/imageplugins/superimpose/superimposetool.cpp
index f035559c..f035559c 100644
--- a/digikam/imageplugins/superimpose/superimposetool.cpp
+++ b/src/imageplugins/superimpose/superimposetool.cpp
diff --git a/digikam/imageplugins/superimpose/superimposetool.h b/src/imageplugins/superimpose/superimposetool.h
index 7501f23f..7501f23f 100644
--- a/digikam/imageplugins/superimpose/superimposetool.h
+++ b/src/imageplugins/superimpose/superimposetool.h
diff --git a/digikam/imageplugins/superimpose/superimposewidget.cpp b/src/imageplugins/superimpose/superimposewidget.cpp
index edae15aa..edae15aa 100644
--- a/digikam/imageplugins/superimpose/superimposewidget.cpp
+++ b/src/imageplugins/superimpose/superimposewidget.cpp
diff --git a/digikam/imageplugins/superimpose/superimposewidget.h b/src/imageplugins/superimpose/superimposewidget.h
index 8b3fb048..8b3fb048 100644
--- a/digikam/imageplugins/superimpose/superimposewidget.h
+++ b/src/imageplugins/superimpose/superimposewidget.h
diff --git a/src/imageplugins/texture/Makefile.am b/src/imageplugins/texture/Makefile.am
new file mode 100644
index 00000000..22697c65
--- /dev/null
+++ b/src/imageplugins/texture/Makefile.am
@@ -0,0 +1,35 @@
+METASOURCES = AUTO
+SUBDIRS = patterns
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_texture_la_SOURCES = imageplugin_texture.cpp \
+	                                    texturetool.cpp texture.cpp 
+
+digikamimageplugin_texture_la_LIBADD = $(LIB_TDEPARTS) \
+	                                   $(top_builddir)/src/digikam/libdigikam.la  
+
+digikamimageplugin_texture_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_texture.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_texture.la
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_texture_ui.rc        
+
diff --git a/digikam/imageplugins/texture/digikamimageplugin_texture.desktop b/src/imageplugins/texture/digikamimageplugin_texture.desktop
index 4caf7e41..4caf7e41 100644
--- a/digikam/imageplugins/texture/digikamimageplugin_texture.desktop
+++ b/src/imageplugins/texture/digikamimageplugin_texture.desktop
diff --git a/digikam/imageplugins/texture/digikamimageplugin_texture_ui.rc b/src/imageplugins/texture/digikamimageplugin_texture_ui.rc
index 122833cc..122833cc 100644
--- a/digikam/imageplugins/texture/digikamimageplugin_texture_ui.rc
+++ b/src/imageplugins/texture/digikamimageplugin_texture_ui.rc
diff --git a/digikam/imageplugins/texture/imageeffect_texture.cpp b/src/imageplugins/texture/imageeffect_texture.cpp
index 5f5d7e9f..5f5d7e9f 100644
--- a/digikam/imageplugins/texture/imageeffect_texture.cpp
+++ b/src/imageplugins/texture/imageeffect_texture.cpp
diff --git a/digikam/imageplugins/texture/imageeffect_texture.h b/src/imageplugins/texture/imageeffect_texture.h
index d37068b6..d37068b6 100644
--- a/digikam/imageplugins/texture/imageeffect_texture.h
+++ b/src/imageplugins/texture/imageeffect_texture.h
diff --git a/digikam/imageplugins/texture/imageplugin_texture.cpp b/src/imageplugins/texture/imageplugin_texture.cpp
index ec0e3ba8..ec0e3ba8 100644
--- a/digikam/imageplugins/texture/imageplugin_texture.cpp
+++ b/src/imageplugins/texture/imageplugin_texture.cpp
diff --git a/digikam/imageplugins/texture/imageplugin_texture.h b/src/imageplugins/texture/imageplugin_texture.h
index bae2ba5e..bae2ba5e 100644
--- a/digikam/imageplugins/texture/imageplugin_texture.h
+++ b/src/imageplugins/texture/imageplugin_texture.h
diff --git a/digikam/imageplugins/texture/patterns/Makefile.am b/src/imageplugins/texture/patterns/Makefile.am
index 414c7f20..414c7f20 100644
--- a/digikam/imageplugins/texture/patterns/Makefile.am
+++ b/src/imageplugins/texture/patterns/Makefile.am
diff --git a/digikam/imageplugins/texture/patterns/bluejean-texture.png b/src/imageplugins/texture/patterns/bluejean-texture.png
index 3885d60b..3885d60b 100644
--- a/digikam/imageplugins/texture/patterns/bluejean-texture.png
+++ b/src/imageplugins/texture/patterns/bluejean-texture.png
diff --git a/digikam/imageplugins/texture/patterns/bricks-texture.png b/src/imageplugins/texture/patterns/bricks-texture.png
index 0ebfa881..0ebfa881 100644
--- a/digikam/imageplugins/texture/patterns/bricks-texture.png
+++ b/src/imageplugins/texture/patterns/bricks-texture.png
diff --git a/digikam/imageplugins/texture/patterns/bricks2-texture.png b/src/imageplugins/texture/patterns/bricks2-texture.png
index 985c5e84..985c5e84 100644
--- a/digikam/imageplugins/texture/patterns/bricks2-texture.png
+++ b/src/imageplugins/texture/patterns/bricks2-texture.png
diff --git a/digikam/imageplugins/texture/patterns/burlap-texture.png b/src/imageplugins/texture/patterns/burlap-texture.png
index 04494770..04494770 100644
--- a/digikam/imageplugins/texture/patterns/burlap-texture.png
+++ b/src/imageplugins/texture/patterns/burlap-texture.png
diff --git a/digikam/imageplugins/texture/patterns/canvas-texture.png b/src/imageplugins/texture/patterns/canvas-texture.png
index 6aa3df8e..6aa3df8e 100644
--- a/digikam/imageplugins/texture/patterns/canvas-texture.png
+++ b/src/imageplugins/texture/patterns/canvas-texture.png
diff --git a/digikam/imageplugins/texture/patterns/cellwood-texture.png b/src/imageplugins/texture/patterns/cellwood-texture.png
index b94f618c..b94f618c 100644
--- a/digikam/imageplugins/texture/patterns/cellwood-texture.png
+++ b/src/imageplugins/texture/patterns/cellwood-texture.png
diff --git a/digikam/imageplugins/texture/patterns/fabric-texture.png b/src/imageplugins/texture/patterns/fabric-texture.png
index ac88eb74..ac88eb74 100644
--- a/digikam/imageplugins/texture/patterns/fabric-texture.png
+++ b/src/imageplugins/texture/patterns/fabric-texture.png
diff --git a/digikam/imageplugins/texture/patterns/marble-texture.png b/src/imageplugins/texture/patterns/marble-texture.png
index c22ab4ed..c22ab4ed 100644
--- a/digikam/imageplugins/texture/patterns/marble-texture.png
+++ b/src/imageplugins/texture/patterns/marble-texture.png
diff --git a/digikam/imageplugins/texture/patterns/marble2-texture.png b/src/imageplugins/texture/patterns/marble2-texture.png
index 45b77f05..45b77f05 100644
--- a/digikam/imageplugins/texture/patterns/marble2-texture.png
+++ b/src/imageplugins/texture/patterns/marble2-texture.png
diff --git a/digikam/imageplugins/texture/patterns/metalwire-texture.png b/src/imageplugins/texture/patterns/metalwire-texture.png
index cf0b402c..cf0b402c 100644
--- a/digikam/imageplugins/texture/patterns/metalwire-texture.png
+++ b/src/imageplugins/texture/patterns/metalwire-texture.png
diff --git a/digikam/imageplugins/texture/patterns/modern-texture.png b/src/imageplugins/texture/patterns/modern-texture.png
index 45ed8b7a..45ed8b7a 100644
--- a/digikam/imageplugins/texture/patterns/modern-texture.png
+++ b/src/imageplugins/texture/patterns/modern-texture.png
diff --git a/digikam/imageplugins/texture/patterns/moss-texture.png b/src/imageplugins/texture/patterns/moss-texture.png
index 9403189f..9403189f 100644
--- a/digikam/imageplugins/texture/patterns/moss-texture.png
+++ b/src/imageplugins/texture/patterns/moss-texture.png
diff --git a/digikam/imageplugins/texture/patterns/paper-texture.png b/src/imageplugins/texture/patterns/paper-texture.png
index c9c90205..c9c90205 100644
--- a/digikam/imageplugins/texture/patterns/paper-texture.png
+++ b/src/imageplugins/texture/patterns/paper-texture.png
diff --git a/digikam/imageplugins/texture/patterns/paper2-texture.png b/src/imageplugins/texture/patterns/paper2-texture.png
index 36817ffd..36817ffd 100644
--- a/digikam/imageplugins/texture/patterns/paper2-texture.png
+++ b/src/imageplugins/texture/patterns/paper2-texture.png
diff --git a/digikam/imageplugins/texture/patterns/stone-texture.png b/src/imageplugins/texture/patterns/stone-texture.png
index 6f26b474..6f26b474 100644
--- a/digikam/imageplugins/texture/patterns/stone-texture.png
+++ b/src/imageplugins/texture/patterns/stone-texture.png
diff --git a/digikam/imageplugins/texture/patterns/wall-texture.png b/src/imageplugins/texture/patterns/wall-texture.png
index d7322500..d7322500 100644
--- a/digikam/imageplugins/texture/patterns/wall-texture.png
+++ b/src/imageplugins/texture/patterns/wall-texture.png
diff --git a/digikam/imageplugins/texture/texture.cpp b/src/imageplugins/texture/texture.cpp
index 42477d5d..42477d5d 100644
--- a/digikam/imageplugins/texture/texture.cpp
+++ b/src/imageplugins/texture/texture.cpp
diff --git a/digikam/imageplugins/texture/texture.h b/src/imageplugins/texture/texture.h
index 1bcda2ff..1bcda2ff 100644
--- a/digikam/imageplugins/texture/texture.h
+++ b/src/imageplugins/texture/texture.h
diff --git a/digikam/imageplugins/texture/texturetool.cpp b/src/imageplugins/texture/texturetool.cpp
index 71e29aea..71e29aea 100644
--- a/digikam/imageplugins/texture/texturetool.cpp
+++ b/src/imageplugins/texture/texturetool.cpp
diff --git a/digikam/imageplugins/texture/texturetool.h b/src/imageplugins/texture/texturetool.h
index 1287bb3e..1287bb3e 100644
--- a/digikam/imageplugins/texture/texturetool.h
+++ b/src/imageplugins/texture/texturetool.h
diff --git a/src/imageplugins/whitebalance/Makefile.am b/src/imageplugins/whitebalance/Makefile.am
new file mode 100644
index 00000000..b53cf65a
--- /dev/null
+++ b/src/imageplugins/whitebalance/Makefile.am
@@ -0,0 +1,33 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/whitebalance \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
+	       $(all_includes) 
+
+digikamimageplugin_whitebalance_la_SOURCES = imageplugin_whitebalance.cpp \
+	                                         whitebalancetool.cpp 
+
+digikamimageplugin_whitebalance_la_LIBADD = $(LIB_TDEPARTS) \
+	                                        $(top_builddir)/src/digikam/libdigikam.la  
+
+digikamimageplugin_whitebalance_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio
+
+kde_services_DATA = digikamimageplugin_whitebalance.desktop
+
+kde_module_LTLIBRARIES = digikamimageplugin_whitebalance.la
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimageplugin_whitebalance_ui.rc
diff --git a/digikam/imageplugins/whitebalance/digikamimageplugin_whitebalance.desktop b/src/imageplugins/whitebalance/digikamimageplugin_whitebalance.desktop
index df425c58..df425c58 100644
--- a/digikam/imageplugins/whitebalance/digikamimageplugin_whitebalance.desktop
+++ b/src/imageplugins/whitebalance/digikamimageplugin_whitebalance.desktop
diff --git a/digikam/imageplugins/whitebalance/digikamimageplugin_whitebalance_ui.rc b/src/imageplugins/whitebalance/digikamimageplugin_whitebalance_ui.rc
index 9bdf8247..9bdf8247 100644
--- a/digikam/imageplugins/whitebalance/digikamimageplugin_whitebalance_ui.rc
+++ b/src/imageplugins/whitebalance/digikamimageplugin_whitebalance_ui.rc
diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/src/imageplugins/whitebalance/imageeffect_whitebalance.cpp
index f72609dd..f72609dd 100644
--- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
+++ b/src/imageplugins/whitebalance/imageeffect_whitebalance.cpp
diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h b/src/imageplugins/whitebalance/imageeffect_whitebalance.h
index 6bef5607..6bef5607 100644
--- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h
+++ b/src/imageplugins/whitebalance/imageeffect_whitebalance.h
diff --git a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp b/src/imageplugins/whitebalance/imageplugin_whitebalance.cpp
index 071097fe..071097fe 100644
--- a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp
+++ b/src/imageplugins/whitebalance/imageplugin_whitebalance.cpp
diff --git a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h b/src/imageplugins/whitebalance/imageplugin_whitebalance.h
index afc870c1..afc870c1 100644
--- a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h
+++ b/src/imageplugins/whitebalance/imageplugin_whitebalance.h
diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.cpp b/src/imageplugins/whitebalance/whitebalancetool.cpp
index fdbe723a..fdbe723a 100644
--- a/digikam/imageplugins/whitebalance/whitebalancetool.cpp
+++ b/src/imageplugins/whitebalance/whitebalancetool.cpp
diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.h b/src/imageplugins/whitebalance/whitebalancetool.h
index 2df2877e..2df2877e 100644
--- a/digikam/imageplugins/whitebalance/whitebalancetool.h
+++ b/src/imageplugins/whitebalance/whitebalancetool.h
diff --git a/digikam/libs/Makefile.am b/src/libs/Makefile.am
index a9af1e06..a9af1e06 100644
--- a/digikam/libs/Makefile.am
+++ b/src/libs/Makefile.am
diff --git a/digikam/libs/curves/Makefile.am b/src/libs/curves/Makefile.am
index 2fbb4386..f183fcc7 100644
--- a/digikam/libs/curves/Makefile.am
+++ b/src/libs/curves/Makefile.am
@@ -6,9 +6,9 @@ libcurves_la_SOURCES = imagecurves.cpp
 
 libcurves_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/digikam \
+INCLUDES = -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/digikam \
 	       $(all_includes) 
 
 digikaminclude_HEADERS = imagecurves.h 
diff --git a/digikam/libs/curves/imagecurves.cpp b/src/libs/curves/imagecurves.cpp
index c5e067eb..c5e067eb 100644
--- a/digikam/libs/curves/imagecurves.cpp
+++ b/src/libs/curves/imagecurves.cpp
diff --git a/digikam/libs/curves/imagecurves.h b/src/libs/curves/imagecurves.h
index 69d33c08..69d33c08 100644
--- a/digikam/libs/curves/imagecurves.h
+++ b/src/libs/curves/imagecurves.h
diff --git a/digikam/libs/dialogs/Makefile.am b/src/libs/dialogs/Makefile.am
index 9ac11099..19d50423 100644
--- a/digikam/libs/dialogs/Makefile.am
+++ b/src/libs/dialogs/Makefile.am
@@ -15,16 +15,16 @@ libdialog_la_SOURCES = deletedialogbase.ui imagedialog.cpp rawcameradlg.cpp \
 
 libdialog_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-INCLUDES = -I$(top_srcdir)/digikam/digikam \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/thumbbar \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/widgets/metadata \
-	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
+INCLUDES = -I$(top_srcdir)/src/digikam \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/thumbbar \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/widgets/metadata \
+	       -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
 	       $(LIBKDCRAW_CFLAGS) \
 	       $(LIBKEXIV2_CFLAGS) \
 	       $(all_includes)
diff --git a/digikam/libs/dialogs/ctrlpaneldlg.cpp b/src/libs/dialogs/ctrlpaneldlg.cpp
index 450d380f..450d380f 100644
--- a/digikam/libs/dialogs/ctrlpaneldlg.cpp
+++ b/src/libs/dialogs/ctrlpaneldlg.cpp
diff --git a/digikam/libs/dialogs/ctrlpaneldlg.h b/src/libs/dialogs/ctrlpaneldlg.h
index eb60877e..eb60877e 100644
--- a/digikam/libs/dialogs/ctrlpaneldlg.h
+++ b/src/libs/dialogs/ctrlpaneldlg.h
diff --git a/digikam/libs/dialogs/deletedialog.cpp b/src/libs/dialogs/deletedialog.cpp
index 1db9b9c4..1db9b9c4 100644
--- a/digikam/libs/dialogs/deletedialog.cpp
+++ b/src/libs/dialogs/deletedialog.cpp
diff --git a/digikam/libs/dialogs/deletedialog.h b/src/libs/dialogs/deletedialog.h
index 16ab9f89..16ab9f89 100644
--- a/digikam/libs/dialogs/deletedialog.h
+++ b/src/libs/dialogs/deletedialog.h
diff --git a/digikam/libs/dialogs/deletedialogbase.ui b/src/libs/dialogs/deletedialogbase.ui
index 8527a903..8527a903 100644
--- a/digikam/libs/dialogs/deletedialogbase.ui
+++ b/src/libs/dialogs/deletedialogbase.ui
diff --git a/digikam/libs/dialogs/dprogressdlg.cpp b/src/libs/dialogs/dprogressdlg.cpp
index d4b0dc29..d4b0dc29 100644
--- a/digikam/libs/dialogs/dprogressdlg.cpp
+++ b/src/libs/dialogs/dprogressdlg.cpp
diff --git a/digikam/libs/dialogs/dprogressdlg.h b/src/libs/dialogs/dprogressdlg.h
index d75f509d..d75f509d 100644
--- a/digikam/libs/dialogs/dprogressdlg.h
+++ b/src/libs/dialogs/dprogressdlg.h
diff --git a/digikam/libs/dialogs/iccprofileinfodlg.cpp b/src/libs/dialogs/iccprofileinfodlg.cpp
index 04f30c0c..04f30c0c 100644
--- a/digikam/libs/dialogs/iccprofileinfodlg.cpp
+++ b/src/libs/dialogs/iccprofileinfodlg.cpp
diff --git a/digikam/libs/dialogs/iccprofileinfodlg.h b/src/libs/dialogs/iccprofileinfodlg.h
index abcc1ed8..abcc1ed8 100644
--- a/digikam/libs/dialogs/iccprofileinfodlg.h
+++ b/src/libs/dialogs/iccprofileinfodlg.h
diff --git a/digikam/libs/dialogs/imagedialog.cpp b/src/libs/dialogs/imagedialog.cpp
index d052a2af..d052a2af 100644
--- a/digikam/libs/dialogs/imagedialog.cpp
+++ b/src/libs/dialogs/imagedialog.cpp
diff --git a/digikam/libs/dialogs/imagedialog.h b/src/libs/dialogs/imagedialog.h
index 275765cd..275765cd 100644
--- a/digikam/libs/dialogs/imagedialog.h
+++ b/src/libs/dialogs/imagedialog.h
diff --git a/digikam/libs/dialogs/imagedlgbase.cpp b/src/libs/dialogs/imagedlgbase.cpp
index 61666406..61666406 100644
--- a/digikam/libs/dialogs/imagedlgbase.cpp
+++ b/src/libs/dialogs/imagedlgbase.cpp
diff --git a/digikam/libs/dialogs/imagedlgbase.h b/src/libs/dialogs/imagedlgbase.h
index 97dc6a35..97dc6a35 100644
--- a/digikam/libs/dialogs/imagedlgbase.h
+++ b/src/libs/dialogs/imagedlgbase.h
diff --git a/digikam/libs/dialogs/imageguidedlg.cpp b/src/libs/dialogs/imageguidedlg.cpp
index 9713a872..9713a872 100644
--- a/digikam/libs/dialogs/imageguidedlg.cpp
+++ b/src/libs/dialogs/imageguidedlg.cpp
diff --git a/digikam/libs/dialogs/imageguidedlg.h b/src/libs/dialogs/imageguidedlg.h
index e6841c43..e6841c43 100644
--- a/digikam/libs/dialogs/imageguidedlg.h
+++ b/src/libs/dialogs/imageguidedlg.h
diff --git a/digikam/libs/dialogs/rawcameradlg.cpp b/src/libs/dialogs/rawcameradlg.cpp
index 298b47d4..298b47d4 100644
--- a/digikam/libs/dialogs/rawcameradlg.cpp
+++ b/src/libs/dialogs/rawcameradlg.cpp
diff --git a/digikam/libs/dialogs/rawcameradlg.h b/src/libs/dialogs/rawcameradlg.h
index 41d4a7de..41d4a7de 100644
--- a/digikam/libs/dialogs/rawcameradlg.h
+++ b/src/libs/dialogs/rawcameradlg.h
diff --git a/src/libs/dimg/Makefile.am b/src/libs/dimg/Makefile.am
new file mode 100644
index 00000000..23e746a2
--- /dev/null
+++ b/src/libs/dimg/Makefile.am
@@ -0,0 +1,27 @@
+SUBDIRS = loaders filters 
+METASOURCES = AUTO
+
+noinst_LTLIBRARIES = libdimg.la
+
+libdimg_la_SOURCES = dimg.cpp dimgscale.cpp dcolor.cpp dcolorcomposer.cpp ddebug.cpp 
+
+libdimg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+
+libdimg_la_LIBADD  = $(top_builddir)/src/libs/histogram/libhistogram.la \
+	             $(top_builddir)/src/libs/levels/liblevels.la \
+	             $(top_builddir)/src/libs/curves/libcurves.la \
+	             $(top_builddir)/src/libs/whitebalance/libwhitebalance.la \
+	             $(top_builddir)/src/libs/dimg/loaders/libdimgloaders.la \
+	             $(top_builddir)/src/libs/dimg/filters/libdimgfilters.la \
+	             $(top_builddir)/src/libs/dmetadata/libdmetadata.la \
+	             $(LIBKDCRAW_LIBS) $(LCMS_LIBS) 
+
+INCLUDES = $(all_includes) $(LIBKDCRAW_CFLAGS) \
+	   -I$(top_srcdir)/src/libs/dimg/loaders \
+	   -I$(top_srcdir)/src/libs/dimg/filters \
+	   -I$(top_srcdir)/src/libs/dmetadata \
+	   -I$(top_srcdir)/src/digikam
+
+digikaminclude_HEADERS = dimg.h dcolor.h dcolorpixelaccess.h dcolorcomposer.h \
+                         dcolorblend.h ddebug.h
+digikamincludedir = $(includedir)/digikam
diff --git a/digikam/libs/dimg/README b/src/libs/dimg/README
index 4b13f3fe..4b13f3fe 100644
--- a/digikam/libs/dimg/README
+++ b/src/libs/dimg/README
diff --git a/digikam/libs/dimg/dcolor.cpp b/src/libs/dimg/dcolor.cpp
index 5a363c78..5a363c78 100644
--- a/digikam/libs/dimg/dcolor.cpp
+++ b/src/libs/dimg/dcolor.cpp
diff --git a/digikam/libs/dimg/dcolor.h b/src/libs/dimg/dcolor.h
index 16a34f55..16a34f55 100644
--- a/digikam/libs/dimg/dcolor.h
+++ b/src/libs/dimg/dcolor.h
diff --git a/digikam/libs/dimg/dcolorblend.h b/src/libs/dimg/dcolorblend.h
index b68322ba..b68322ba 100644
--- a/digikam/libs/dimg/dcolorblend.h
+++ b/src/libs/dimg/dcolorblend.h
diff --git a/digikam/libs/dimg/dcolorcomposer.cpp b/src/libs/dimg/dcolorcomposer.cpp
index 653dbab3..653dbab3 100644
--- a/digikam/libs/dimg/dcolorcomposer.cpp
+++ b/src/libs/dimg/dcolorcomposer.cpp
diff --git a/digikam/libs/dimg/dcolorcomposer.h b/src/libs/dimg/dcolorcomposer.h
index 3e885ca8..3e885ca8 100644
--- a/digikam/libs/dimg/dcolorcomposer.h
+++ b/src/libs/dimg/dcolorcomposer.h
diff --git a/digikam/libs/dimg/dcolorpixelaccess.h b/src/libs/dimg/dcolorpixelaccess.h
index 30695c3e..30695c3e 100644
--- a/digikam/libs/dimg/dcolorpixelaccess.h
+++ b/src/libs/dimg/dcolorpixelaccess.h
diff --git a/digikam/libs/dimg/ddebug.cpp b/src/libs/dimg/ddebug.cpp
index 3f8f07c4..3f8f07c4 100644
--- a/digikam/libs/dimg/ddebug.cpp
+++ b/src/libs/dimg/ddebug.cpp
diff --git a/digikam/libs/dimg/ddebug.h b/src/libs/dimg/ddebug.h
index 1ea337eb..1ea337eb 100644
--- a/digikam/libs/dimg/ddebug.h
+++ b/src/libs/dimg/ddebug.h
diff --git a/digikam/libs/dimg/dimg.cpp b/src/libs/dimg/dimg.cpp
index d61f2dd0..d61f2dd0 100644
--- a/digikam/libs/dimg/dimg.cpp
+++ b/src/libs/dimg/dimg.cpp
diff --git a/digikam/libs/dimg/dimg.h b/src/libs/dimg/dimg.h
index 48973e47..48973e47 100644
--- a/digikam/libs/dimg/dimg.h
+++ b/src/libs/dimg/dimg.h
diff --git a/digikam/libs/dimg/dimgprivate.h b/src/libs/dimg/dimgprivate.h
index 021208d3..021208d3 100644
--- a/digikam/libs/dimg/dimgprivate.h
+++ b/src/libs/dimg/dimgprivate.h
diff --git a/digikam/libs/dimg/dimgscale.cpp b/src/libs/dimg/dimgscale.cpp
index 850e36de..850e36de 100644
--- a/digikam/libs/dimg/dimgscale.cpp
+++ b/src/libs/dimg/dimgscale.cpp
diff --git a/digikam/libs/dimg/drawdecoding.h b/src/libs/dimg/drawdecoding.h
index e2d82fdc..e2d82fdc 100644
--- a/digikam/libs/dimg/drawdecoding.h
+++ b/src/libs/dimg/drawdecoding.h
diff --git a/digikam/libs/dimg/exposurecontainer.h b/src/libs/dimg/exposurecontainer.h
index 62469258..62469258 100644
--- a/digikam/libs/dimg/exposurecontainer.h
+++ b/src/libs/dimg/exposurecontainer.h
diff --git a/digikam/libs/dimg/filters/Makefile.am b/src/libs/dimg/filters/Makefile.am
index cea3669f..25c4ee54 100644
--- a/digikam/libs/dimg/filters/Makefile.am
+++ b/src/libs/dimg/filters/Makefile.am
@@ -8,10 +8,10 @@ libdimgfilters_la_SOURCES = bcgmodifier.cpp hslmodifier.cpp icctransform.cpp \
 
 libdimgfilters_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/levels \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/digikam \
+INCLUDES = -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/levels \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/digikam \
 		$(LIBKDCRAW_CFLAGS) \
 		$(all_includes) 
 	   
diff --git a/digikam/libs/dimg/filters/bcgmodifier.cpp b/src/libs/dimg/filters/bcgmodifier.cpp
index b3899c20..b3899c20 100644
--- a/digikam/libs/dimg/filters/bcgmodifier.cpp
+++ b/src/libs/dimg/filters/bcgmodifier.cpp
diff --git a/digikam/libs/dimg/filters/bcgmodifier.h b/src/libs/dimg/filters/bcgmodifier.h
index b0c915d6..b0c915d6 100644
--- a/digikam/libs/dimg/filters/bcgmodifier.h
+++ b/src/libs/dimg/filters/bcgmodifier.h
diff --git a/digikam/libs/dimg/filters/colormodifier.cpp b/src/libs/dimg/filters/colormodifier.cpp
index 74ddf241..74ddf241 100644
--- a/digikam/libs/dimg/filters/colormodifier.cpp
+++ b/src/libs/dimg/filters/colormodifier.cpp
diff --git a/digikam/libs/dimg/filters/colormodifier.h b/src/libs/dimg/filters/colormodifier.h
index 9473b273..9473b273 100644
--- a/digikam/libs/dimg/filters/colormodifier.h
+++ b/src/libs/dimg/filters/colormodifier.h
diff --git a/digikam/libs/dimg/filters/dimggaussianblur.cpp b/src/libs/dimg/filters/dimggaussianblur.cpp
index 63e19909..63e19909 100644
--- a/digikam/libs/dimg/filters/dimggaussianblur.cpp
+++ b/src/libs/dimg/filters/dimggaussianblur.cpp
diff --git a/digikam/libs/dimg/filters/dimggaussianblur.h b/src/libs/dimg/filters/dimggaussianblur.h
index e88944bc..e88944bc 100644
--- a/digikam/libs/dimg/filters/dimggaussianblur.h
+++ b/src/libs/dimg/filters/dimggaussianblur.h
diff --git a/digikam/libs/dimg/filters/dimgimagefilters.cpp b/src/libs/dimg/filters/dimgimagefilters.cpp
index b964ed4d..b964ed4d 100644
--- a/digikam/libs/dimg/filters/dimgimagefilters.cpp
+++ b/src/libs/dimg/filters/dimgimagefilters.cpp
diff --git a/digikam/libs/dimg/filters/dimgimagefilters.h b/src/libs/dimg/filters/dimgimagefilters.h
index 009c3efb..009c3efb 100644
--- a/digikam/libs/dimg/filters/dimgimagefilters.h
+++ b/src/libs/dimg/filters/dimgimagefilters.h
diff --git a/digikam/libs/dimg/filters/dimgsharpen.cpp b/src/libs/dimg/filters/dimgsharpen.cpp
index a27d5b10..a27d5b10 100644
--- a/digikam/libs/dimg/filters/dimgsharpen.cpp
+++ b/src/libs/dimg/filters/dimgsharpen.cpp
diff --git a/digikam/libs/dimg/filters/dimgsharpen.h b/src/libs/dimg/filters/dimgsharpen.h
index 5802769a..5802769a 100644
--- a/digikam/libs/dimg/filters/dimgsharpen.h
+++ b/src/libs/dimg/filters/dimgsharpen.h
diff --git a/digikam/libs/dimg/filters/dimgthreadedfilter.cpp b/src/libs/dimg/filters/dimgthreadedfilter.cpp
index 205405e8..205405e8 100644
--- a/digikam/libs/dimg/filters/dimgthreadedfilter.cpp
+++ b/src/libs/dimg/filters/dimgthreadedfilter.cpp
diff --git a/digikam/libs/dimg/filters/dimgthreadedfilter.h b/src/libs/dimg/filters/dimgthreadedfilter.h
index 1d4a97b8..1d4a97b8 100644
--- a/digikam/libs/dimg/filters/dimgthreadedfilter.h
+++ b/src/libs/dimg/filters/dimgthreadedfilter.h
diff --git a/digikam/libs/dimg/filters/hslmodifier.cpp b/src/libs/dimg/filters/hslmodifier.cpp
index 4f924d76..4f924d76 100644
--- a/digikam/libs/dimg/filters/hslmodifier.cpp
+++ b/src/libs/dimg/filters/hslmodifier.cpp
diff --git a/digikam/libs/dimg/filters/hslmodifier.h b/src/libs/dimg/filters/hslmodifier.h
index 02a1131d..02a1131d 100644
--- a/digikam/libs/dimg/filters/hslmodifier.h
+++ b/src/libs/dimg/filters/hslmodifier.h
diff --git a/digikam/libs/dimg/filters/icctransform.cpp b/src/libs/dimg/filters/icctransform.cpp
index 0a1324db..0a1324db 100644
--- a/digikam/libs/dimg/filters/icctransform.cpp
+++ b/src/libs/dimg/filters/icctransform.cpp
diff --git a/digikam/libs/dimg/filters/icctransform.h b/src/libs/dimg/filters/icctransform.h
index 0590c44f..0590c44f 100644
--- a/digikam/libs/dimg/filters/icctransform.h
+++ b/src/libs/dimg/filters/icctransform.h
diff --git a/digikam/libs/dimg/loaders/Makefile.am b/src/libs/dimg/loaders/Makefile.am
index 35308239..62e96fe8 100644
--- a/digikam/libs/dimg/loaders/Makefile.am
+++ b/src/libs/dimg/loaders/Makefile.am
@@ -10,12 +10,12 @@ libdimgloaders_la_SOURCES = dimgloader.cpp pngloader.cpp jpegloader.cpp tiffload
 libdimgloaders_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) \
 	                    $(LIBJPEG) $(LIB_TIFF) $(LIB_PNG) $(LIB_JASPER)
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/digikam/libs/dimg \
-	                   -I$(top_srcdir)/digikam/libs/dimg/filters \
-	                   -I$(top_srcdir)/digikam/libs/curves \
-	                   -I$(top_srcdir)/digikam/libs/levels \
-	                   -I$(top_srcdir)/digikam/libs/histogram \
-	                   -I$(top_srcdir)/digikam/libs/whitebalance \
-	                   -I$(top_srcdir)/digikam/libs/dmetadata \
-	                   -I$(top_srcdir)/digikam/digikam \
+INCLUDES = $(all_includes) -I$(top_srcdir)/src/libs/dimg \
+	                   -I$(top_srcdir)/src/libs/dimg/filters \
+	                   -I$(top_srcdir)/src/libs/curves \
+	                   -I$(top_srcdir)/src/libs/levels \
+	                   -I$(top_srcdir)/src/libs/histogram \
+	                   -I$(top_srcdir)/src/libs/whitebalance \
+	                   -I$(top_srcdir)/src/libs/dmetadata \
+	                   -I$(top_srcdir)/src/digikam \
 	                   $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) 
diff --git a/digikam/libs/dimg/loaders/README b/src/libs/dimg/loaders/README
index b77e9c4c..b77e9c4c 100644
--- a/digikam/libs/dimg/loaders/README
+++ b/src/libs/dimg/loaders/README
diff --git a/digikam/libs/dimg/loaders/dimgloader.cpp b/src/libs/dimg/loaders/dimgloader.cpp
index 615b11e1..615b11e1 100644
--- a/digikam/libs/dimg/loaders/dimgloader.cpp
+++ b/src/libs/dimg/loaders/dimgloader.cpp
diff --git a/digikam/libs/dimg/loaders/dimgloader.h b/src/libs/dimg/loaders/dimgloader.h
index 39025888..39025888 100644
--- a/digikam/libs/dimg/loaders/dimgloader.h
+++ b/src/libs/dimg/loaders/dimgloader.h
diff --git a/digikam/libs/dimg/loaders/dimgloaderobserver.h b/src/libs/dimg/loaders/dimgloaderobserver.h
index ea83bede..ea83bede 100644
--- a/digikam/libs/dimg/loaders/dimgloaderobserver.h
+++ b/src/libs/dimg/loaders/dimgloaderobserver.h
diff --git a/digikam/libs/dimg/loaders/iccjpeg.c b/src/libs/dimg/loaders/iccjpeg.c
index fefa9509..fefa9509 100644
--- a/digikam/libs/dimg/loaders/iccjpeg.c
+++ b/src/libs/dimg/loaders/iccjpeg.c
diff --git a/digikam/libs/dimg/loaders/iccjpeg.h b/src/libs/dimg/loaders/iccjpeg.h
index 2aab4196..2aab4196 100644
--- a/digikam/libs/dimg/loaders/iccjpeg.h
+++ b/src/libs/dimg/loaders/iccjpeg.h
diff --git a/digikam/libs/dimg/loaders/jp2kloader.cpp b/src/libs/dimg/loaders/jp2kloader.cpp
index 66351c25..66351c25 100644
--- a/digikam/libs/dimg/loaders/jp2kloader.cpp
+++ b/src/libs/dimg/loaders/jp2kloader.cpp
diff --git a/digikam/libs/dimg/loaders/jp2kloader.h b/src/libs/dimg/loaders/jp2kloader.h
index 04ec214e..04ec214e 100644
--- a/digikam/libs/dimg/loaders/jp2kloader.h
+++ b/src/libs/dimg/loaders/jp2kloader.h
diff --git a/digikam/libs/dimg/loaders/jp2ksettings.cpp b/src/libs/dimg/loaders/jp2ksettings.cpp
index af0737c1..af0737c1 100644
--- a/digikam/libs/dimg/loaders/jp2ksettings.cpp
+++ b/src/libs/dimg/loaders/jp2ksettings.cpp
diff --git a/digikam/libs/dimg/loaders/jp2ksettings.h b/src/libs/dimg/loaders/jp2ksettings.h
index 951cb2fc..951cb2fc 100644
--- a/digikam/libs/dimg/loaders/jp2ksettings.h
+++ b/src/libs/dimg/loaders/jp2ksettings.h
diff --git a/digikam/libs/dimg/loaders/jpegloader.cpp b/src/libs/dimg/loaders/jpegloader.cpp
index 58f6e20a..58f6e20a 100644
--- a/digikam/libs/dimg/loaders/jpegloader.cpp
+++ b/src/libs/dimg/loaders/jpegloader.cpp
diff --git a/digikam/libs/dimg/loaders/jpegloader.h b/src/libs/dimg/loaders/jpegloader.h
index b5d64f18..b5d64f18 100644
--- a/digikam/libs/dimg/loaders/jpegloader.h
+++ b/src/libs/dimg/loaders/jpegloader.h
diff --git a/digikam/libs/dimg/loaders/jpegsettings.cpp b/src/libs/dimg/loaders/jpegsettings.cpp
index 62bd6365..62bd6365 100644
--- a/digikam/libs/dimg/loaders/jpegsettings.cpp
+++ b/src/libs/dimg/loaders/jpegsettings.cpp
diff --git a/digikam/libs/dimg/loaders/jpegsettings.h b/src/libs/dimg/loaders/jpegsettings.h
index 70e20d42..70e20d42 100644
--- a/digikam/libs/dimg/loaders/jpegsettings.h
+++ b/src/libs/dimg/loaders/jpegsettings.h
diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/src/libs/dimg/loaders/pngloader.cpp
index 402cf944..402cf944 100644
--- a/digikam/libs/dimg/loaders/pngloader.cpp
+++ b/src/libs/dimg/loaders/pngloader.cpp
diff --git a/digikam/libs/dimg/loaders/pngloader.h b/src/libs/dimg/loaders/pngloader.h
index 202a278c..202a278c 100644
--- a/digikam/libs/dimg/loaders/pngloader.h
+++ b/src/libs/dimg/loaders/pngloader.h
diff --git a/digikam/libs/dimg/loaders/pngsettings.cpp b/src/libs/dimg/loaders/pngsettings.cpp
index ce39219b..ce39219b 100644
--- a/digikam/libs/dimg/loaders/pngsettings.cpp
+++ b/src/libs/dimg/loaders/pngsettings.cpp
diff --git a/digikam/libs/dimg/loaders/pngsettings.h b/src/libs/dimg/loaders/pngsettings.h
index aecca935..aecca935 100644
--- a/digikam/libs/dimg/loaders/pngsettings.h
+++ b/src/libs/dimg/loaders/pngsettings.h
diff --git a/digikam/libs/dimg/loaders/ppmloader.cpp b/src/libs/dimg/loaders/ppmloader.cpp
index 15c19423..15c19423 100644
--- a/digikam/libs/dimg/loaders/ppmloader.cpp
+++ b/src/libs/dimg/loaders/ppmloader.cpp
diff --git a/digikam/libs/dimg/loaders/ppmloader.h b/src/libs/dimg/loaders/ppmloader.h
index 283fdd26..283fdd26 100644
--- a/digikam/libs/dimg/loaders/ppmloader.h
+++ b/src/libs/dimg/loaders/ppmloader.h
diff --git a/digikam/libs/dimg/loaders/qimageloader.cpp b/src/libs/dimg/loaders/qimageloader.cpp
index f35335cf..f35335cf 100644
--- a/digikam/libs/dimg/loaders/qimageloader.cpp
+++ b/src/libs/dimg/loaders/qimageloader.cpp
diff --git a/digikam/libs/dimg/loaders/qimageloader.h b/src/libs/dimg/loaders/qimageloader.h
index f81cf7ef..f81cf7ef 100644
--- a/digikam/libs/dimg/loaders/qimageloader.h
+++ b/src/libs/dimg/loaders/qimageloader.h
diff --git a/digikam/libs/dimg/loaders/rawloader.cpp b/src/libs/dimg/loaders/rawloader.cpp
index 8ecaa1f3..8ecaa1f3 100644
--- a/digikam/libs/dimg/loaders/rawloader.cpp
+++ b/src/libs/dimg/loaders/rawloader.cpp
diff --git a/digikam/libs/dimg/loaders/rawloader.h b/src/libs/dimg/loaders/rawloader.h
index 22171a20..22171a20 100644
--- a/digikam/libs/dimg/loaders/rawloader.h
+++ b/src/libs/dimg/loaders/rawloader.h
diff --git a/digikam/libs/dimg/loaders/tiffloader.cpp b/src/libs/dimg/loaders/tiffloader.cpp
index 2e554143..2e554143 100644
--- a/digikam/libs/dimg/loaders/tiffloader.cpp
+++ b/src/libs/dimg/loaders/tiffloader.cpp
diff --git a/digikam/libs/dimg/loaders/tiffloader.h b/src/libs/dimg/loaders/tiffloader.h
index 484afd06..484afd06 100644
--- a/digikam/libs/dimg/loaders/tiffloader.h
+++ b/src/libs/dimg/loaders/tiffloader.h
diff --git a/digikam/libs/dimg/loaders/tiffsettings.cpp b/src/libs/dimg/loaders/tiffsettings.cpp
index 3ea7e20c..3ea7e20c 100644
--- a/digikam/libs/dimg/loaders/tiffsettings.cpp
+++ b/src/libs/dimg/loaders/tiffsettings.cpp
diff --git a/digikam/libs/dimg/loaders/tiffsettings.h b/src/libs/dimg/loaders/tiffsettings.h
index e546ce0f..e546ce0f 100644
--- a/digikam/libs/dimg/loaders/tiffsettings.h
+++ b/src/libs/dimg/loaders/tiffsettings.h
diff --git a/digikam/libs/dmetadata/Makefile.am b/src/libs/dmetadata/Makefile.am
index f0a8e63d..73ff6010 100644
--- a/digikam/libs/dmetadata/Makefile.am
+++ b/src/libs/dmetadata/Makefile.am
@@ -8,8 +8,8 @@ libdmetadata_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_
 
 libdmetadata_la_LIBADD  = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) 
 
-INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
-	   -I$(top_srcdir)/digikam/digikam \
+INCLUDES = -I$(top_srcdir)/src/libs/dimg \
+	   -I$(top_srcdir)/src/digikam \
 	   $(LIBKEXIV2_CFLAGS) \
 	   $(LIBKDCRAW_CFLAGS) \
 	   $(all_includes)
diff --git a/digikam/libs/dmetadata/dmetadata.cpp b/src/libs/dmetadata/dmetadata.cpp
index bb37506c..bb37506c 100644
--- a/digikam/libs/dmetadata/dmetadata.cpp
+++ b/src/libs/dmetadata/dmetadata.cpp
diff --git a/digikam/libs/dmetadata/dmetadata.h b/src/libs/dmetadata/dmetadata.h
index a33bc61c..a33bc61c 100644
--- a/digikam/libs/dmetadata/dmetadata.h
+++ b/src/libs/dmetadata/dmetadata.h
diff --git a/digikam/libs/dmetadata/photoinfocontainer.h b/src/libs/dmetadata/photoinfocontainer.h
index b008b6b4..b008b6b4 100644
--- a/digikam/libs/dmetadata/photoinfocontainer.h
+++ b/src/libs/dmetadata/photoinfocontainer.h
diff --git a/digikam/libs/greycstoration/CImg.h b/src/libs/greycstoration/CImg.h
index 9f6662e1..9f6662e1 100644
--- a/digikam/libs/greycstoration/CImg.h
+++ b/src/libs/greycstoration/CImg.h
diff --git a/digikam/libs/greycstoration/LICENSE.txt b/src/libs/greycstoration/LICENSE.txt
index a36324de..a36324de 100644
--- a/digikam/libs/greycstoration/LICENSE.txt
+++ b/src/libs/greycstoration/LICENSE.txt
diff --git a/digikam/libs/greycstoration/Makefile.am b/src/libs/greycstoration/Makefile.am
index 0ff4dafd..f7cc569f 100644
--- a/digikam/libs/greycstoration/Makefile.am
+++ b/src/libs/greycstoration/Makefile.am
@@ -8,9 +8,9 @@ libgreycstoration_la_SOURCES = greycstorationiface.cpp greycstorationwidget.cpp
 
 libgreycstoration_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dimg/filters \
-	       -I$(top_srcdir)/digikam/digikam \
+INCLUDES = -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/digikam \
 		$(LIBKDCRAW_CFLAGS) \
 		$(all_includes)
 
diff --git a/digikam/libs/greycstoration/greycstoration.h b/src/libs/greycstoration/greycstoration.h
index 36b2c0e2..36b2c0e2 100644
--- a/digikam/libs/greycstoration/greycstoration.h
+++ b/src/libs/greycstoration/greycstoration.h
diff --git a/digikam/libs/greycstoration/greycstorationiface.cpp b/src/libs/greycstoration/greycstorationiface.cpp
index 32f60514..32f60514 100644
--- a/digikam/libs/greycstoration/greycstorationiface.cpp
+++ b/src/libs/greycstoration/greycstorationiface.cpp
diff --git a/digikam/libs/greycstoration/greycstorationiface.h b/src/libs/greycstoration/greycstorationiface.h
index fd7b248b..fd7b248b 100644
--- a/digikam/libs/greycstoration/greycstorationiface.h
+++ b/src/libs/greycstoration/greycstorationiface.h
diff --git a/digikam/libs/greycstoration/greycstorationsettings.h b/src/libs/greycstoration/greycstorationsettings.h
index e2686965..e2686965 100644
--- a/digikam/libs/greycstoration/greycstorationsettings.h
+++ b/src/libs/greycstoration/greycstorationsettings.h
diff --git a/digikam/libs/greycstoration/greycstorationwidget.cpp b/src/libs/greycstoration/greycstorationwidget.cpp
index 93f25799..93f25799 100644
--- a/digikam/libs/greycstoration/greycstorationwidget.cpp
+++ b/src/libs/greycstoration/greycstorationwidget.cpp
diff --git a/digikam/libs/greycstoration/greycstorationwidget.h b/src/libs/greycstoration/greycstorationwidget.h
index 22797071..22797071 100644
--- a/digikam/libs/greycstoration/greycstorationwidget.h
+++ b/src/libs/greycstoration/greycstorationwidget.h
diff --git a/digikam/libs/histogram/Makefile.am b/src/libs/histogram/Makefile.am
index b3b9f5db..56ea96f6 100644
--- a/digikam/libs/histogram/Makefile.am
+++ b/src/libs/histogram/Makefile.am
@@ -6,8 +6,8 @@ libhistogram_la_SOURCES = imagehistogram.cpp
 
 libhistogram_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
-		-I$(top_srcdir)/digikam/digikam \
+INCLUDES = -I$(top_srcdir)/src/libs/dimg \
+		-I$(top_srcdir)/src/digikam \
 		$(LIBKDCRAW_CFLAGS) \
 		$(all_includes) 
 
diff --git a/digikam/libs/histogram/imagehistogram.cpp b/src/libs/histogram/imagehistogram.cpp
index bee55624..bee55624 100644
--- a/digikam/libs/histogram/imagehistogram.cpp
+++ b/src/libs/histogram/imagehistogram.cpp
diff --git a/digikam/libs/histogram/imagehistogram.h b/src/libs/histogram/imagehistogram.h
index 6beb4919..6beb4919 100644
--- a/digikam/libs/histogram/imagehistogram.h
+++ b/src/libs/histogram/imagehistogram.h
diff --git a/digikam/libs/imageproperties/Makefile.am b/src/libs/imageproperties/Makefile.am
index 05e01e43..2c4f021a 100644
--- a/digikam/libs/imageproperties/Makefile.am
+++ b/src/libs/imageproperties/Makefile.am
@@ -15,11 +15,11 @@ libimagepropertiesshowfoto_la_SOURCES = imagepropertiessidebar.cpp navigatebarwi
 	                                imagepropertiesmetadatatab.cpp imagepropertiescolorstab.cpp \
 	                                imagepropertiestab.cpp navigatebartab.cpp
 
-libimagepropertiesshowfoto_la_LIBADD = $(top_builddir)/digikam/libs/widgets/libwidgets.la \
-	                               $(top_builddir)/digikam/libs/dmetadata/libdmetadata.la \
-	                               $(top_builddir)/digikam/libs/dimg/libdimg.la \
-	                               $(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la \
-	                               $(top_builddir)/digikam/libs/histogram/libhistogram.la 
+libimagepropertiesshowfoto_la_LIBADD = $(top_builddir)/src/libs/widgets/libwidgets.la \
+	                               $(top_builddir)/src/libs/dmetadata/libdmetadata.la \
+	                               $(top_builddir)/src/libs/dimg/libdimg.la \
+	                               $(top_builddir)/src/libs/threadimageio/libthreadimageio.la \
+	                               $(top_builddir)/src/libs/histogram/libhistogram.la 
 
 libimagepropertiesshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
@@ -33,18 +33,18 @@ libimagepropertiesdigikam_la_SOURCES = imagedescedittab.cpp imagepropertiessideb
 
 libimagepropertiesdigikam_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \
-	   -I$(top_srcdir)/digikam/libs/themeengine \
-	   -I$(top_srcdir)/digikam/libs/dmetadata \
-	   -I$(top_srcdir)/digikam/libs/widgets/common \
-	   -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
-	   -I$(top_srcdir)/digikam/libs/widgets/metadata \
-	   -I$(top_srcdir)/digikam/libs/dialogs \
-	   -I$(top_srcdir)/digikam/libs/dimg \
-	   -I$(top_srcdir)/digikam/libs/threadimageio \
-	   -I$(top_srcdir)/digikam/utilities/cameragui \
-	   -I$(top_srcdir)/digikam/utilities/batch \
-	   -I$(top_srcdir)/digikam/digikam \
+INCLUDES = -I$(top_srcdir)/src/libs/histogram \
+	   -I$(top_srcdir)/src/libs/themeengine \
+	   -I$(top_srcdir)/src/libs/dmetadata \
+	   -I$(top_srcdir)/src/libs/widgets/common \
+	   -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	   -I$(top_srcdir)/src/libs/widgets/metadata \
+	   -I$(top_srcdir)/src/libs/dialogs \
+	   -I$(top_srcdir)/src/libs/dimg \
+	   -I$(top_srcdir)/src/libs/threadimageio \
+	   -I$(top_srcdir)/src/utilities/cameragui \
+	   -I$(top_srcdir)/src/utilities/batch \
+	   -I$(top_srcdir)/src/digikam \
 	   $(LIBKEXIV2_CFLAGS) \
 	   $(LIBKDCRAW_CFLAGS) \
 	   $(all_includes)
diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.cpp b/src/libs/imageproperties/cameraitempropertiestab.cpp
index 8593e9c7..8593e9c7 100644
--- a/digikam/libs/imageproperties/cameraitempropertiestab.cpp
+++ b/src/libs/imageproperties/cameraitempropertiestab.cpp
diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.h b/src/libs/imageproperties/cameraitempropertiestab.h
index badf4a70..badf4a70 100644
--- a/digikam/libs/imageproperties/cameraitempropertiestab.h
+++ b/src/libs/imageproperties/cameraitempropertiestab.h
diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/src/libs/imageproperties/imagedescedittab.cpp
index f79b1d7c..f79b1d7c 100644
--- a/digikam/libs/imageproperties/imagedescedittab.cpp
+++ b/src/libs/imageproperties/imagedescedittab.cpp
diff --git a/digikam/libs/imageproperties/imagedescedittab.h b/src/libs/imageproperties/imagedescedittab.h
index 617bd59b..617bd59b 100644
--- a/digikam/libs/imageproperties/imagedescedittab.h
+++ b/src/libs/imageproperties/imagedescedittab.h
diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp b/src/libs/imageproperties/imagepropertiescolorstab.cpp
index af85953b..af85953b 100644
--- a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp
+++ b/src/libs/imageproperties/imagepropertiescolorstab.cpp
diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.h b/src/libs/imageproperties/imagepropertiescolorstab.h
index 0e01cad3..0e01cad3 100644
--- a/digikam/libs/imageproperties/imagepropertiescolorstab.h
+++ b/src/libs/imageproperties/imagepropertiescolorstab.h
diff --git a/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp b/src/libs/imageproperties/imagepropertiesmetadatatab.cpp
index 5a48aaec..5a48aaec 100644
--- a/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp
+++ b/src/libs/imageproperties/imagepropertiesmetadatatab.cpp
diff --git a/digikam/libs/imageproperties/imagepropertiesmetadatatab.h b/src/libs/imageproperties/imagepropertiesmetadatatab.h
index 95b8ecb8..95b8ecb8 100644
--- a/digikam/libs/imageproperties/imagepropertiesmetadatatab.h
+++ b/src/libs/imageproperties/imagepropertiesmetadatatab.h
diff --git a/digikam/libs/imageproperties/imagepropertiessidebar.cpp b/src/libs/imageproperties/imagepropertiessidebar.cpp
index 67254388..67254388 100644
--- a/digikam/libs/imageproperties/imagepropertiessidebar.cpp
+++ b/src/libs/imageproperties/imagepropertiessidebar.cpp
diff --git a/digikam/libs/imageproperties/imagepropertiessidebar.h b/src/libs/imageproperties/imagepropertiessidebar.h
index 43e08df0..43e08df0 100644
--- a/digikam/libs/imageproperties/imagepropertiessidebar.h
+++ b/src/libs/imageproperties/imagepropertiessidebar.h
diff --git a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp b/src/libs/imageproperties/imagepropertiessidebarcamgui.cpp
index 942c33e5..942c33e5 100644
--- a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp
+++ b/src/libs/imageproperties/imagepropertiessidebarcamgui.cpp
diff --git a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.h b/src/libs/imageproperties/imagepropertiessidebarcamgui.h
index 3c2eafd0..3c2eafd0 100644
--- a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.h
+++ b/src/libs/imageproperties/imagepropertiessidebarcamgui.h
diff --git a/digikam/libs/imageproperties/imagepropertiessidebardb.cpp b/src/libs/imageproperties/imagepropertiessidebardb.cpp
index f3dc5f7a..f3dc5f7a 100644
--- a/digikam/libs/imageproperties/imagepropertiessidebardb.cpp
+++ b/src/libs/imageproperties/imagepropertiessidebardb.cpp
diff --git a/digikam/libs/imageproperties/imagepropertiessidebardb.h b/src/libs/imageproperties/imagepropertiessidebardb.h
index 7037b648..7037b648 100644
--- a/digikam/libs/imageproperties/imagepropertiessidebardb.h
+++ b/src/libs/imageproperties/imagepropertiessidebardb.h
diff --git a/digikam/libs/imageproperties/imagepropertiestab.cpp b/src/libs/imageproperties/imagepropertiestab.cpp
index 7141c039..7141c039 100644
--- a/digikam/libs/imageproperties/imagepropertiestab.cpp
+++ b/src/libs/imageproperties/imagepropertiestab.cpp
diff --git a/digikam/libs/imageproperties/imagepropertiestab.h b/src/libs/imageproperties/imagepropertiestab.h
index 2a69ce97..2a69ce97 100644
--- a/digikam/libs/imageproperties/imagepropertiestab.h
+++ b/src/libs/imageproperties/imagepropertiestab.h
diff --git a/digikam/libs/imageproperties/navigatebartab.cpp b/src/libs/imageproperties/navigatebartab.cpp
index d40ae134..d40ae134 100644
--- a/digikam/libs/imageproperties/navigatebartab.cpp
+++ b/src/libs/imageproperties/navigatebartab.cpp
diff --git a/digikam/libs/imageproperties/navigatebartab.h b/src/libs/imageproperties/navigatebartab.h
index a93090e0..a93090e0 100644
--- a/digikam/libs/imageproperties/navigatebartab.h
+++ b/src/libs/imageproperties/navigatebartab.h
diff --git a/digikam/libs/imageproperties/navigatebarwidget.cpp b/src/libs/imageproperties/navigatebarwidget.cpp
index 9232c55e..9232c55e 100644
--- a/digikam/libs/imageproperties/navigatebarwidget.cpp
+++ b/src/libs/imageproperties/navigatebarwidget.cpp
diff --git a/digikam/libs/imageproperties/navigatebarwidget.h b/src/libs/imageproperties/navigatebarwidget.h
index 7be088ed..7be088ed 100644
--- a/digikam/libs/imageproperties/navigatebarwidget.h
+++ b/src/libs/imageproperties/navigatebarwidget.h
diff --git a/digikam/libs/imageproperties/talbumlistview.cpp b/src/libs/imageproperties/talbumlistview.cpp
index 1369d228..1369d228 100644
--- a/digikam/libs/imageproperties/talbumlistview.cpp
+++ b/src/libs/imageproperties/talbumlistview.cpp
diff --git a/digikam/libs/imageproperties/talbumlistview.h b/src/libs/imageproperties/talbumlistview.h
index b483706c..b483706c 100644
--- a/digikam/libs/imageproperties/talbumlistview.h
+++ b/src/libs/imageproperties/talbumlistview.h
diff --git a/digikam/libs/jpegutils/Makefile.am b/src/libs/jpegutils/Makefile.am
index f1d86ed7..3c07aa5a 100644
--- a/digikam/libs/jpegutils/Makefile.am
+++ b/src/libs/jpegutils/Makefile.am
@@ -6,9 +6,9 @@ METASOURCES = AUTO
 KDE_OPTIONS = nofinal
 
 INCLUDES = $(all_includes) \
-	   -I$(top_srcdir)/digikam/libs/dmetadata \
-	   -I$(top_srcdir)/digikam/libs/dimg \
-	   -I$(top_srcdir)/digikam/digikam \
+	   -I$(top_srcdir)/src/libs/dmetadata \
+	   -I$(top_srcdir)/src/libs/dimg \
+	   -I$(top_srcdir)/src/digikam \
 	   $(LIBKDCRAW_CFLAGS) \
 	   $(LIBKEXIV2_CFLAGS) 
 
diff --git a/digikam/libs/jpegutils/jinclude.h b/src/libs/jpegutils/jinclude.h
index adee51e0..adee51e0 100644
--- a/digikam/libs/jpegutils/jinclude.h
+++ b/src/libs/jpegutils/jinclude.h
diff --git a/digikam/libs/jpegutils/jpegint.h b/src/libs/jpegutils/jpegint.h
index bf01aa3e..bf01aa3e 100644
--- a/digikam/libs/jpegutils/jpegint.h
+++ b/src/libs/jpegutils/jpegint.h
diff --git a/digikam/libs/jpegutils/jpegutils.cpp b/src/libs/jpegutils/jpegutils.cpp
index 2f2aabb6..2f2aabb6 100644
--- a/digikam/libs/jpegutils/jpegutils.cpp
+++ b/src/libs/jpegutils/jpegutils.cpp
diff --git a/digikam/libs/jpegutils/jpegutils.h b/src/libs/jpegutils/jpegutils.h
index ad384770..ad384770 100644
--- a/digikam/libs/jpegutils/jpegutils.h
+++ b/src/libs/jpegutils/jpegutils.h
diff --git a/digikam/libs/jpegutils/libjpeg62.README b/src/libs/jpegutils/libjpeg62.README
index a18979ac..a18979ac 100644
--- a/digikam/libs/jpegutils/libjpeg62.README
+++ b/src/libs/jpegutils/libjpeg62.README
diff --git a/digikam/libs/jpegutils/transupp.cpp b/src/libs/jpegutils/transupp.cpp
index 47a9aa8b..47a9aa8b 100644
--- a/digikam/libs/jpegutils/transupp.cpp
+++ b/src/libs/jpegutils/transupp.cpp
diff --git a/digikam/libs/jpegutils/transupp.h b/src/libs/jpegutils/transupp.h
index 7dd3fad6..7dd3fad6 100644
--- a/digikam/libs/jpegutils/transupp.h
+++ b/src/libs/jpegutils/transupp.h
diff --git a/digikam/libs/levels/Makefile.am b/src/libs/levels/Makefile.am
index 5d01e1b8..d86db7c3 100644
--- a/digikam/libs/levels/Makefile.am
+++ b/src/libs/levels/Makefile.am
@@ -6,10 +6,10 @@ liblevels_la_SOURCES = imagelevels.cpp
 
 liblevels_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/ \
-	       -I$(top_srcdir)/digikam/digikam \
+INCLUDES = -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/ \
+	       -I$(top_srcdir)/src/digikam \
 	       $(all_includes)
 
 digikaminclude_HEADERS = imagelevels.h 
diff --git a/digikam/libs/levels/imagelevels.cpp b/src/libs/levels/imagelevels.cpp
index ac995927..ac995927 100644
--- a/digikam/libs/levels/imagelevels.cpp
+++ b/src/libs/levels/imagelevels.cpp
diff --git a/digikam/libs/levels/imagelevels.h b/src/libs/levels/imagelevels.h
index 04d10d97..04d10d97 100644
--- a/digikam/libs/levels/imagelevels.h
+++ b/src/libs/levels/imagelevels.h
diff --git a/digikam/libs/lprof/Makefile.am b/src/libs/lprof/Makefile.am
index e7251d2c..e7251d2c 100644
--- a/digikam/libs/lprof/Makefile.am
+++ b/src/libs/lprof/Makefile.am
diff --git a/digikam/libs/lprof/cmshull.cpp b/src/libs/lprof/cmshull.cpp
index 05b8dfa3..05b8dfa3 100644
--- a/digikam/libs/lprof/cmshull.cpp
+++ b/src/libs/lprof/cmshull.cpp
diff --git a/digikam/libs/lprof/cmslm.cpp b/src/libs/lprof/cmslm.cpp
index 81d86ba6..81d86ba6 100644
--- a/digikam/libs/lprof/cmslm.cpp
+++ b/src/libs/lprof/cmslm.cpp
diff --git a/digikam/libs/lprof/cmslnr.cpp b/src/libs/lprof/cmslnr.cpp
index dddd8e38..dddd8e38 100644
--- a/digikam/libs/lprof/cmslnr.cpp
+++ b/src/libs/lprof/cmslnr.cpp
diff --git a/digikam/libs/lprof/cmsmatn.cpp b/src/libs/lprof/cmsmatn.cpp
index bca52717..bca52717 100644
--- a/digikam/libs/lprof/cmsmatn.cpp
+++ b/src/libs/lprof/cmsmatn.cpp
diff --git a/digikam/libs/lprof/cmsmkmsh.cpp b/src/libs/lprof/cmsmkmsh.cpp
index c0e3d4c3..c0e3d4c3 100644
--- a/digikam/libs/lprof/cmsmkmsh.cpp
+++ b/src/libs/lprof/cmsmkmsh.cpp
diff --git a/digikam/libs/lprof/cmsmntr.cpp b/src/libs/lprof/cmsmntr.cpp
index ed14ed50..ed14ed50 100644
--- a/digikam/libs/lprof/cmsmntr.cpp
+++ b/src/libs/lprof/cmsmntr.cpp
diff --git a/digikam/libs/lprof/cmsoutl.cpp b/src/libs/lprof/cmsoutl.cpp
index 248aaa04..248aaa04 100644
--- a/digikam/libs/lprof/cmsoutl.cpp
+++ b/src/libs/lprof/cmsoutl.cpp
diff --git a/digikam/libs/lprof/cmspcoll.cpp b/src/libs/lprof/cmspcoll.cpp
index 0b03fd5a..0b03fd5a 100644
--- a/digikam/libs/lprof/cmspcoll.cpp
+++ b/src/libs/lprof/cmspcoll.cpp
diff --git a/digikam/libs/lprof/cmsprf.cpp b/src/libs/lprof/cmsprf.cpp
index 527fc8e8..527fc8e8 100644
--- a/digikam/libs/lprof/cmsprf.cpp
+++ b/src/libs/lprof/cmsprf.cpp
diff --git a/digikam/libs/lprof/cmsreg.cpp b/src/libs/lprof/cmsreg.cpp
index 4e66a9ef..4e66a9ef 100644
--- a/digikam/libs/lprof/cmsreg.cpp
+++ b/src/libs/lprof/cmsreg.cpp
diff --git a/digikam/libs/lprof/cmsscn.cpp b/src/libs/lprof/cmsscn.cpp
index b99fed87..b99fed87 100644
--- a/digikam/libs/lprof/cmsscn.cpp
+++ b/src/libs/lprof/cmsscn.cpp
diff --git a/digikam/libs/lprof/cmssheet.cpp b/src/libs/lprof/cmssheet.cpp
index cf8c569e..cf8c569e 100644
--- a/digikam/libs/lprof/cmssheet.cpp
+++ b/src/libs/lprof/cmssheet.cpp
diff --git a/digikam/libs/lprof/lcmsprf.h b/src/libs/lprof/lcmsprf.h
index 00c7ac40..00c7ac40 100644
--- a/digikam/libs/lprof/lcmsprf.h
+++ b/src/libs/lprof/lcmsprf.h
diff --git a/digikam/libs/sqlite2/Makefile.am b/src/libs/sqlite2/Makefile.am
index dca86fe0..dca86fe0 100644
--- a/digikam/libs/sqlite2/Makefile.am
+++ b/src/libs/sqlite2/Makefile.am
diff --git a/digikam/libs/sqlite2/README b/src/libs/sqlite2/README
index eefbd49e..eefbd49e 100644
--- a/digikam/libs/sqlite2/README
+++ b/src/libs/sqlite2/README
diff --git a/digikam/libs/sqlite2/attach.c b/src/libs/sqlite2/attach.c
index 316d0d2a..316d0d2a 100644
--- a/digikam/libs/sqlite2/attach.c
+++ b/src/libs/sqlite2/attach.c
diff --git a/digikam/libs/sqlite2/auth.c b/src/libs/sqlite2/auth.c
index 9147f148..9147f148 100644
--- a/digikam/libs/sqlite2/auth.c
+++ b/src/libs/sqlite2/auth.c
diff --git a/digikam/libs/sqlite2/btree.c b/src/libs/sqlite2/btree.c
index 745bdda2..745bdda2 100644
--- a/digikam/libs/sqlite2/btree.c
+++ b/src/libs/sqlite2/btree.c
diff --git a/digikam/libs/sqlite2/btree.h b/src/libs/sqlite2/btree.h
index 5a11b60e..5a11b60e 100644
--- a/digikam/libs/sqlite2/btree.h
+++ b/src/libs/sqlite2/btree.h
diff --git a/digikam/libs/sqlite2/btree_rb.c b/src/libs/sqlite2/btree_rb.c
index 18e49b81..18e49b81 100644
--- a/digikam/libs/sqlite2/btree_rb.c
+++ b/src/libs/sqlite2/btree_rb.c
diff --git a/digikam/libs/sqlite2/build.c b/src/libs/sqlite2/build.c
index 6c17f140..6c17f140 100644
--- a/digikam/libs/sqlite2/build.c
+++ b/src/libs/sqlite2/build.c
diff --git a/digikam/libs/sqlite2/copy.c b/src/libs/sqlite2/copy.c
index a289a7be..a289a7be 100644
--- a/digikam/libs/sqlite2/copy.c
+++ b/src/libs/sqlite2/copy.c
diff --git a/digikam/libs/sqlite2/date.c b/src/libs/sqlite2/date.c
index 9198b26f..9198b26f 100644
--- a/digikam/libs/sqlite2/date.c
+++ b/src/libs/sqlite2/date.c
diff --git a/digikam/libs/sqlite2/delete.c b/src/libs/sqlite2/delete.c
index 51054628..51054628 100644
--- a/digikam/libs/sqlite2/delete.c
+++ b/src/libs/sqlite2/delete.c
diff --git a/digikam/libs/sqlite2/encode.c b/src/libs/sqlite2/encode.c
index 7799b8b0..7799b8b0 100644
--- a/digikam/libs/sqlite2/encode.c
+++ b/src/libs/sqlite2/encode.c
diff --git a/digikam/libs/sqlite2/expr.c b/src/libs/sqlite2/expr.c
index af4aa596..af4aa596 100644
--- a/digikam/libs/sqlite2/expr.c
+++ b/src/libs/sqlite2/expr.c
diff --git a/digikam/libs/sqlite2/func.c b/src/libs/sqlite2/func.c
index c86a75a3..c86a75a3 100644
--- a/digikam/libs/sqlite2/func.c
+++ b/src/libs/sqlite2/func.c
diff --git a/digikam/libs/sqlite2/hash.c b/src/libs/sqlite2/hash.c
index e0137cb3..e0137cb3 100644
--- a/digikam/libs/sqlite2/hash.c
+++ b/src/libs/sqlite2/hash.c
diff --git a/digikam/libs/sqlite2/hash.h b/src/libs/sqlite2/hash.h
index 27dd30dc..27dd30dc 100644
--- a/digikam/libs/sqlite2/hash.h
+++ b/src/libs/sqlite2/hash.h
diff --git a/digikam/libs/sqlite2/insert.c b/src/libs/sqlite2/insert.c
index 2f73db4a..2f73db4a 100644
--- a/digikam/libs/sqlite2/insert.c
+++ b/src/libs/sqlite2/insert.c
diff --git a/digikam/libs/sqlite2/main.c b/src/libs/sqlite2/main.c
index 7541b171..7541b171 100644
--- a/digikam/libs/sqlite2/main.c
+++ b/src/libs/sqlite2/main.c
diff --git a/digikam/libs/sqlite2/opcodes.c b/src/libs/sqlite2/opcodes.c
index 0907e0e7..0907e0e7 100644
--- a/digikam/libs/sqlite2/opcodes.c
+++ b/src/libs/sqlite2/opcodes.c
diff --git a/digikam/libs/sqlite2/opcodes.h b/src/libs/sqlite2/opcodes.h
index 35e05069..35e05069 100644
--- a/digikam/libs/sqlite2/opcodes.h
+++ b/src/libs/sqlite2/opcodes.h
diff --git a/digikam/libs/sqlite2/os.c b/src/libs/sqlite2/os.c
index dccd65f1..dccd65f1 100644
--- a/digikam/libs/sqlite2/os.c
+++ b/src/libs/sqlite2/os.c
diff --git a/digikam/libs/sqlite2/os.h b/src/libs/sqlite2/os.h
index d11198c9..d11198c9 100644
--- a/digikam/libs/sqlite2/os.h
+++ b/src/libs/sqlite2/os.h
diff --git a/digikam/libs/sqlite2/pager.c b/src/libs/sqlite2/pager.c
index 409f9201..409f9201 100644
--- a/digikam/libs/sqlite2/pager.c
+++ b/src/libs/sqlite2/pager.c
diff --git a/digikam/libs/sqlite2/pager.h b/src/libs/sqlite2/pager.h
index 96f9d406..96f9d406 100644
--- a/digikam/libs/sqlite2/pager.h
+++ b/src/libs/sqlite2/pager.h
diff --git a/digikam/libs/sqlite2/parse.c b/src/libs/sqlite2/parse.c
index 46353691..46353691 100644
--- a/digikam/libs/sqlite2/parse.c
+++ b/src/libs/sqlite2/parse.c
diff --git a/digikam/libs/sqlite2/parse.h b/src/libs/sqlite2/parse.h
index 188a336c..188a336c 100644
--- a/digikam/libs/sqlite2/parse.h
+++ b/src/libs/sqlite2/parse.h
diff --git a/digikam/libs/sqlite2/pragma.c b/src/libs/sqlite2/pragma.c
index 7cb637fd..7cb637fd 100644
--- a/digikam/libs/sqlite2/pragma.c
+++ b/src/libs/sqlite2/pragma.c
diff --git a/digikam/libs/sqlite2/printf.c b/src/libs/sqlite2/printf.c
index a5445f60..a5445f60 100644
--- a/digikam/libs/sqlite2/printf.c
+++ b/src/libs/sqlite2/printf.c
diff --git a/digikam/libs/sqlite2/random.c b/src/libs/sqlite2/random.c
index 0d0a5447..0d0a5447 100644
--- a/digikam/libs/sqlite2/random.c
+++ b/src/libs/sqlite2/random.c
diff --git a/digikam/libs/sqlite2/select.c b/src/libs/sqlite2/select.c
index 4cf03606..4cf03606 100644
--- a/digikam/libs/sqlite2/select.c
+++ b/src/libs/sqlite2/select.c
diff --git a/digikam/libs/sqlite2/shell.c b/src/libs/sqlite2/shell.c
index 89898ab4..89898ab4 100644
--- a/digikam/libs/sqlite2/shell.c
+++ b/src/libs/sqlite2/shell.c
diff --git a/digikam/libs/sqlite2/sqlite.h b/src/libs/sqlite2/sqlite.h
index ef461bf7..ef461bf7 100644
--- a/digikam/libs/sqlite2/sqlite.h
+++ b/src/libs/sqlite2/sqlite.h
diff --git a/digikam/libs/sqlite2/sqliteInt.h b/src/libs/sqlite2/sqliteInt.h
index 3c4d818a..3c4d818a 100644
--- a/digikam/libs/sqlite2/sqliteInt.h
+++ b/src/libs/sqlite2/sqliteInt.h
diff --git a/digikam/libs/sqlite2/table.c b/src/libs/sqlite2/table.c
index 48c852d4..48c852d4 100644
--- a/digikam/libs/sqlite2/table.c
+++ b/src/libs/sqlite2/table.c
diff --git a/digikam/libs/sqlite2/tokenize.c b/src/libs/sqlite2/tokenize.c
index 1044e8a5..1044e8a5 100644
--- a/digikam/libs/sqlite2/tokenize.c
+++ b/src/libs/sqlite2/tokenize.c
diff --git a/digikam/libs/sqlite2/trigger.c b/src/libs/sqlite2/trigger.c
index 8442bb5d..8442bb5d 100644
--- a/digikam/libs/sqlite2/trigger.c
+++ b/src/libs/sqlite2/trigger.c
diff --git a/digikam/libs/sqlite2/update.c b/src/libs/sqlite2/update.c
index b36d0c21..b36d0c21 100644
--- a/digikam/libs/sqlite2/update.c
+++ b/src/libs/sqlite2/update.c
diff --git a/digikam/libs/sqlite2/util.c b/src/libs/sqlite2/util.c
index 579bf753..579bf753 100644
--- a/digikam/libs/sqlite2/util.c
+++ b/src/libs/sqlite2/util.c
diff --git a/digikam/libs/sqlite2/vacuum.c b/src/libs/sqlite2/vacuum.c
index 21556c3d..21556c3d 100644
--- a/digikam/libs/sqlite2/vacuum.c
+++ b/src/libs/sqlite2/vacuum.c
diff --git a/digikam/libs/sqlite2/vdbe.c b/src/libs/sqlite2/vdbe.c
index 1838691c..1838691c 100644
--- a/digikam/libs/sqlite2/vdbe.c
+++ b/src/libs/sqlite2/vdbe.c
diff --git a/digikam/libs/sqlite2/vdbe.h b/src/libs/sqlite2/vdbe.h
index 8dc1451c..8dc1451c 100644
--- a/digikam/libs/sqlite2/vdbe.h
+++ b/src/libs/sqlite2/vdbe.h
diff --git a/digikam/libs/sqlite2/vdbeInt.h b/src/libs/sqlite2/vdbeInt.h
index 79b6b51a..79b6b51a 100644
--- a/digikam/libs/sqlite2/vdbeInt.h
+++ b/src/libs/sqlite2/vdbeInt.h
diff --git a/digikam/libs/sqlite2/vdbeaux.c b/src/libs/sqlite2/vdbeaux.c
index c206bad4..c206bad4 100644
--- a/digikam/libs/sqlite2/vdbeaux.c
+++ b/src/libs/sqlite2/vdbeaux.c
diff --git a/digikam/libs/sqlite2/where.c b/src/libs/sqlite2/where.c
index ea427719..ea427719 100644
--- a/digikam/libs/sqlite2/where.c
+++ b/src/libs/sqlite2/where.c
diff --git a/digikam/libs/sqlite3/Makefile.am b/src/libs/sqlite3/Makefile.am
index b672e2c1..b672e2c1 100644
--- a/digikam/libs/sqlite3/Makefile.am
+++ b/src/libs/sqlite3/Makefile.am
diff --git a/digikam/libs/sqlite3/sqlite3.c b/src/libs/sqlite3/sqlite3.c
index 45077b4b..45077b4b 100644
--- a/digikam/libs/sqlite3/sqlite3.c
+++ b/src/libs/sqlite3/sqlite3.c
diff --git a/digikam/libs/sqlite3/sqlite3.h b/src/libs/sqlite3/sqlite3.h
index 57837cbb..57837cbb 100644
--- a/digikam/libs/sqlite3/sqlite3.h
+++ b/src/libs/sqlite3/sqlite3.h
diff --git a/digikam/libs/themeengine/Makefile.am b/src/libs/themeengine/Makefile.am
index 5612898a..f2e5f4ce 100644
--- a/digikam/libs/themeengine/Makefile.am
+++ b/src/libs/themeengine/Makefile.am
@@ -6,7 +6,7 @@ libthemeengine_la_SOURCES = theme.cpp themeengine.cpp texture.cpp
 
 libthemeengine_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
- 	       -I$(top_srcdir)/digikam/digikam \
-	       -I$(top_srcdir)/digikam/ \
-	       $(all_includes)
\ No newline at end of file
+INCLUDES = -I$(top_srcdir)/src/libs/dimg \
+ 	       -I$(top_srcdir)/src/digikam \
+	       -I$(top_srcdir)/src/ \
+	       $(all_includes)
diff --git a/digikam/libs/themeengine/texture.cpp b/src/libs/themeengine/texture.cpp
index e728dd59..e728dd59 100644
--- a/digikam/libs/themeengine/texture.cpp
+++ b/src/libs/themeengine/texture.cpp
diff --git a/digikam/libs/themeengine/texture.h b/src/libs/themeengine/texture.h
index 27ba73ee..27ba73ee 100644
--- a/digikam/libs/themeengine/texture.h
+++ b/src/libs/themeengine/texture.h
diff --git a/digikam/libs/themeengine/theme.cpp b/src/libs/themeengine/theme.cpp
index 8e4b5142..8e4b5142 100644
--- a/digikam/libs/themeengine/theme.cpp
+++ b/src/libs/themeengine/theme.cpp
diff --git a/digikam/libs/themeengine/theme.h b/src/libs/themeengine/theme.h
index fd80deff..fd80deff 100644
--- a/digikam/libs/themeengine/theme.h
+++ b/src/libs/themeengine/theme.h
diff --git a/digikam/libs/themeengine/themeengine.cpp b/src/libs/themeengine/themeengine.cpp
index 331ffa5d..331ffa5d 100644
--- a/digikam/libs/themeengine/themeengine.cpp
+++ b/src/libs/themeengine/themeengine.cpp
diff --git a/digikam/libs/themeengine/themeengine.h b/src/libs/themeengine/themeengine.h
index 33abfb07..33abfb07 100644
--- a/digikam/libs/themeengine/themeengine.h
+++ b/src/libs/themeengine/themeengine.h
diff --git a/digikam/libs/threadimageio/Makefile.am b/src/libs/threadimageio/Makefile.am
index 0cb73780..a301012e 100644
--- a/digikam/libs/threadimageio/Makefile.am
+++ b/src/libs/threadimageio/Makefile.am
@@ -14,10 +14,10 @@ libthreadimageio_la_SOURCES = loadsavethread.cpp \
 
 libthreadimageio_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dimg/loaders \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
+INCLUDES = -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dimg/loaders \
+	       -I$(top_srcdir)/src/libs/dmetadata \
 	       $(LIBKEXIV2_CFLAGS) \
-	       -I$(top_srcdir)/digikam/libs/jpegutils \
-	       -I$(top_srcdir)/digikam/digikam \
+	       -I$(top_srcdir)/src/libs/jpegutils \
+	       -I$(top_srcdir)/src/digikam \
 	       $(LIBKDCRAW_CFLAGS) $(all_includes)
diff --git a/digikam/libs/threadimageio/loadingcache.cpp b/src/libs/threadimageio/loadingcache.cpp
index 04dd3e4f..04dd3e4f 100644
--- a/digikam/libs/threadimageio/loadingcache.cpp
+++ b/src/libs/threadimageio/loadingcache.cpp
diff --git a/digikam/libs/threadimageio/loadingcache.h b/src/libs/threadimageio/loadingcache.h
index d4689305..d4689305 100644
--- a/digikam/libs/threadimageio/loadingcache.h
+++ b/src/libs/threadimageio/loadingcache.h
diff --git a/digikam/libs/threadimageio/loadingcacheinterface.cpp b/src/libs/threadimageio/loadingcacheinterface.cpp
index 8cfa5ab9..8cfa5ab9 100644
--- a/digikam/libs/threadimageio/loadingcacheinterface.cpp
+++ b/src/libs/threadimageio/loadingcacheinterface.cpp
diff --git a/digikam/libs/threadimageio/loadingcacheinterface.h b/src/libs/threadimageio/loadingcacheinterface.h
index ab3f4eca..ab3f4eca 100644
--- a/digikam/libs/threadimageio/loadingcacheinterface.h
+++ b/src/libs/threadimageio/loadingcacheinterface.h
diff --git a/digikam/libs/threadimageio/loadingdescription.cpp b/src/libs/threadimageio/loadingdescription.cpp
index 423ee99c..423ee99c 100644
--- a/digikam/libs/threadimageio/loadingdescription.cpp
+++ b/src/libs/threadimageio/loadingdescription.cpp
diff --git a/digikam/libs/threadimageio/loadingdescription.h b/src/libs/threadimageio/loadingdescription.h
index 848f2b17..848f2b17 100644
--- a/digikam/libs/threadimageio/loadingdescription.h
+++ b/src/libs/threadimageio/loadingdescription.h
diff --git a/digikam/libs/threadimageio/loadsavetask.cpp b/src/libs/threadimageio/loadsavetask.cpp
index 6879e533..6879e533 100644
--- a/digikam/libs/threadimageio/loadsavetask.cpp
+++ b/src/libs/threadimageio/loadsavetask.cpp
diff --git a/digikam/libs/threadimageio/loadsavetask.h b/src/libs/threadimageio/loadsavetask.h
index 833f86fa..833f86fa 100644
--- a/digikam/libs/threadimageio/loadsavetask.h
+++ b/src/libs/threadimageio/loadsavetask.h
diff --git a/digikam/libs/threadimageio/loadsavethread.cpp b/src/libs/threadimageio/loadsavethread.cpp
index 188592e9..188592e9 100644
--- a/digikam/libs/threadimageio/loadsavethread.cpp
+++ b/src/libs/threadimageio/loadsavethread.cpp
diff --git a/digikam/libs/threadimageio/loadsavethread.h b/src/libs/threadimageio/loadsavethread.h
index c935e47a..c935e47a 100644
--- a/digikam/libs/threadimageio/loadsavethread.h
+++ b/src/libs/threadimageio/loadsavethread.h
diff --git a/digikam/libs/threadimageio/managedloadsavethread.cpp b/src/libs/threadimageio/managedloadsavethread.cpp
index 51d9f1b7..51d9f1b7 100644
--- a/digikam/libs/threadimageio/managedloadsavethread.cpp
+++ b/src/libs/threadimageio/managedloadsavethread.cpp
diff --git a/digikam/libs/threadimageio/managedloadsavethread.h b/src/libs/threadimageio/managedloadsavethread.h
index ec6a563c..ec6a563c 100644
--- a/digikam/libs/threadimageio/managedloadsavethread.h
+++ b/src/libs/threadimageio/managedloadsavethread.h
diff --git a/digikam/libs/threadimageio/previewloadthread.cpp b/src/libs/threadimageio/previewloadthread.cpp
index d243ab32..d243ab32 100644
--- a/digikam/libs/threadimageio/previewloadthread.cpp
+++ b/src/libs/threadimageio/previewloadthread.cpp
diff --git a/digikam/libs/threadimageio/previewloadthread.h b/src/libs/threadimageio/previewloadthread.h
index 59cc6d72..59cc6d72 100644
--- a/digikam/libs/threadimageio/previewloadthread.h
+++ b/src/libs/threadimageio/previewloadthread.h
diff --git a/digikam/libs/threadimageio/previewtask.cpp b/src/libs/threadimageio/previewtask.cpp
index 5f277481..5f277481 100644
--- a/digikam/libs/threadimageio/previewtask.cpp
+++ b/src/libs/threadimageio/previewtask.cpp
diff --git a/digikam/libs/threadimageio/previewtask.h b/src/libs/threadimageio/previewtask.h
index f5715499..f5715499 100644
--- a/digikam/libs/threadimageio/previewtask.h
+++ b/src/libs/threadimageio/previewtask.h
diff --git a/digikam/libs/threadimageio/sharedloadsavethread.cpp b/src/libs/threadimageio/sharedloadsavethread.cpp
index 6a9cccbf..6a9cccbf 100644
--- a/digikam/libs/threadimageio/sharedloadsavethread.cpp
+++ b/src/libs/threadimageio/sharedloadsavethread.cpp
diff --git a/digikam/libs/threadimageio/sharedloadsavethread.h b/src/libs/threadimageio/sharedloadsavethread.h
index aa03a708..aa03a708 100644
--- a/digikam/libs/threadimageio/sharedloadsavethread.h
+++ b/src/libs/threadimageio/sharedloadsavethread.h
diff --git a/digikam/libs/thumbbar/Makefile.am b/src/libs/thumbbar/Makefile.am
index 1e6991a0..7e885514 100644
--- a/digikam/libs/thumbbar/Makefile.am
+++ b/src/libs/thumbbar/Makefile.am
@@ -6,9 +6,9 @@ libthumbbar_la_SOURCES = thumbbar.cpp thumbnailjob.cpp
 
 libthumbbar_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/digikam \
+INCLUDES = -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/digikam \
 		$(LIBKDCRAW_CFLAGS) \
 		$(LIBKEXIV2_CFLAGS) \
 		$(all_includes)
diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/src/libs/thumbbar/thumbbar.cpp
index f5b32767..f5b32767 100644
--- a/digikam/libs/thumbbar/thumbbar.cpp
+++ b/src/libs/thumbbar/thumbbar.cpp
diff --git a/digikam/libs/thumbbar/thumbbar.h b/src/libs/thumbbar/thumbbar.h
index 48ac574d..48ac574d 100644
--- a/digikam/libs/thumbbar/thumbbar.h
+++ b/src/libs/thumbbar/thumbbar.h
diff --git a/digikam/libs/thumbbar/thumbnailjob.cpp b/src/libs/thumbbar/thumbnailjob.cpp
index dcabb393..dcabb393 100644
--- a/digikam/libs/thumbbar/thumbnailjob.cpp
+++ b/src/libs/thumbbar/thumbnailjob.cpp
diff --git a/digikam/libs/thumbbar/thumbnailjob.h b/src/libs/thumbbar/thumbnailjob.h
index cc7080e3..cc7080e3 100644
--- a/digikam/libs/thumbbar/thumbnailjob.h
+++ b/src/libs/thumbbar/thumbnailjob.h
diff --git a/digikam/libs/whitebalance/Makefile.am b/src/libs/whitebalance/Makefile.am
index 97cad157..0325e16a 100644
--- a/digikam/libs/whitebalance/Makefile.am
+++ b/src/libs/whitebalance/Makefile.am
@@ -6,9 +6,9 @@ libwhitebalance_la_SOURCES = whitebalance.cpp
 
 libwhitebalance_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \
-	   -I$(top_srcdir)/digikam/libs/dimg \
-	   -I$(top_srcdir)/digikam/digikam \
+INCLUDES = -I$(top_srcdir)/src/libs/histogram \
+	   -I$(top_srcdir)/src/libs/dimg \
+	   -I$(top_srcdir)/src/digikam \
 	   $(all_includes) 
 
 digikaminclude_HEADERS = whitebalance.h 
diff --git a/digikam/libs/whitebalance/blackbody.h b/src/libs/whitebalance/blackbody.h
index 9a004d00..9a004d00 100644
--- a/digikam/libs/whitebalance/blackbody.h
+++ b/src/libs/whitebalance/blackbody.h
diff --git a/digikam/libs/whitebalance/whitebalance.cpp b/src/libs/whitebalance/whitebalance.cpp
index 9e74708d..9e74708d 100644
--- a/digikam/libs/whitebalance/whitebalance.cpp
+++ b/src/libs/whitebalance/whitebalance.cpp
diff --git a/digikam/libs/whitebalance/whitebalance.h b/src/libs/whitebalance/whitebalance.h
index 466fdc67..466fdc67 100644
--- a/digikam/libs/whitebalance/whitebalance.h
+++ b/src/libs/whitebalance/whitebalance.h
diff --git a/src/libs/widgets/Makefile.am b/src/libs/widgets/Makefile.am
new file mode 100644
index 00000000..699a4438
--- /dev/null
+++ b/src/libs/widgets/Makefile.am
@@ -0,0 +1,12 @@
+SUBDIRS = metadata imageplugins common iccprofiles
+
+noinst_LTLIBRARIES = libwidgets.la
+
+libwidgets_la_SOURCES =
+
+libwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+
+libwidgets_la_LIBADD = $(top_builddir)/src/libs/widgets/metadata/libmetadatawidgets.la \
+	               $(top_builddir)/src/libs/widgets/iccprofiles/libiccprofileswidgets.la \
+	               $(top_builddir)/src/libs/widgets/imageplugins/libimagepluginswidgets.la \
+	               $(top_builddir)/src/libs/widgets/common/libcommonwidgets.la 
diff --git a/digikam/libs/widgets/common/Makefile.am b/src/libs/widgets/common/Makefile.am
index da5f6ae1..287f60d8 100644
--- a/digikam/libs/widgets/common/Makefile.am
+++ b/src/libs/widgets/common/Makefile.am
@@ -9,11 +9,11 @@ libcommonwidgets_la_SOURCES = histogramwidget.cpp colorgradientwidget.cpp curves
 
 libcommonwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \
-	       -I$(top_srcdir)/digikam/libs/curves \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dimg/loaders \
-	       -I$(top_srcdir)/digikam/digikam \
+INCLUDES = -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/curves \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dimg/loaders \
+	       -I$(top_srcdir)/src/digikam \
 	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes)
 
diff --git a/digikam/libs/widgets/common/colorgradientwidget.cpp b/src/libs/widgets/common/colorgradientwidget.cpp
index df4c96ca..df4c96ca 100644
--- a/digikam/libs/widgets/common/colorgradientwidget.cpp
+++ b/src/libs/widgets/common/colorgradientwidget.cpp
diff --git a/digikam/libs/widgets/common/colorgradientwidget.h b/src/libs/widgets/common/colorgradientwidget.h
index aafc3df6..aafc3df6 100644
--- a/digikam/libs/widgets/common/colorgradientwidget.h
+++ b/src/libs/widgets/common/colorgradientwidget.h
diff --git a/digikam/libs/widgets/common/curveswidget.cpp b/src/libs/widgets/common/curveswidget.cpp
index 281aecc9..281aecc9 100644
--- a/digikam/libs/widgets/common/curveswidget.cpp
+++ b/src/libs/widgets/common/curveswidget.cpp
diff --git a/digikam/libs/widgets/common/curveswidget.h b/src/libs/widgets/common/curveswidget.h
index c9cfed4a..c9cfed4a 100644
--- a/digikam/libs/widgets/common/curveswidget.h
+++ b/src/libs/widgets/common/curveswidget.h
diff --git a/digikam/libs/widgets/common/dcursortracker.cpp b/src/libs/widgets/common/dcursortracker.cpp
index bb9490cb..bb9490cb 100644
--- a/digikam/libs/widgets/common/dcursortracker.cpp
+++ b/src/libs/widgets/common/dcursortracker.cpp
diff --git a/digikam/libs/widgets/common/dcursortracker.h b/src/libs/widgets/common/dcursortracker.h
index 33d322e1..33d322e1 100644
--- a/digikam/libs/widgets/common/dcursortracker.h
+++ b/src/libs/widgets/common/dcursortracker.h
diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/src/libs/widgets/common/dlogoaction.cpp
index 60cfd77f..60cfd77f 100644
--- a/digikam/libs/widgets/common/dlogoaction.cpp
+++ b/src/libs/widgets/common/dlogoaction.cpp
diff --git a/digikam/libs/widgets/common/dlogoaction.h b/src/libs/widgets/common/dlogoaction.h
index 11a0052d..11a0052d 100644
--- a/digikam/libs/widgets/common/dlogoaction.h
+++ b/src/libs/widgets/common/dlogoaction.h
diff --git a/digikam/libs/widgets/common/dpopupmenu.cpp b/src/libs/widgets/common/dpopupmenu.cpp
index f41404ce..f41404ce 100644
--- a/digikam/libs/widgets/common/dpopupmenu.cpp
+++ b/src/libs/widgets/common/dpopupmenu.cpp
diff --git a/digikam/libs/widgets/common/dpopupmenu.h b/src/libs/widgets/common/dpopupmenu.h
index f3576580..f3576580 100644
--- a/digikam/libs/widgets/common/dpopupmenu.h
+++ b/src/libs/widgets/common/dpopupmenu.h
diff --git a/digikam/libs/widgets/common/filesaveoptionsbox.cpp b/src/libs/widgets/common/filesaveoptionsbox.cpp
index 26985fb5..26985fb5 100644
--- a/digikam/libs/widgets/common/filesaveoptionsbox.cpp
+++ b/src/libs/widgets/common/filesaveoptionsbox.cpp
diff --git a/digikam/libs/widgets/common/filesaveoptionsbox.h b/src/libs/widgets/common/filesaveoptionsbox.h
index 9d9f84fc..9d9f84fc 100644
--- a/digikam/libs/widgets/common/filesaveoptionsbox.h
+++ b/src/libs/widgets/common/filesaveoptionsbox.h
diff --git a/digikam/libs/widgets/common/histogramwidget.cpp b/src/libs/widgets/common/histogramwidget.cpp
index b3017201..b3017201 100644
--- a/digikam/libs/widgets/common/histogramwidget.cpp
+++ b/src/libs/widgets/common/histogramwidget.cpp
diff --git a/digikam/libs/widgets/common/histogramwidget.h b/src/libs/widgets/common/histogramwidget.h
index 26157170..26157170 100644
--- a/digikam/libs/widgets/common/histogramwidget.h
+++ b/src/libs/widgets/common/histogramwidget.h
diff --git a/digikam/libs/widgets/common/paniconwidget.cpp b/src/libs/widgets/common/paniconwidget.cpp
index d5549691..d5549691 100644
--- a/digikam/libs/widgets/common/paniconwidget.cpp
+++ b/src/libs/widgets/common/paniconwidget.cpp
diff --git a/digikam/libs/widgets/common/paniconwidget.h b/src/libs/widgets/common/paniconwidget.h
index 40b0758e..40b0758e 100644
--- a/digikam/libs/widgets/common/paniconwidget.h
+++ b/src/libs/widgets/common/paniconwidget.h
diff --git a/digikam/libs/widgets/common/previewwidget.cpp b/src/libs/widgets/common/previewwidget.cpp
index 0fe5cb29..0fe5cb29 100644
--- a/digikam/libs/widgets/common/previewwidget.cpp
+++ b/src/libs/widgets/common/previewwidget.cpp
diff --git a/digikam/libs/widgets/common/previewwidget.h b/src/libs/widgets/common/previewwidget.h
index 03369a42..03369a42 100644
--- a/digikam/libs/widgets/common/previewwidget.h
+++ b/src/libs/widgets/common/previewwidget.h
diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/src/libs/widgets/common/searchtextbar.cpp
index 1a81c03b..1a81c03b 100644
--- a/digikam/libs/widgets/common/searchtextbar.cpp
+++ b/src/libs/widgets/common/searchtextbar.cpp
diff --git a/digikam/libs/widgets/common/searchtextbar.h b/src/libs/widgets/common/searchtextbar.h
index 04ef9947..04ef9947 100644
--- a/digikam/libs/widgets/common/searchtextbar.h
+++ b/src/libs/widgets/common/searchtextbar.h
diff --git a/digikam/libs/widgets/common/sidebar.cpp b/src/libs/widgets/common/sidebar.cpp
index a1bcd752..a1bcd752 100644
--- a/digikam/libs/widgets/common/sidebar.cpp
+++ b/src/libs/widgets/common/sidebar.cpp
diff --git a/digikam/libs/widgets/common/sidebar.h b/src/libs/widgets/common/sidebar.h
index 8d2dc519..8d2dc519 100644
--- a/digikam/libs/widgets/common/sidebar.h
+++ b/src/libs/widgets/common/sidebar.h
diff --git a/digikam/libs/widgets/common/splashscreen.cpp b/src/libs/widgets/common/splashscreen.cpp
index 7a8cbba1..7a8cbba1 100644
--- a/digikam/libs/widgets/common/splashscreen.cpp
+++ b/src/libs/widgets/common/splashscreen.cpp
diff --git a/digikam/libs/widgets/common/splashscreen.h b/src/libs/widgets/common/splashscreen.h
index d2d4cf45..d2d4cf45 100644
--- a/digikam/libs/widgets/common/splashscreen.h
+++ b/src/libs/widgets/common/splashscreen.h
diff --git a/digikam/libs/widgets/common/squeezedcombobox.cpp b/src/libs/widgets/common/squeezedcombobox.cpp
index b70da094..b70da094 100644
--- a/digikam/libs/widgets/common/squeezedcombobox.cpp
+++ b/src/libs/widgets/common/squeezedcombobox.cpp
diff --git a/digikam/libs/widgets/common/squeezedcombobox.h b/src/libs/widgets/common/squeezedcombobox.h
index 7baaeca1..7baaeca1 100644
--- a/digikam/libs/widgets/common/squeezedcombobox.h
+++ b/src/libs/widgets/common/squeezedcombobox.h
diff --git a/digikam/libs/widgets/common/statusled.cpp b/src/libs/widgets/common/statusled.cpp
index e0475057..e0475057 100644
--- a/digikam/libs/widgets/common/statusled.cpp
+++ b/src/libs/widgets/common/statusled.cpp
diff --git a/digikam/libs/widgets/common/statusled.h b/src/libs/widgets/common/statusled.h
index 2fd94cb2..2fd94cb2 100644
--- a/digikam/libs/widgets/common/statusled.h
+++ b/src/libs/widgets/common/statusled.h
diff --git a/digikam/libs/widgets/common/statusnavigatebar.cpp b/src/libs/widgets/common/statusnavigatebar.cpp
index 0ebcaf84..0ebcaf84 100644
--- a/digikam/libs/widgets/common/statusnavigatebar.cpp
+++ b/src/libs/widgets/common/statusnavigatebar.cpp
diff --git a/digikam/libs/widgets/common/statusnavigatebar.h b/src/libs/widgets/common/statusnavigatebar.h
index 7972f740..7972f740 100644
--- a/digikam/libs/widgets/common/statusnavigatebar.h
+++ b/src/libs/widgets/common/statusnavigatebar.h
diff --git a/digikam/libs/widgets/common/statusprogressbar.cpp b/src/libs/widgets/common/statusprogressbar.cpp
index 215f81fe..215f81fe 100644
--- a/digikam/libs/widgets/common/statusprogressbar.cpp
+++ b/src/libs/widgets/common/statusprogressbar.cpp
diff --git a/digikam/libs/widgets/common/statusprogressbar.h b/src/libs/widgets/common/statusprogressbar.h
index e227a6de..e227a6de 100644
--- a/digikam/libs/widgets/common/statusprogressbar.h
+++ b/src/libs/widgets/common/statusprogressbar.h
diff --git a/digikam/libs/widgets/common/statuszoombar.cpp b/src/libs/widgets/common/statuszoombar.cpp
index 44302481..44302481 100644
--- a/digikam/libs/widgets/common/statuszoombar.cpp
+++ b/src/libs/widgets/common/statuszoombar.cpp
diff --git a/digikam/libs/widgets/common/statuszoombar.h b/src/libs/widgets/common/statuszoombar.h
index adf69416..adf69416 100644
--- a/digikam/libs/widgets/common/statuszoombar.h
+++ b/src/libs/widgets/common/statuszoombar.h
diff --git a/digikam/libs/widgets/iccprofiles/Makefile.am b/src/libs/widgets/iccprofiles/Makefile.am
index 875da81f..8888d326 100644
--- a/digikam/libs/widgets/iccprofiles/Makefile.am
+++ b/src/libs/widgets/iccprofiles/Makefile.am
@@ -6,14 +6,14 @@ libiccprofileswidgets_la_SOURCES = iccprofilewidget.cpp cietonguewidget.cpp iccp
 
 libiccprofileswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-libiccprofileswidgets_la_LIBADD = $(top_builddir)/digikam/libs/lprof/liblprof.la 
+libiccprofileswidgets_la_LIBADD = $(top_builddir)/src/libs/lprof/liblprof.la 
                  
-INCLUDES = -I$(top_srcdir)/digikam/libs/widgets/metadata \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/lprof \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/digikam \
+INCLUDES = -I$(top_srcdir)/src/libs/widgets/metadata \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/lprof \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/digikam \
 		$(LIBKDCRAW_CFLAGS) \
 		$(LIBKEXIV2_CFLAGS) \
 		$(all_includes)
diff --git a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp b/src/libs/widgets/iccprofiles/cietonguewidget.cpp
index 2ec738b3..2ec738b3 100644
--- a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp
+++ b/src/libs/widgets/iccprofiles/cietonguewidget.cpp
diff --git a/digikam/libs/widgets/iccprofiles/cietonguewidget.h b/src/libs/widgets/iccprofiles/cietonguewidget.h
index 9fc8503d..9fc8503d 100644
--- a/digikam/libs/widgets/iccprofiles/cietonguewidget.h
+++ b/src/libs/widgets/iccprofiles/cietonguewidget.h
diff --git a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.cpp b/src/libs/widgets/iccprofiles/iccpreviewwidget.cpp
index 3398b37f..3398b37f 100644
--- a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.cpp
+++ b/src/libs/widgets/iccprofiles/iccpreviewwidget.cpp
diff --git a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h b/src/libs/widgets/iccprofiles/iccpreviewwidget.h
index 89b1f4b5..89b1f4b5 100644
--- a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h
+++ b/src/libs/widgets/iccprofiles/iccpreviewwidget.h
diff --git a/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp b/src/libs/widgets/iccprofiles/iccprofilewidget.cpp
index 2e5152f7..2e5152f7 100644
--- a/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp
+++ b/src/libs/widgets/iccprofiles/iccprofilewidget.cpp
diff --git a/digikam/libs/widgets/iccprofiles/iccprofilewidget.h b/src/libs/widgets/iccprofiles/iccprofilewidget.h
index d753f30e..d753f30e 100644
--- a/digikam/libs/widgets/iccprofiles/iccprofilewidget.h
+++ b/src/libs/widgets/iccprofiles/iccprofilewidget.h
diff --git a/digikam/libs/widgets/imageplugins/Makefile.am b/src/libs/widgets/imageplugins/Makefile.am
index ec9006e9..d223cb05 100644
--- a/digikam/libs/widgets/imageplugins/Makefile.am
+++ b/src/libs/widgets/imageplugins/Makefile.am
@@ -7,11 +7,11 @@ libimagepluginswidgets_la_SOURCES = imageregionwidget.cpp imagepaniconwidget.cpp
 
 libimagepluginswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
                  
-INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/digikam \
+INCLUDES = -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/digikam \
 		$(LIBKDCRAW_CFLAGS) \
 		$(all_includes)
 
diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp b/src/libs/widgets/imageplugins/imageguidewidget.cpp
index 4ed7f254..4ed7f254 100644
--- a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp
+++ b/src/libs/widgets/imageplugins/imageguidewidget.cpp
diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.h b/src/libs/widgets/imageplugins/imageguidewidget.h
index 48d6d246..48d6d246 100644
--- a/digikam/libs/widgets/imageplugins/imageguidewidget.h
+++ b/src/libs/widgets/imageplugins/imageguidewidget.h
diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp b/src/libs/widgets/imageplugins/imagepanelwidget.cpp
index 4551e09e..4551e09e 100644
--- a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp
+++ b/src/libs/widgets/imageplugins/imagepanelwidget.cpp
diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.h b/src/libs/widgets/imageplugins/imagepanelwidget.h
index 32179da9..32179da9 100644
--- a/digikam/libs/widgets/imageplugins/imagepanelwidget.h
+++ b/src/libs/widgets/imageplugins/imagepanelwidget.h
diff --git a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp b/src/libs/widgets/imageplugins/imagepaniconwidget.cpp
index 38564228..38564228 100644
--- a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp
+++ b/src/libs/widgets/imageplugins/imagepaniconwidget.cpp
diff --git a/digikam/libs/widgets/imageplugins/imagepaniconwidget.h b/src/libs/widgets/imageplugins/imagepaniconwidget.h
index e7d6ffb7..e7d6ffb7 100644
--- a/digikam/libs/widgets/imageplugins/imagepaniconwidget.h
+++ b/src/libs/widgets/imageplugins/imagepaniconwidget.h
diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp b/src/libs/widgets/imageplugins/imagepannelwidget.cpp
index cebf0f3c..cebf0f3c 100644
--- a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp
+++ b/src/libs/widgets/imageplugins/imagepannelwidget.cpp
diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.h b/src/libs/widgets/imageplugins/imagepannelwidget.h
index a3429887..a3429887 100644
--- a/digikam/libs/widgets/imageplugins/imagepannelwidget.h
+++ b/src/libs/widgets/imageplugins/imagepannelwidget.h
diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp b/src/libs/widgets/imageplugins/imageregionwidget.cpp
index c1392cc2..c1392cc2 100644
--- a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp
+++ b/src/libs/widgets/imageplugins/imageregionwidget.cpp
diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.h b/src/libs/widgets/imageplugins/imageregionwidget.h
index 8555703d..8555703d 100644
--- a/digikam/libs/widgets/imageplugins/imageregionwidget.h
+++ b/src/libs/widgets/imageplugins/imageregionwidget.h
diff --git a/digikam/libs/widgets/imageplugins/imagewidget.cpp b/src/libs/widgets/imageplugins/imagewidget.cpp
index ab73bbf7..ab73bbf7 100644
--- a/digikam/libs/widgets/imageplugins/imagewidget.cpp
+++ b/src/libs/widgets/imageplugins/imagewidget.cpp
diff --git a/digikam/libs/widgets/imageplugins/imagewidget.h b/src/libs/widgets/imageplugins/imagewidget.h
index ebdf92e9..ebdf92e9 100644
--- a/digikam/libs/widgets/imageplugins/imagewidget.h
+++ b/src/libs/widgets/imageplugins/imagewidget.h
diff --git a/digikam/libs/widgets/imageplugins/listboxpreviewitem.cpp b/src/libs/widgets/imageplugins/listboxpreviewitem.cpp
index 8ba63a61..8ba63a61 100644
--- a/digikam/libs/widgets/imageplugins/listboxpreviewitem.cpp
+++ b/src/libs/widgets/imageplugins/listboxpreviewitem.cpp
diff --git a/digikam/libs/widgets/imageplugins/listboxpreviewitem.h b/src/libs/widgets/imageplugins/listboxpreviewitem.h
index 50b769c6..50b769c6 100644
--- a/digikam/libs/widgets/imageplugins/listboxpreviewitem.h
+++ b/src/libs/widgets/imageplugins/listboxpreviewitem.h
diff --git a/digikam/libs/widgets/metadata/Makefile.am b/src/libs/widgets/metadata/Makefile.am
index 55939c72..4fe62356 100644
--- a/digikam/libs/widgets/metadata/Makefile.am
+++ b/src/libs/widgets/metadata/Makefile.am
@@ -8,10 +8,10 @@ libmetadatawidgets_la_SOURCES = metadatalistview.cpp metadatalistviewitem.cpp me
 
 libmetadatawidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-INCLUDES = -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/themeengine \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/digikam \
+INCLUDES = -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/themeengine \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/digikam \
 	       $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes)
diff --git a/digikam/libs/widgets/metadata/exifwidget.cpp b/src/libs/widgets/metadata/exifwidget.cpp
index 7761c250..7761c250 100644
--- a/digikam/libs/widgets/metadata/exifwidget.cpp
+++ b/src/libs/widgets/metadata/exifwidget.cpp
diff --git a/digikam/libs/widgets/metadata/exifwidget.h b/src/libs/widgets/metadata/exifwidget.h
index ba66d085..ba66d085 100644
--- a/digikam/libs/widgets/metadata/exifwidget.h
+++ b/src/libs/widgets/metadata/exifwidget.h
diff --git a/digikam/libs/widgets/metadata/gpswidget.cpp b/src/libs/widgets/metadata/gpswidget.cpp
index 033423e9..033423e9 100644
--- a/digikam/libs/widgets/metadata/gpswidget.cpp
+++ b/src/libs/widgets/metadata/gpswidget.cpp
diff --git a/digikam/libs/widgets/metadata/gpswidget.h b/src/libs/widgets/metadata/gpswidget.h
index fd787d67..fd787d67 100644
--- a/digikam/libs/widgets/metadata/gpswidget.h
+++ b/src/libs/widgets/metadata/gpswidget.h
diff --git a/digikam/libs/widgets/metadata/iptcwidget.cpp b/src/libs/widgets/metadata/iptcwidget.cpp
index b0bcb009..b0bcb009 100644
--- a/digikam/libs/widgets/metadata/iptcwidget.cpp
+++ b/src/libs/widgets/metadata/iptcwidget.cpp
diff --git a/digikam/libs/widgets/metadata/iptcwidget.h b/src/libs/widgets/metadata/iptcwidget.h
index 58f1449e..58f1449e 100644
--- a/digikam/libs/widgets/metadata/iptcwidget.h
+++ b/src/libs/widgets/metadata/iptcwidget.h
diff --git a/digikam/libs/widgets/metadata/makernotewidget.cpp b/src/libs/widgets/metadata/makernotewidget.cpp
index ddd1fe3c..ddd1fe3c 100644
--- a/digikam/libs/widgets/metadata/makernotewidget.cpp
+++ b/src/libs/widgets/metadata/makernotewidget.cpp
diff --git a/digikam/libs/widgets/metadata/makernotewidget.h b/src/libs/widgets/metadata/makernotewidget.h
index f6549591..f6549591 100644
--- a/digikam/libs/widgets/metadata/makernotewidget.h
+++ b/src/libs/widgets/metadata/makernotewidget.h
diff --git a/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp b/src/libs/widgets/metadata/mdkeylistviewitem.cpp
index 27963eaf..27963eaf 100644
--- a/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp
+++ b/src/libs/widgets/metadata/mdkeylistviewitem.cpp
diff --git a/digikam/libs/widgets/metadata/mdkeylistviewitem.h b/src/libs/widgets/metadata/mdkeylistviewitem.h
index aeaf7e4c..aeaf7e4c 100644
--- a/digikam/libs/widgets/metadata/mdkeylistviewitem.h
+++ b/src/libs/widgets/metadata/mdkeylistviewitem.h
diff --git a/digikam/libs/widgets/metadata/metadatalistview.cpp b/src/libs/widgets/metadata/metadatalistview.cpp
index 612eed1e..612eed1e 100644
--- a/digikam/libs/widgets/metadata/metadatalistview.cpp
+++ b/src/libs/widgets/metadata/metadatalistview.cpp
diff --git a/digikam/libs/widgets/metadata/metadatalistview.h b/src/libs/widgets/metadata/metadatalistview.h
index aefe6498..aefe6498 100644
--- a/digikam/libs/widgets/metadata/metadatalistview.h
+++ b/src/libs/widgets/metadata/metadatalistview.h
diff --git a/digikam/libs/widgets/metadata/metadatalistviewitem.cpp b/src/libs/widgets/metadata/metadatalistviewitem.cpp
index f18056b5..f18056b5 100644
--- a/digikam/libs/widgets/metadata/metadatalistviewitem.cpp
+++ b/src/libs/widgets/metadata/metadatalistviewitem.cpp
diff --git a/digikam/libs/widgets/metadata/metadatalistviewitem.h b/src/libs/widgets/metadata/metadatalistviewitem.h
index 4a860d5b..4a860d5b 100644
--- a/digikam/libs/widgets/metadata/metadatalistviewitem.h
+++ b/src/libs/widgets/metadata/metadatalistviewitem.h
diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/src/libs/widgets/metadata/metadatawidget.cpp
index d0bd5b19..d0bd5b19 100644
--- a/digikam/libs/widgets/metadata/metadatawidget.cpp
+++ b/src/libs/widgets/metadata/metadatawidget.cpp
diff --git a/digikam/libs/widgets/metadata/metadatawidget.h b/src/libs/widgets/metadata/metadatawidget.h
index 5d2feb64..5d2feb64 100644
--- a/digikam/libs/widgets/metadata/metadatawidget.h
+++ b/src/libs/widgets/metadata/metadatawidget.h
diff --git a/digikam/libs/widgets/metadata/worldmapwidget.cpp b/src/libs/widgets/metadata/worldmapwidget.cpp
index 811e9148..811e9148 100644
--- a/digikam/libs/widgets/metadata/worldmapwidget.cpp
+++ b/src/libs/widgets/metadata/worldmapwidget.cpp
diff --git a/digikam/libs/widgets/metadata/worldmapwidget.h b/src/libs/widgets/metadata/worldmapwidget.h
index bfb8ad8f..bfb8ad8f 100644
--- a/digikam/libs/widgets/metadata/worldmapwidget.h
+++ b/src/libs/widgets/metadata/worldmapwidget.h
diff --git a/src/showfoto/Makefile.am b/src/showfoto/Makefile.am
new file mode 100644
index 00000000..9f5f5064
--- /dev/null
+++ b/src/showfoto/Makefile.am
@@ -0,0 +1,42 @@
+SUBDIRS = setup 
+
+METASOURCES = AUTO  
+
+bin_PROGRAMS = showfoto
+
+INCLUDES = -I$(top_srcdir)/src/showfoto/setup \
+	   -I$(top_srcdir)/src/utilities/setup \
+	   -I$(top_srcdir)/src/libs/thumbbar \
+	   -I$(top_srcdir)/src/libs/widgets/common \
+	   -I$(top_srcdir)/src/libs/imageproperties \
+	   -I$(top_srcdir)/src/libs/histogram \
+	   -I$(top_srcdir)/src/libs/dimg \
+	   -I$(top_srcdir)/src/libs/dmetadata \
+	   -I$(top_srcdir)/src/libs/threadimageio \
+	   -I$(top_srcdir)/src/libs/themeengine \
+	   -I$(top_srcdir)/src/libs/dialogs \
+	   -I$(top_srcdir)/src/digikam \
+	   -I$(top_srcdir)/src/utilities/slideshow \
+	   -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	   -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	   -I$(top_srcdir)/src/utilities/imageeditor/tools \
+	   $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes)
+
+showfoto_SOURCES = main.cpp showfoto.cpp 
+
+showfoto_LDADD   = $(top_builddir)/src/showfoto/setup/libsetup.la \
+	           $(top_builddir)/src/libs/imageproperties/libimagepropertiesshowfoto.la \
+	           $(top_builddir)/src/libs/thumbbar/libthumbbar.la \
+	           $(top_builddir)/src/utilities/imageeditor/editor/libshowfoto.la \
+	           $(top_builddir)/src/utilities/slideshow/libslideshow.la \
+	           $(top_builddir)/src/libs/threadimageio/libthreadimageio.la \
+	           $(top_builddir)/src/libs/themeengine/libthemeengine.la \
+	           $(top_builddir)/src/libs/jpegutils/libjpegutils.la \
+	           $(LIB_TDEUTILS) $(LIB_TDEPARTS) $(LIBJPEG)  
+
+showfoto_LDFLAGS = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) $(KDE_RPATH) $(all_libraries)
+
+rcdir = $(kde_datadir)/showfoto
+rc_DATA = showfotoui.rc
+
+xdg_apps_DATA = showfoto.desktop
diff --git a/digikam/showfoto/main.cpp b/src/showfoto/main.cpp
index 0be2a542..0be2a542 100644
--- a/digikam/showfoto/main.cpp
+++ b/src/showfoto/main.cpp
diff --git a/digikam/showfoto/setup/Makefile.am b/src/showfoto/setup/Makefile.am
index 7d5ee2b8..d2767031 100644
--- a/digikam/showfoto/setup/Makefile.am
+++ b/src/showfoto/setup/Makefile.am
@@ -1,7 +1,7 @@
 METASOURCES = AUTO
 
-INCLUDES = -I$(top_srcdir)/digikam/utilities/setup \
-	   -I$(top_srcdir)/digikam/digikam \
+INCLUDES = -I$(top_srcdir)/src/utilities/setup \
+	   -I$(top_srcdir)/src/digikam \
 	   $(all_includes)
 
 noinst_LTLIBRARIES = libsetup.la
@@ -10,5 +10,5 @@ libsetup_la_SOURCES = setup.cpp setupeditor.cpp setuptooltip.cpp
 
 libsetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-libsetup_la_LIBADD = $(top_builddir)/digikam/utilities/setup/libshowfotosetup.la 
+libsetup_la_LIBADD = $(top_builddir)/src/utilities/setup/libshowfotosetup.la 
 
diff --git a/digikam/showfoto/setup/setup.cpp b/src/showfoto/setup/setup.cpp
index 85ec82d2..85ec82d2 100644
--- a/digikam/showfoto/setup/setup.cpp
+++ b/src/showfoto/setup/setup.cpp
diff --git a/digikam/showfoto/setup/setup.h b/src/showfoto/setup/setup.h
index 8f97acbd..8f97acbd 100644
--- a/digikam/showfoto/setup/setup.h
+++ b/src/showfoto/setup/setup.h
diff --git a/digikam/showfoto/setup/setupeditor.cpp b/src/showfoto/setup/setupeditor.cpp
index 19bab8fb..19bab8fb 100644
--- a/digikam/showfoto/setup/setupeditor.cpp
+++ b/src/showfoto/setup/setupeditor.cpp
diff --git a/digikam/showfoto/setup/setupeditor.h b/src/showfoto/setup/setupeditor.h
index 877af8de..877af8de 100644
--- a/digikam/showfoto/setup/setupeditor.h
+++ b/src/showfoto/setup/setupeditor.h
diff --git a/digikam/showfoto/setup/setuptooltip.cpp b/src/showfoto/setup/setuptooltip.cpp
index d3a08678..d3a08678 100644
--- a/digikam/showfoto/setup/setuptooltip.cpp
+++ b/src/showfoto/setup/setuptooltip.cpp
diff --git a/digikam/showfoto/setup/setuptooltip.h b/src/showfoto/setup/setuptooltip.h
index ebd73f6e..ebd73f6e 100644
--- a/digikam/showfoto/setup/setuptooltip.h
+++ b/src/showfoto/setup/setuptooltip.h
diff --git a/digikam/showfoto/showfoto.cpp b/src/showfoto/showfoto.cpp
index 42575833..42575833 100644
--- a/digikam/showfoto/showfoto.cpp
+++ b/src/showfoto/showfoto.cpp
diff --git a/digikam/showfoto/showfoto.desktop b/src/showfoto/showfoto.desktop
index a4492c35..a4492c35 100644
--- a/digikam/showfoto/showfoto.desktop
+++ b/src/showfoto/showfoto.desktop
diff --git a/digikam/showfoto/showfoto.h b/src/showfoto/showfoto.h
index 8bd3618e..8bd3618e 100644
--- a/digikam/showfoto/showfoto.h
+++ b/src/showfoto/showfoto.h
diff --git a/digikam/showfoto/showfotoui.rc b/src/showfoto/showfotoui.rc
index 7e8e497d..7e8e497d 100644
--- a/digikam/showfoto/showfotoui.rc
+++ b/src/showfoto/showfotoui.rc
diff --git a/digikam/tdeioslave/Makefile.am b/src/tdeioslave/Makefile.am
index 03136056..28b8a2ff 100644
--- a/digikam/tdeioslave/Makefile.am
+++ b/src/tdeioslave/Makefile.am
@@ -1,14 +1,14 @@
 METASOURCES = AUTO  
 
 if with_included_sqlite3
-    LIB_SQLITE3_LOCAL = $(top_builddir)/digikam/libs/sqlite3/libsqlite3.la
-    SQLITE3_INCLUDES = -I$(top_srcdir)/digikam/libs/sqlite3
+    LIB_SQLITE3_LOCAL = $(top_builddir)/src/libs/sqlite3/libsqlite3.la
+    SQLITE3_INCLUDES = -I$(top_srcdir)/src/libs/sqlite3
 endif
 
-INCLUDES = -I$(top_srcdir)/digikam/libs/jpegutils \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/digikam \
+INCLUDES = -I$(top_srcdir)/src/libs/jpegutils \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/digikam \
 	       $(SQLITE3_INCLUDES) \
 	       $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes)
@@ -31,8 +31,8 @@ protocoldir = $(kde_servicesdir)
 tdeio_digikamthumbnail_la_SOURCES = digikamthumbnail.cpp 
 
 tdeio_digikamthumbnail_la_LIBADD  = $(LIB_TDEIO) $(LIBJPEG) $(LIBPNG) \
-	                              $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \
-	                              $(top_builddir)/digikam/libs/dimg/libdimg.la
+	                              $(top_builddir)/src/libs/jpegutils/libjpegutils.la \
+	                              $(top_builddir)/src/libs/dimg/libdimg.la
 
 tdeio_digikamthumbnail_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx
 
@@ -48,8 +48,8 @@ tdeio_digikamtags_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLU
 
 tdeio_digikamalbums_la_SOURCES = digikamalbums.cpp sqlitedb.cpp
 
-tdeio_digikamalbums_la_LIBADD  = $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \
-	                           $(top_builddir)/digikam/libs/dimg/libdimg.la \
+tdeio_digikamalbums_la_LIBADD  = $(top_builddir)/src/libs/jpegutils/libjpegutils.la \
+	                           $(top_builddir)/src/libs/dimg/libdimg.la \
 	                           $(LIB_TDEIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) 
 
 
diff --git a/digikam/tdeioslave/digikamalbums.cpp b/src/tdeioslave/digikamalbums.cpp
index c16080af..c16080af 100644
--- a/digikam/tdeioslave/digikamalbums.cpp
+++ b/src/tdeioslave/digikamalbums.cpp
diff --git a/digikam/tdeioslave/digikamalbums.h b/src/tdeioslave/digikamalbums.h
index c75e8c9c..c75e8c9c 100644
--- a/digikam/tdeioslave/digikamalbums.h
+++ b/src/tdeioslave/digikamalbums.h
diff --git a/digikam/tdeioslave/digikamalbums.protocol b/src/tdeioslave/digikamalbums.protocol
index e2b094af..e2b094af 100644
--- a/digikam/tdeioslave/digikamalbums.protocol
+++ b/src/tdeioslave/digikamalbums.protocol
diff --git a/digikam/tdeioslave/digikamdates.cpp b/src/tdeioslave/digikamdates.cpp
index 9e7f4e27..9e7f4e27 100644
--- a/digikam/tdeioslave/digikamdates.cpp
+++ b/src/tdeioslave/digikamdates.cpp
diff --git a/digikam/tdeioslave/digikamdates.h b/src/tdeioslave/digikamdates.h
index 4ba75749..4ba75749 100644
--- a/digikam/tdeioslave/digikamdates.h
+++ b/src/tdeioslave/digikamdates.h
diff --git a/digikam/tdeioslave/digikamdates.protocol b/src/tdeioslave/digikamdates.protocol
index a21352bd..a21352bd 100644
--- a/digikam/tdeioslave/digikamdates.protocol
+++ b/src/tdeioslave/digikamdates.protocol
diff --git a/digikam/tdeioslave/digikamsearch.cpp b/src/tdeioslave/digikamsearch.cpp
index 225a900f..225a900f 100644
--- a/digikam/tdeioslave/digikamsearch.cpp
+++ b/src/tdeioslave/digikamsearch.cpp
diff --git a/digikam/tdeioslave/digikamsearch.h b/src/tdeioslave/digikamsearch.h
index a17a6c82..a17a6c82 100644
--- a/digikam/tdeioslave/digikamsearch.h
+++ b/src/tdeioslave/digikamsearch.h
diff --git a/digikam/tdeioslave/digikamsearch.protocol b/src/tdeioslave/digikamsearch.protocol
index be2f3d4a..be2f3d4a 100644
--- a/digikam/tdeioslave/digikamsearch.protocol
+++ b/src/tdeioslave/digikamsearch.protocol
diff --git a/digikam/tdeioslave/digikamtags.cpp b/src/tdeioslave/digikamtags.cpp
index 3fd14987..3fd14987 100644
--- a/digikam/tdeioslave/digikamtags.cpp
+++ b/src/tdeioslave/digikamtags.cpp
diff --git a/digikam/tdeioslave/digikamtags.h b/src/tdeioslave/digikamtags.h
index 9f9099d4..9f9099d4 100644
--- a/digikam/tdeioslave/digikamtags.h
+++ b/src/tdeioslave/digikamtags.h
diff --git a/digikam/tdeioslave/digikamtags.protocol b/src/tdeioslave/digikamtags.protocol
index 88c33e65..88c33e65 100644
--- a/digikam/tdeioslave/digikamtags.protocol
+++ b/src/tdeioslave/digikamtags.protocol
diff --git a/digikam/tdeioslave/digikamthumbnail.cpp b/src/tdeioslave/digikamthumbnail.cpp
index 3dd4df28..3dd4df28 100644
--- a/digikam/tdeioslave/digikamthumbnail.cpp
+++ b/src/tdeioslave/digikamthumbnail.cpp
diff --git a/digikam/tdeioslave/digikamthumbnail.h b/src/tdeioslave/digikamthumbnail.h
index a83db66b..a83db66b 100644
--- a/digikam/tdeioslave/digikamthumbnail.h
+++ b/src/tdeioslave/digikamthumbnail.h
diff --git a/digikam/tdeioslave/digikamthumbnail.protocol b/src/tdeioslave/digikamthumbnail.protocol
index 3980f895..3980f895 100644
--- a/digikam/tdeioslave/digikamthumbnail.protocol
+++ b/src/tdeioslave/digikamthumbnail.protocol
diff --git a/digikam/tdeioslave/sqlitedb.cpp b/src/tdeioslave/sqlitedb.cpp
index 3df6b80b..3df6b80b 100644
--- a/digikam/tdeioslave/sqlitedb.cpp
+++ b/src/tdeioslave/sqlitedb.cpp
diff --git a/digikam/tdeioslave/sqlitedb.h b/src/tdeioslave/sqlitedb.h
index a3b793f8..a3b793f8 100644
--- a/digikam/tdeioslave/sqlitedb.h
+++ b/src/tdeioslave/sqlitedb.h
diff --git a/digikam/themedesigner/Makefile.am b/src/themedesigner/Makefile.am
index 3375c23d..98c9dce6 100644
--- a/digikam/themedesigner/Makefile.am
+++ b/src/themedesigner/Makefile.am
@@ -1,11 +1,11 @@
 METASOURCES = AUTO
 
-INCLUDES = -I$(top_srcdir)/digikam/digikam \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/themeengine \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/imageproperties \
+INCLUDES = -I$(top_srcdir)/src/digikam \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/themeengine \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/imageproperties \
 	       $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes) 
 
 bin_PROGRAMS = digikamthemedesigner
@@ -14,6 +14,6 @@ digikamthemedesigner_SOURCES = main.cpp mainwindow.cpp themedicongroupitem.cpp \
                                themediconitem.cpp themediconview.cpp 
 
 digikamthemedesigner_LDADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) \
-	                     $(top_builddir)/digikam/digikam/libdigikam.la 
+	                     $(top_builddir)/src/digikam/libdigikam.la 
 
 digikamthemedesigner_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEUTILS)
diff --git a/digikam/themedesigner/main.cpp b/src/themedesigner/main.cpp
index 27bc7459..27bc7459 100644
--- a/digikam/themedesigner/main.cpp
+++ b/src/themedesigner/main.cpp
diff --git a/digikam/themedesigner/mainwindow.cpp b/src/themedesigner/mainwindow.cpp
index f51a4f64..f51a4f64 100644
--- a/digikam/themedesigner/mainwindow.cpp
+++ b/src/themedesigner/mainwindow.cpp
diff --git a/digikam/themedesigner/mainwindow.h b/src/themedesigner/mainwindow.h
index 087dac20..087dac20 100644
--- a/digikam/themedesigner/mainwindow.h
+++ b/src/themedesigner/mainwindow.h
diff --git a/digikam/themedesigner/themedicongroupitem.cpp b/src/themedesigner/themedicongroupitem.cpp
index 1da37fd3..1da37fd3 100644
--- a/digikam/themedesigner/themedicongroupitem.cpp
+++ b/src/themedesigner/themedicongroupitem.cpp
diff --git a/digikam/themedesigner/themedicongroupitem.h b/src/themedesigner/themedicongroupitem.h
index a54f2bc6..a54f2bc6 100644
--- a/digikam/themedesigner/themedicongroupitem.h
+++ b/src/themedesigner/themedicongroupitem.h
diff --git a/digikam/themedesigner/themediconitem.cpp b/src/themedesigner/themediconitem.cpp
index 2ed7df80..2ed7df80 100644
--- a/digikam/themedesigner/themediconitem.cpp
+++ b/src/themedesigner/themediconitem.cpp
diff --git a/digikam/themedesigner/themediconitem.h b/src/themedesigner/themediconitem.h
index 0d54cceb..0d54cceb 100644
--- a/digikam/themedesigner/themediconitem.h
+++ b/src/themedesigner/themediconitem.h
diff --git a/digikam/themedesigner/themediconview.cpp b/src/themedesigner/themediconview.cpp
index ef5759e6..ef5759e6 100644
--- a/digikam/themedesigner/themediconview.cpp
+++ b/src/themedesigner/themediconview.cpp
diff --git a/digikam/themedesigner/themediconview.h b/src/themedesigner/themediconview.h
index ef2e3e15..ef2e3e15 100644
--- a/digikam/themedesigner/themediconview.h
+++ b/src/themedesigner/themediconview.h
diff --git a/digikam/tips b/src/tips
index b78a2462..b78a2462 100644
--- a/digikam/tips
+++ b/src/tips
diff --git a/digikam/utilities/Makefile.am b/src/utilities/Makefile.am
index fe4c1532..fe4c1532 100644
--- a/digikam/utilities/Makefile.am
+++ b/src/utilities/Makefile.am
diff --git a/digikam/utilities/batch/Makefile.am b/src/utilities/batch/Makefile.am
index c9bdb416..355643da 100644
--- a/digikam/utilities/batch/Makefile.am
+++ b/src/utilities/batch/Makefile.am
@@ -1,11 +1,11 @@
 METASOURCES = AUTO
 
-INCLUDES = -I$(top_srcdir)/digikam/digikam \
-	   -I$(top_srcdir)/digikam/libs/dialogs \
-	   -I$(top_srcdir)/digikam/libs/dimg \
-	   -I$(top_srcdir)/digikam/libs/dmetadata \
-	   -I$(top_srcdir)/digikam/libs/thumbbar \
-	   -I$(top_srcdir)/digikam/libs/widgets/common \
+INCLUDES = -I$(top_srcdir)/src/digikam \
+	   -I$(top_srcdir)/src/libs/dialogs \
+	   -I$(top_srcdir)/src/libs/dimg \
+	   -I$(top_srcdir)/src/libs/dmetadata \
+	   -I$(top_srcdir)/src/libs/thumbbar \
+	   -I$(top_srcdir)/src/libs/widgets/common \
 	   $(LIBKDCRAW_CFLAGS) \
 	   $(LIBKEXIV2_CFLAGS) \
 	   $(all_includes)
diff --git a/digikam/utilities/batch/batchalbumssyncmetadata.cpp b/src/utilities/batch/batchalbumssyncmetadata.cpp
index fba18d34..fba18d34 100644
--- a/digikam/utilities/batch/batchalbumssyncmetadata.cpp
+++ b/src/utilities/batch/batchalbumssyncmetadata.cpp
diff --git a/digikam/utilities/batch/batchalbumssyncmetadata.h b/src/utilities/batch/batchalbumssyncmetadata.h
index 8363ce4d..8363ce4d 100644
--- a/digikam/utilities/batch/batchalbumssyncmetadata.h
+++ b/src/utilities/batch/batchalbumssyncmetadata.h
diff --git a/digikam/utilities/batch/batchsyncmetadata.cpp b/src/utilities/batch/batchsyncmetadata.cpp
index 50e2ad7a..50e2ad7a 100644
--- a/digikam/utilities/batch/batchsyncmetadata.cpp
+++ b/src/utilities/batch/batchsyncmetadata.cpp
diff --git a/digikam/utilities/batch/batchsyncmetadata.h b/src/utilities/batch/batchsyncmetadata.h
index c9b69ac7..c9b69ac7 100644
--- a/digikam/utilities/batch/batchsyncmetadata.h
+++ b/src/utilities/batch/batchsyncmetadata.h
diff --git a/digikam/utilities/batch/batchthumbsgenerator.cpp b/src/utilities/batch/batchthumbsgenerator.cpp
index f0bd0103..f0bd0103 100644
--- a/digikam/utilities/batch/batchthumbsgenerator.cpp
+++ b/src/utilities/batch/batchthumbsgenerator.cpp
diff --git a/digikam/utilities/batch/batchthumbsgenerator.h b/src/utilities/batch/batchthumbsgenerator.h
index 091c2783..091c2783 100644
--- a/digikam/utilities/batch/batchthumbsgenerator.h
+++ b/src/utilities/batch/batchthumbsgenerator.h
diff --git a/digikam/utilities/batch/imageinfoalbumsjob.cpp b/src/utilities/batch/imageinfoalbumsjob.cpp
index 4d0e3c55..4d0e3c55 100644
--- a/digikam/utilities/batch/imageinfoalbumsjob.cpp
+++ b/src/utilities/batch/imageinfoalbumsjob.cpp
diff --git a/digikam/utilities/batch/imageinfoalbumsjob.h b/src/utilities/batch/imageinfoalbumsjob.h
index 7b9f477f..7b9f477f 100644
--- a/digikam/utilities/batch/imageinfoalbumsjob.h
+++ b/src/utilities/batch/imageinfoalbumsjob.h
diff --git a/digikam/utilities/batch/imageinfojob.cpp b/src/utilities/batch/imageinfojob.cpp
index 58660697..58660697 100644
--- a/digikam/utilities/batch/imageinfojob.cpp
+++ b/src/utilities/batch/imageinfojob.cpp
diff --git a/digikam/utilities/batch/imageinfojob.h b/src/utilities/batch/imageinfojob.h
index 0227a628..0227a628 100644
--- a/digikam/utilities/batch/imageinfojob.h
+++ b/src/utilities/batch/imageinfojob.h
diff --git a/digikam/utilities/cameragui/Makefile.am b/src/utilities/cameragui/Makefile.am
index c407451f..83f810f4 100644
--- a/digikam/utilities/cameragui/Makefile.am
+++ b/src/utilities/cameragui/Makefile.am
@@ -15,16 +15,16 @@ libcameragui_la_SOURCES = gpcamera.cpp cameraui.cpp cameraiconview.cpp  \
 
 libcameragui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-libcameragui_la_LIBADD  = $(top_builddir)/digikam/libs/imageproperties/libimagepropertiescamgui.la \
+libcameragui_la_LIBADD  = $(top_builddir)/src/libs/imageproperties/libimagepropertiescamgui.la \
 	                  $(LIB_GPHOTO) $(LIBJPEG)
 
-INCLUDES = -I$(top_srcdir)/digikam/digikam \
-	   -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	   -I$(top_srcdir)/digikam/libs/jpegutils \
-	   -I$(top_srcdir)/digikam/libs/themeengine \
-	   -I$(top_srcdir)/digikam/libs/imageproperties \
-	   -I$(top_srcdir)/digikam/libs/widgets/common \
-	   -I$(top_srcdir)/digikam/libs/dimg \
-	   -I$(top_srcdir)/digikam/libs/dmetadata \
+INCLUDES = -I$(top_srcdir)/src/digikam \
+	   -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	   -I$(top_srcdir)/src/libs/jpegutils \
+	   -I$(top_srcdir)/src/libs/themeengine \
+	   -I$(top_srcdir)/src/libs/imageproperties \
+	   -I$(top_srcdir)/src/libs/widgets/common \
+	   -I$(top_srcdir)/src/libs/dimg \
+	   -I$(top_srcdir)/src/libs/dmetadata \
 	   $(LIBKEXIV2_CFLAGS) \
 	   $(GPHOTO_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes)
diff --git a/digikam/utilities/cameragui/albumselectdialog.cpp b/src/utilities/cameragui/albumselectdialog.cpp
index 486c4711..486c4711 100644
--- a/digikam/utilities/cameragui/albumselectdialog.cpp
+++ b/src/utilities/cameragui/albumselectdialog.cpp
diff --git a/digikam/utilities/cameragui/albumselectdialog.h b/src/utilities/cameragui/albumselectdialog.h
index aea53319..aea53319 100644
--- a/digikam/utilities/cameragui/albumselectdialog.h
+++ b/src/utilities/cameragui/albumselectdialog.h
diff --git a/digikam/utilities/cameragui/animwidget.cpp b/src/utilities/cameragui/animwidget.cpp
index 1d869cd9..1d869cd9 100644
--- a/digikam/utilities/cameragui/animwidget.cpp
+++ b/src/utilities/cameragui/animwidget.cpp
diff --git a/digikam/utilities/cameragui/animwidget.h b/src/utilities/cameragui/animwidget.h
index 6a93f410..6a93f410 100644
--- a/digikam/utilities/cameragui/animwidget.h
+++ b/src/utilities/cameragui/animwidget.h
diff --git a/digikam/utilities/cameragui/cameracontroller.cpp b/src/utilities/cameragui/cameracontroller.cpp
index 34afa8ab..34afa8ab 100644
--- a/digikam/utilities/cameragui/cameracontroller.cpp
+++ b/src/utilities/cameragui/cameracontroller.cpp
diff --git a/digikam/utilities/cameragui/cameracontroller.h b/src/utilities/cameragui/cameracontroller.h
index 45e7fede..45e7fede 100644
--- a/digikam/utilities/cameragui/cameracontroller.h
+++ b/src/utilities/cameragui/cameracontroller.h
diff --git a/digikam/utilities/cameragui/camerafolderdialog.cpp b/src/utilities/cameragui/camerafolderdialog.cpp
index 93feb0ab..93feb0ab 100644
--- a/digikam/utilities/cameragui/camerafolderdialog.cpp
+++ b/src/utilities/cameragui/camerafolderdialog.cpp
diff --git a/digikam/utilities/cameragui/camerafolderdialog.h b/src/utilities/cameragui/camerafolderdialog.h
index efc7586a..efc7586a 100644
--- a/digikam/utilities/cameragui/camerafolderdialog.h
+++ b/src/utilities/cameragui/camerafolderdialog.h
diff --git a/digikam/utilities/cameragui/camerafolderitem.cpp b/src/utilities/cameragui/camerafolderitem.cpp
index f53508a6..f53508a6 100644
--- a/digikam/utilities/cameragui/camerafolderitem.cpp
+++ b/src/utilities/cameragui/camerafolderitem.cpp
diff --git a/digikam/utilities/cameragui/camerafolderitem.h b/src/utilities/cameragui/camerafolderitem.h
index dde2c5c6..dde2c5c6 100644
--- a/digikam/utilities/cameragui/camerafolderitem.h
+++ b/src/utilities/cameragui/camerafolderitem.h
diff --git a/digikam/utilities/cameragui/camerafolderview.cpp b/src/utilities/cameragui/camerafolderview.cpp
index 877c4b51..877c4b51 100644
--- a/digikam/utilities/cameragui/camerafolderview.cpp
+++ b/src/utilities/cameragui/camerafolderview.cpp
diff --git a/digikam/utilities/cameragui/camerafolderview.h b/src/utilities/cameragui/camerafolderview.h
index 1b02fc9c..1b02fc9c 100644
--- a/digikam/utilities/cameragui/camerafolderview.h
+++ b/src/utilities/cameragui/camerafolderview.h
diff --git a/digikam/utilities/cameragui/cameraiconitem.cpp b/src/utilities/cameragui/cameraiconitem.cpp
index c68f7855..c68f7855 100644
--- a/digikam/utilities/cameragui/cameraiconitem.cpp
+++ b/src/utilities/cameragui/cameraiconitem.cpp
diff --git a/digikam/utilities/cameragui/cameraiconitem.h b/src/utilities/cameragui/cameraiconitem.h
index 961bc1a3..961bc1a3 100644
--- a/digikam/utilities/cameragui/cameraiconitem.h
+++ b/src/utilities/cameragui/cameraiconitem.h
diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/src/utilities/cameragui/cameraiconview.cpp
index ba496217..ba496217 100644
--- a/digikam/utilities/cameragui/cameraiconview.cpp
+++ b/src/utilities/cameragui/cameraiconview.cpp
diff --git a/digikam/utilities/cameragui/cameraiconview.h b/src/utilities/cameragui/cameraiconview.h
index f621fedf..f621fedf 100644
--- a/digikam/utilities/cameragui/cameraiconview.h
+++ b/src/utilities/cameragui/cameraiconview.h
diff --git a/digikam/utilities/cameragui/camerainfodialog.cpp b/src/utilities/cameragui/camerainfodialog.cpp
index ba565a59..ba565a59 100644
--- a/digikam/utilities/cameragui/camerainfodialog.cpp
+++ b/src/utilities/cameragui/camerainfodialog.cpp
diff --git a/digikam/utilities/cameragui/camerainfodialog.h b/src/utilities/cameragui/camerainfodialog.h
index 7ec3120f..7ec3120f 100644
--- a/digikam/utilities/cameragui/camerainfodialog.h
+++ b/src/utilities/cameragui/camerainfodialog.h
diff --git a/digikam/utilities/cameragui/cameraui.cpp b/src/utilities/cameragui/cameraui.cpp
index 8b531ea2..8b531ea2 100644
--- a/digikam/utilities/cameragui/cameraui.cpp
+++ b/src/utilities/cameragui/cameraui.cpp
diff --git a/digikam/utilities/cameragui/cameraui.h b/src/utilities/cameragui/cameraui.h
index df9c7885..df9c7885 100644
--- a/digikam/utilities/cameragui/cameraui.h
+++ b/src/utilities/cameragui/cameraui.h
diff --git a/digikam/utilities/cameragui/dkcamera.cpp b/src/utilities/cameragui/dkcamera.cpp
index 8f318855..8f318855 100644
--- a/digikam/utilities/cameragui/dkcamera.cpp
+++ b/src/utilities/cameragui/dkcamera.cpp
diff --git a/digikam/utilities/cameragui/dkcamera.h b/src/utilities/cameragui/dkcamera.h
index 2ef76723..2ef76723 100644
--- a/digikam/utilities/cameragui/dkcamera.h
+++ b/src/utilities/cameragui/dkcamera.h
diff --git a/digikam/utilities/cameragui/downloadsettingscontainer.h b/src/utilities/cameragui/downloadsettingscontainer.h
index b3e59501..b3e59501 100644
--- a/digikam/utilities/cameragui/downloadsettingscontainer.h
+++ b/src/utilities/cameragui/downloadsettingscontainer.h
diff --git a/digikam/utilities/cameragui/freespacewidget.cpp b/src/utilities/cameragui/freespacewidget.cpp
index 0d7a26b1..0d7a26b1 100644
--- a/digikam/utilities/cameragui/freespacewidget.cpp
+++ b/src/utilities/cameragui/freespacewidget.cpp
diff --git a/digikam/utilities/cameragui/freespacewidget.h b/src/utilities/cameragui/freespacewidget.h
index 2111791a..2111791a 100644
--- a/digikam/utilities/cameragui/freespacewidget.h
+++ b/src/utilities/cameragui/freespacewidget.h
diff --git a/digikam/utilities/cameragui/gpcamera.cpp b/src/utilities/cameragui/gpcamera.cpp
index e03d92d0..e03d92d0 100644
--- a/digikam/utilities/cameragui/gpcamera.cpp
+++ b/src/utilities/cameragui/gpcamera.cpp
diff --git a/digikam/utilities/cameragui/gpcamera.h b/src/utilities/cameragui/gpcamera.h
index 7071e972..7071e972 100644
--- a/digikam/utilities/cameragui/gpcamera.h
+++ b/src/utilities/cameragui/gpcamera.h
diff --git a/digikam/utilities/cameragui/gpiteminfo.cpp b/src/utilities/cameragui/gpiteminfo.cpp
index 3a1d53e1..3a1d53e1 100644
--- a/digikam/utilities/cameragui/gpiteminfo.cpp
+++ b/src/utilities/cameragui/gpiteminfo.cpp
diff --git a/digikam/utilities/cameragui/gpiteminfo.h b/src/utilities/cameragui/gpiteminfo.h
index 02b28693..02b28693 100644
--- a/digikam/utilities/cameragui/gpiteminfo.h
+++ b/src/utilities/cameragui/gpiteminfo.h
diff --git a/digikam/utilities/cameragui/mtqueue.h b/src/utilities/cameragui/mtqueue.h
index 0fb80e5c..0fb80e5c 100644
--- a/digikam/utilities/cameragui/mtqueue.h
+++ b/src/utilities/cameragui/mtqueue.h
diff --git a/digikam/utilities/cameragui/renamecustomizer.cpp b/src/utilities/cameragui/renamecustomizer.cpp
index a906ccb1..a906ccb1 100644
--- a/digikam/utilities/cameragui/renamecustomizer.cpp
+++ b/src/utilities/cameragui/renamecustomizer.cpp
diff --git a/digikam/utilities/cameragui/renamecustomizer.h b/src/utilities/cameragui/renamecustomizer.h
index 47ad925b..47ad925b 100644
--- a/digikam/utilities/cameragui/renamecustomizer.h
+++ b/src/utilities/cameragui/renamecustomizer.h
diff --git a/digikam/utilities/cameragui/umscamera.cpp b/src/utilities/cameragui/umscamera.cpp
index 537c29ba..537c29ba 100644
--- a/digikam/utilities/cameragui/umscamera.cpp
+++ b/src/utilities/cameragui/umscamera.cpp
diff --git a/digikam/utilities/cameragui/umscamera.h b/src/utilities/cameragui/umscamera.h
index 697ef615..697ef615 100644
--- a/digikam/utilities/cameragui/umscamera.h
+++ b/src/utilities/cameragui/umscamera.h
diff --git a/digikam/utilities/hotplug/Makefile.am b/src/utilities/hotplug/Makefile.am
index b0b9e23a..b0b9e23a 100644
--- a/digikam/utilities/hotplug/Makefile.am
+++ b/src/utilities/hotplug/Makefile.am
diff --git a/src/utilities/hotplug/configure.in.in b/src/utilities/hotplug/configure.in.in
new file mode 100644
index 00000000..b36be1e8
--- /dev/null
+++ b/src/utilities/hotplug/configure.in.in
@@ -0,0 +1,7 @@
+KDE_EXPAND_MAKEVAR(digikamhelper_dir, kde_datadir/digikam/utils)
+AC_SUBST(digikamhelper_dir)
+
+AC_OUTPUT(src/utilities/hotplug/digikam-download.desktop)
+AC_OUTPUT(src/utilities/hotplug/digikam-gphoto2-camera.desktop)
+AC_OUTPUT(src/utilities/hotplug/digikam-mount-and-download.desktop)
+
diff --git a/digikam/utilities/hotplug/digikam-camera b/src/utilities/hotplug/digikam-camera
index 10b2fe3f..10b2fe3f 100755
--- a/digikam/utilities/hotplug/digikam-camera
+++ b/src/utilities/hotplug/digikam-camera
diff --git a/digikam/utilities/hotplug/digikam-download.desktop.in b/src/utilities/hotplug/digikam-download.desktop.in
index 55a29fdb..55a29fdb 100644
--- a/digikam/utilities/hotplug/digikam-download.desktop.in
+++ b/src/utilities/hotplug/digikam-download.desktop.in
diff --git a/digikam/utilities/hotplug/digikam-gphoto2-camera.desktop.in b/src/utilities/hotplug/digikam-gphoto2-camera.desktop.in
index f2c4a42a..f2c4a42a 100644
--- a/digikam/utilities/hotplug/digikam-gphoto2-camera.desktop.in
+++ b/src/utilities/hotplug/digikam-gphoto2-camera.desktop.in
diff --git a/digikam/utilities/hotplug/digikam-mount-and-download.desktop.in b/src/utilities/hotplug/digikam-mount-and-download.desktop.in
index 2b773a15..2b773a15 100644
--- a/digikam/utilities/hotplug/digikam-mount-and-download.desktop.in
+++ b/src/utilities/hotplug/digikam-mount-and-download.desktop.in
diff --git a/digikam/utilities/imageeditor/Makefile.am b/src/utilities/imageeditor/Makefile.am
index c324c683..c324c683 100644
--- a/digikam/utilities/imageeditor/Makefile.am
+++ b/src/utilities/imageeditor/Makefile.am
diff --git a/src/utilities/imageeditor/canvas/Makefile.am b/src/utilities/imageeditor/canvas/Makefile.am
new file mode 100644
index 00000000..740f854e
--- /dev/null
+++ b/src/utilities/imageeditor/canvas/Makefile.am
@@ -0,0 +1,28 @@
+METASOURCES = AUTO
+
+noinst_LTLIBRARIES = libdimgcanvas.la
+
+libdimgcanvas_la_SOURCES = dimginterface.cpp colorcorrectiondlg.cpp \
+	                       canvas.cpp undocache.cpp \
+	                       undoaction.cpp undomanager.cpp \
+	                       imagepluginloader.cpp imageplugin.cpp
+
+libdimgcanvas_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TIFF) 
+
+INCLUDES = -I$(top_srcdir)/src/digikam \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/histogram \
+	       -I$(top_srcdir)/src/libs/threadimageio \
+	       -I$(top_srcdir)/src/utilities/splashscreen \
+	       -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_srcdir)/src/utilities/imageeditor/rawimport \
+	       -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes) 
+
+digikaminclude_HEADERS = imageplugin.h 
+
+digikamincludedir = $(includedir)/digikam
diff --git a/digikam/utilities/imageeditor/canvas/canvas.cpp b/src/utilities/imageeditor/canvas/canvas.cpp
index 89758c3d..89758c3d 100644
--- a/digikam/utilities/imageeditor/canvas/canvas.cpp
+++ b/src/utilities/imageeditor/canvas/canvas.cpp
diff --git a/digikam/utilities/imageeditor/canvas/canvas.h b/src/utilities/imageeditor/canvas/canvas.h
index c772098d..c772098d 100644
--- a/digikam/utilities/imageeditor/canvas/canvas.h
+++ b/src/utilities/imageeditor/canvas/canvas.h
diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp b/src/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
index 1403773f..1403773f 100644
--- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
+++ b/src/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h b/src/utilities/imageeditor/canvas/colorcorrectiondlg.h
index 7cc4c19d..7cc4c19d 100644
--- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h
+++ b/src/utilities/imageeditor/canvas/colorcorrectiondlg.h
diff --git a/digikam/utilities/imageeditor/canvas/dimginterface.cpp b/src/utilities/imageeditor/canvas/dimginterface.cpp
index 8ce1c114..8ce1c114 100644
--- a/digikam/utilities/imageeditor/canvas/dimginterface.cpp
+++ b/src/utilities/imageeditor/canvas/dimginterface.cpp
diff --git a/digikam/utilities/imageeditor/canvas/dimginterface.h b/src/utilities/imageeditor/canvas/dimginterface.h
index 9a41eb05..9a41eb05 100644
--- a/digikam/utilities/imageeditor/canvas/dimginterface.h
+++ b/src/utilities/imageeditor/canvas/dimginterface.h
diff --git a/digikam/utilities/imageeditor/canvas/iccsettingscontainer.h b/src/utilities/imageeditor/canvas/iccsettingscontainer.h
index eadb12fb..eadb12fb 100644
--- a/digikam/utilities/imageeditor/canvas/iccsettingscontainer.h
+++ b/src/utilities/imageeditor/canvas/iccsettingscontainer.h
diff --git a/digikam/utilities/imageeditor/canvas/imageplugin.cpp b/src/utilities/imageeditor/canvas/imageplugin.cpp
index b330cb5a..b330cb5a 100644
--- a/digikam/utilities/imageeditor/canvas/imageplugin.cpp
+++ b/src/utilities/imageeditor/canvas/imageplugin.cpp
diff --git a/digikam/utilities/imageeditor/canvas/imageplugin.h b/src/utilities/imageeditor/canvas/imageplugin.h
index ef506256..ef506256 100644
--- a/digikam/utilities/imageeditor/canvas/imageplugin.h
+++ b/src/utilities/imageeditor/canvas/imageplugin.h
diff --git a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp b/src/utilities/imageeditor/canvas/imagepluginloader.cpp
index 43c8a16c..43c8a16c 100644
--- a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp
+++ b/src/utilities/imageeditor/canvas/imagepluginloader.cpp
diff --git a/digikam/utilities/imageeditor/canvas/imagepluginloader.h b/src/utilities/imageeditor/canvas/imagepluginloader.h
index 55ffe933..55ffe933 100644
--- a/digikam/utilities/imageeditor/canvas/imagepluginloader.h
+++ b/src/utilities/imageeditor/canvas/imagepluginloader.h
diff --git a/digikam/utilities/imageeditor/canvas/iofilesettingscontainer.h b/src/utilities/imageeditor/canvas/iofilesettingscontainer.h
index 360299b3..360299b3 100644
--- a/digikam/utilities/imageeditor/canvas/iofilesettingscontainer.h
+++ b/src/utilities/imageeditor/canvas/iofilesettingscontainer.h
diff --git a/digikam/utilities/imageeditor/canvas/undoaction.cpp b/src/utilities/imageeditor/canvas/undoaction.cpp
index bb4ff756..bb4ff756 100644
--- a/digikam/utilities/imageeditor/canvas/undoaction.cpp
+++ b/src/utilities/imageeditor/canvas/undoaction.cpp
diff --git a/digikam/utilities/imageeditor/canvas/undoaction.h b/src/utilities/imageeditor/canvas/undoaction.h
index 5f29486e..5f29486e 100644
--- a/digikam/utilities/imageeditor/canvas/undoaction.h
+++ b/src/utilities/imageeditor/canvas/undoaction.h
diff --git a/digikam/utilities/imageeditor/canvas/undocache.cpp b/src/utilities/imageeditor/canvas/undocache.cpp
index 5f36ae75..5f36ae75 100644
--- a/digikam/utilities/imageeditor/canvas/undocache.cpp
+++ b/src/utilities/imageeditor/canvas/undocache.cpp
diff --git a/digikam/utilities/imageeditor/canvas/undocache.h b/src/utilities/imageeditor/canvas/undocache.h
index 732c7c3e..732c7c3e 100644
--- a/digikam/utilities/imageeditor/canvas/undocache.h
+++ b/src/utilities/imageeditor/canvas/undocache.h
diff --git a/digikam/utilities/imageeditor/canvas/undomanager.cpp b/src/utilities/imageeditor/canvas/undomanager.cpp
index 87085d5d..87085d5d 100644
--- a/digikam/utilities/imageeditor/canvas/undomanager.cpp
+++ b/src/utilities/imageeditor/canvas/undomanager.cpp
diff --git a/digikam/utilities/imageeditor/canvas/undomanager.h b/src/utilities/imageeditor/canvas/undomanager.h
index a36ba12f..a36ba12f 100644
--- a/digikam/utilities/imageeditor/canvas/undomanager.h
+++ b/src/utilities/imageeditor/canvas/undomanager.h
diff --git a/src/utilities/imageeditor/editor/Makefile.am b/src/utilities/imageeditor/editor/Makefile.am
new file mode 100644
index 00000000..71031991
--- /dev/null
+++ b/src/utilities/imageeditor/editor/Makefile.am
@@ -0,0 +1,51 @@
+METASOURCES = AUTO
+
+noinst_LTLIBRARIES = libdimgeditor.la libshowfoto.la 
+
+libdimgeditor_la_SOURCES = editorwindow.cpp imageiface.cpp imagewindow.cpp editorstackview.cpp \
+	                   editortooliface.cpp editortool.cpp editortoolsettings.cpp
+
+libdimgeditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEPRINT) 
+
+libdimgeditor_la_LIBADD = $(top_builddir)/src/utilities/imageeditor/tools/libdimgeditortools.la \
+	                      $(top_builddir)/src/utilities/imageeditor/rawimport/librawimport.la 
+
+libshowfoto_la_SOURCES = editorwindow.cpp imageiface.cpp editorstackview.cpp \
+	                 editortooliface.cpp editortool.cpp editortoolsettings.cpp
+
+libshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEPRINT) 
+
+libshowfoto_la_LIBADD = $(top_builddir)/src/libs/dimg/libdimg.la \
+	                $(top_builddir)/src/libs/dialogs/libdialogshowfoto.la \
+	                $(top_builddir)/src/libs/widgets/libwidgets.la \
+	                $(top_builddir)/src/libs/greycstoration/libgreycstoration.la \
+	                $(top_builddir)/src/utilities/imageeditor/canvas/libdimgcanvas.la \
+	                $(top_builddir)/src/utilities/imageeditor/tools/libdimgeditortools.la \
+	                $(top_builddir)/src/utilities/imageeditor/rawimport/librawimport.la 
+
+INCLUDES = -I$(top_srcdir)/src/digikam \
+	   -I$(top_srcdir)/src/libs/widgets/common \
+	   -I$(top_srcdir)/src/libs/widgets/imageplugins \
+	   -I$(top_srcdir)/src/libs/dialogs \
+	   -I$(top_srcdir)/src/libs/dimg \
+	   -I$(top_srcdir)/src/libs/themeengine \
+	   -I$(top_srcdir)/src/libs/dmetadata \
+	   -I$(top_srcdir)/src/libs/dimg/filters \
+	   -I$(top_srcdir)/src/libs/imageproperties \
+	   -I$(top_srcdir)/src/libs/threadimageio \
+	   -I$(top_srcdir)/src/utilities/setup \
+	   -I$(top_srcdir)/src/utilities/slideshow \
+	   -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	   -I$(top_srcdir)/src/utilities/imageeditor/tools \
+	   -I$(top_builddir)/src/libs/dialogs \
+	   $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes) 
+
+digikaminclude_HEADERS = imageiface.h 
+
+digikamincludedir = $(includedir)/digikam
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = digikamimagewindowui.rc
+
+kde_servicetypes_DATA = digikamimageplugin.desktop
+
diff --git a/digikam/utilities/imageeditor/editor/digikamimageplugin.desktop b/src/utilities/imageeditor/editor/digikamimageplugin.desktop
index 31bef621..31bef621 100644
--- a/digikam/utilities/imageeditor/editor/digikamimageplugin.desktop
+++ b/src/utilities/imageeditor/editor/digikamimageplugin.desktop
diff --git a/digikam/utilities/imageeditor/editor/digikamimagewindowui.rc b/src/utilities/imageeditor/editor/digikamimagewindowui.rc
index 2c0314ad..2c0314ad 100644
--- a/digikam/utilities/imageeditor/editor/digikamimagewindowui.rc
+++ b/src/utilities/imageeditor/editor/digikamimagewindowui.rc
diff --git a/digikam/utilities/imageeditor/editor/editorstackview.cpp b/src/utilities/imageeditor/editor/editorstackview.cpp
index 61550300..61550300 100644
--- a/digikam/utilities/imageeditor/editor/editorstackview.cpp
+++ b/src/utilities/imageeditor/editor/editorstackview.cpp
diff --git a/digikam/utilities/imageeditor/editor/editorstackview.h b/src/utilities/imageeditor/editor/editorstackview.h
index e428fcd7..e428fcd7 100644
--- a/digikam/utilities/imageeditor/editor/editorstackview.h
+++ b/src/utilities/imageeditor/editor/editorstackview.h
diff --git a/digikam/utilities/imageeditor/editor/editortool.cpp b/src/utilities/imageeditor/editor/editortool.cpp
index b840e673..b840e673 100644
--- a/digikam/utilities/imageeditor/editor/editortool.cpp
+++ b/src/utilities/imageeditor/editor/editortool.cpp
diff --git a/digikam/utilities/imageeditor/editor/editortool.h b/src/utilities/imageeditor/editor/editortool.h
index 120ff9f0..120ff9f0 100644
--- a/digikam/utilities/imageeditor/editor/editortool.h
+++ b/src/utilities/imageeditor/editor/editortool.h
diff --git a/digikam/utilities/imageeditor/editor/editortooliface.cpp b/src/utilities/imageeditor/editor/editortooliface.cpp
index f666bbf2..f666bbf2 100644
--- a/digikam/utilities/imageeditor/editor/editortooliface.cpp
+++ b/src/utilities/imageeditor/editor/editortooliface.cpp
diff --git a/digikam/utilities/imageeditor/editor/editortooliface.h b/src/utilities/imageeditor/editor/editortooliface.h
index ce8708cf..ce8708cf 100644
--- a/digikam/utilities/imageeditor/editor/editortooliface.h
+++ b/src/utilities/imageeditor/editor/editortooliface.h
diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp b/src/utilities/imageeditor/editor/editortoolsettings.cpp
index 3ac45ccf..3ac45ccf 100644
--- a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp
+++ b/src/utilities/imageeditor/editor/editortoolsettings.cpp
diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.h b/src/utilities/imageeditor/editor/editortoolsettings.h
index 062b2e34..062b2e34 100644
--- a/digikam/utilities/imageeditor/editor/editortoolsettings.h
+++ b/src/utilities/imageeditor/editor/editortoolsettings.h
diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/src/utilities/imageeditor/editor/editorwindow.cpp
index eed7cfea..eed7cfea 100644
--- a/digikam/utilities/imageeditor/editor/editorwindow.cpp
+++ b/src/utilities/imageeditor/editor/editorwindow.cpp
diff --git a/digikam/utilities/imageeditor/editor/editorwindow.h b/src/utilities/imageeditor/editor/editorwindow.h
index cbb06221..cbb06221 100644
--- a/digikam/utilities/imageeditor/editor/editorwindow.h
+++ b/src/utilities/imageeditor/editor/editorwindow.h
diff --git a/digikam/utilities/imageeditor/editor/editorwindowprivate.h b/src/utilities/imageeditor/editor/editorwindowprivate.h
index df07d0bd..df07d0bd 100644
--- a/digikam/utilities/imageeditor/editor/editorwindowprivate.h
+++ b/src/utilities/imageeditor/editor/editorwindowprivate.h
diff --git a/digikam/utilities/imageeditor/editor/imageiface.cpp b/src/utilities/imageeditor/editor/imageiface.cpp
index 56cb559c..56cb559c 100644
--- a/digikam/utilities/imageeditor/editor/imageiface.cpp
+++ b/src/utilities/imageeditor/editor/imageiface.cpp
diff --git a/digikam/utilities/imageeditor/editor/imageiface.h b/src/utilities/imageeditor/editor/imageiface.h
index 272c62a5..272c62a5 100644
--- a/digikam/utilities/imageeditor/editor/imageiface.h
+++ b/src/utilities/imageeditor/editor/imageiface.h
diff --git a/digikam/utilities/imageeditor/editor/imagewindow.cpp b/src/utilities/imageeditor/editor/imagewindow.cpp
index 2c10a6f6..2c10a6f6 100644
--- a/digikam/utilities/imageeditor/editor/imagewindow.cpp
+++ b/src/utilities/imageeditor/editor/imagewindow.cpp
diff --git a/digikam/utilities/imageeditor/editor/imagewindow.h b/src/utilities/imageeditor/editor/imagewindow.h
index 389518a8..389518a8 100644
--- a/digikam/utilities/imageeditor/editor/imagewindow.h
+++ b/src/utilities/imageeditor/editor/imagewindow.h
diff --git a/digikam/utilities/imageeditor/editor/savingcontextcontainer.h b/src/utilities/imageeditor/editor/savingcontextcontainer.h
index c747a357..c747a357 100644
--- a/digikam/utilities/imageeditor/editor/savingcontextcontainer.h
+++ b/src/utilities/imageeditor/editor/savingcontextcontainer.h
diff --git a/src/utilities/imageeditor/rawimport/Makefile.am b/src/utilities/imageeditor/rawimport/Makefile.am
new file mode 100644
index 00000000..19071935
--- /dev/null
+++ b/src/utilities/imageeditor/rawimport/Makefile.am
@@ -0,0 +1,27 @@
+METASOURCES = AUTO
+
+noinst_LTLIBRARIES = librawimport.la 
+
+librawimport_la_SOURCES = rawpreview.cpp rawsettingsbox.cpp rawimport.cpp \
+	                  rawpostprocessing.cpp 
+
+librawimport_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEPRINT) 
+
+INCLUDES= -I$(top_srcdir)/src/digikam \
+	  -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	  -I$(top_srcdir)/src/libs/histogram \
+	  -I$(top_srcdir)/src/libs/curves \
+	  -I$(top_srcdir)/src/libs/levels \
+	  -I$(top_srcdir)/src/libs/whitebalance \
+	  -I$(top_srcdir)/src/libs/dmetadata \
+	  -I$(top_srcdir)/src/libs/curves \
+	  -I$(top_srcdir)/src/libs/dimg \
+	  -I$(top_srcdir)/src/libs/dimg/filters \
+	  -I$(top_srcdir)/src/libs/dialogs \
+	  -I$(top_srcdir)/src/libs/widgets/common \
+	  -I$(top_srcdir)/src/libs/widgets/iccprofiles \
+	  -I$(top_srcdir)/src/libs/threadimageio \
+	  -I$(top_srcdir)/src/libs/themeengine \
+	  $(LIBKDCRAW_CFLAGS) \
+	  $(all_includes) 
+
diff --git a/digikam/utilities/imageeditor/rawimport/rawimport.cpp b/src/utilities/imageeditor/rawimport/rawimport.cpp
index a9254ce8..a9254ce8 100644
--- a/digikam/utilities/imageeditor/rawimport/rawimport.cpp
+++ b/src/utilities/imageeditor/rawimport/rawimport.cpp
diff --git a/digikam/utilities/imageeditor/rawimport/rawimport.h b/src/utilities/imageeditor/rawimport/rawimport.h
index 85255bc8..85255bc8 100644
--- a/digikam/utilities/imageeditor/rawimport/rawimport.h
+++ b/src/utilities/imageeditor/rawimport/rawimport.h
diff --git a/digikam/utilities/imageeditor/rawimport/rawpostprocessing.cpp b/src/utilities/imageeditor/rawimport/rawpostprocessing.cpp
index d45dd5e4..d45dd5e4 100644
--- a/digikam/utilities/imageeditor/rawimport/rawpostprocessing.cpp
+++ b/src/utilities/imageeditor/rawimport/rawpostprocessing.cpp
diff --git a/digikam/utilities/imageeditor/rawimport/rawpostprocessing.h b/src/utilities/imageeditor/rawimport/rawpostprocessing.h
index 3b3c7761..3b3c7761 100644
--- a/digikam/utilities/imageeditor/rawimport/rawpostprocessing.h
+++ b/src/utilities/imageeditor/rawimport/rawpostprocessing.h
diff --git a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp b/src/utilities/imageeditor/rawimport/rawpreview.cpp
index 3207ba14..3207ba14 100644
--- a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp
+++ b/src/utilities/imageeditor/rawimport/rawpreview.cpp
diff --git a/digikam/utilities/imageeditor/rawimport/rawpreview.h b/src/utilities/imageeditor/rawimport/rawpreview.h
index 6c7e5379..6c7e5379 100644
--- a/digikam/utilities/imageeditor/rawimport/rawpreview.h
+++ b/src/utilities/imageeditor/rawimport/rawpreview.h
diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/src/utilities/imageeditor/rawimport/rawsettingsbox.cpp
index bf0ee67e..bf0ee67e 100644
--- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp
+++ b/src/utilities/imageeditor/rawimport/rawsettingsbox.cpp
diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h b/src/utilities/imageeditor/rawimport/rawsettingsbox.h
index 546ce1e5..546ce1e5 100644
--- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h
+++ b/src/utilities/imageeditor/rawimport/rawsettingsbox.h
diff --git a/src/utilities/imageeditor/tools/Makefile.am b/src/utilities/imageeditor/tools/Makefile.am
new file mode 100644
index 00000000..b76207ff
--- /dev/null
+++ b/src/utilities/imageeditor/tools/Makefile.am
@@ -0,0 +1,19 @@
+METASOURCES = AUTO
+
+noinst_LTLIBRARIES = libdimgeditortools.la 
+
+libdimgeditortools_la_SOURCES = imageresize.cpp imageprint.cpp
+
+libdimgeditortools_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEPRINT) 
+
+INCLUDES= -I$(top_srcdir)/src/digikam \
+	  -I$(top_srcdir)/src/libs/dimg \
+	  -I$(top_srcdir)/src/libs/dimg/filters \
+	  -I$(top_srcdir)/src/libs/dmetadata \
+	  -I$(top_srcdir)/src/libs/widgets/common \
+	  -I$(top_srcdir)/src/libs/greycstoration \
+	  -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	  -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	  $(LIBKDCRAW_CFLAGS) \
+	  $(all_includes) 
+
diff --git a/digikam/utilities/imageeditor/tools/imageprint.cpp b/src/utilities/imageeditor/tools/imageprint.cpp
index 5cab236b..5cab236b 100644
--- a/digikam/utilities/imageeditor/tools/imageprint.cpp
+++ b/src/utilities/imageeditor/tools/imageprint.cpp
diff --git a/digikam/utilities/imageeditor/tools/imageprint.h b/src/utilities/imageeditor/tools/imageprint.h
index 66276701..66276701 100644
--- a/digikam/utilities/imageeditor/tools/imageprint.h
+++ b/src/utilities/imageeditor/tools/imageprint.h
diff --git a/digikam/utilities/imageeditor/tools/imageresize.cpp b/src/utilities/imageeditor/tools/imageresize.cpp
index c779b71e..c779b71e 100644
--- a/digikam/utilities/imageeditor/tools/imageresize.cpp
+++ b/src/utilities/imageeditor/tools/imageresize.cpp
diff --git a/digikam/utilities/imageeditor/tools/imageresize.h b/src/utilities/imageeditor/tools/imageresize.h
index 3f8b1c23..3f8b1c23 100644
--- a/digikam/utilities/imageeditor/tools/imageresize.h
+++ b/src/utilities/imageeditor/tools/imageresize.h
diff --git a/src/utilities/lighttable/Makefile.am b/src/utilities/lighttable/Makefile.am
new file mode 100644
index 00000000..df38b5f9
--- /dev/null
+++ b/src/utilities/lighttable/Makefile.am
@@ -0,0 +1,28 @@
+METASOURCES = AUTO
+
+INCLUDES = -I$(top_srcdir)/src/digikam \
+	       -I$(top_srcdir)/src/libs/widgets/common \
+	       -I$(top_srcdir)/src/libs/dialogs \
+	       -I$(top_srcdir)/src/libs/thumbbar \
+	       -I$(top_srcdir)/src/libs/dimg \
+	       -I$(top_srcdir)/src/libs/themeengine \
+	       -I$(top_srcdir)/src/libs/dmetadata \
+	       -I$(top_srcdir)/src/libs/dimg/filters \
+	       -I$(top_srcdir)/src/libs/imageproperties \
+	       -I$(top_srcdir)/src/libs/threadimageio \
+	       -I$(top_srcdir)/src/utilities/setup \
+	       -I$(top_srcdir)/src/utilities/slideshow \
+	       -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	       -I$(top_srcdir)/src/utilities/imageeditor/editor \
+	       -I$(top_builddir)/src/libs/dialogs \
+	       $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes) 
+
+noinst_LTLIBRARIES = liblighttable.la 
+
+liblighttable_la_SOURCES = lighttablebar.cpp lighttablewindow.cpp lighttablepreview.cpp \
+                           lighttableview.cpp 
+
+liblighttable_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+
+rcdir = $(kde_datadir)/digikam
+rc_DATA = lighttablewindowui.rc
diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/src/utilities/lighttable/lighttablebar.cpp
index cfb935ab..cfb935ab 100644
--- a/digikam/utilities/lighttable/lighttablebar.cpp
+++ b/src/utilities/lighttable/lighttablebar.cpp
diff --git a/digikam/utilities/lighttable/lighttablebar.h b/src/utilities/lighttable/lighttablebar.h
index b64e93a6..b64e93a6 100644
--- a/digikam/utilities/lighttable/lighttablebar.h
+++ b/src/utilities/lighttable/lighttablebar.h
diff --git a/digikam/utilities/lighttable/lighttablepreview.cpp b/src/utilities/lighttable/lighttablepreview.cpp
index 100427ec..100427ec 100644
--- a/digikam/utilities/lighttable/lighttablepreview.cpp
+++ b/src/utilities/lighttable/lighttablepreview.cpp
diff --git a/digikam/utilities/lighttable/lighttablepreview.h b/src/utilities/lighttable/lighttablepreview.h
index 3549fa1c..3549fa1c 100644
--- a/digikam/utilities/lighttable/lighttablepreview.h
+++ b/src/utilities/lighttable/lighttablepreview.h
diff --git a/digikam/utilities/lighttable/lighttableview.cpp b/src/utilities/lighttable/lighttableview.cpp
index 51f45ab5..51f45ab5 100644
--- a/digikam/utilities/lighttable/lighttableview.cpp
+++ b/src/utilities/lighttable/lighttableview.cpp
diff --git a/digikam/utilities/lighttable/lighttableview.h b/src/utilities/lighttable/lighttableview.h
index 273b7072..273b7072 100644
--- a/digikam/utilities/lighttable/lighttableview.h
+++ b/src/utilities/lighttable/lighttableview.h
diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/src/utilities/lighttable/lighttablewindow.cpp
index 58409aef..58409aef 100644
--- a/digikam/utilities/lighttable/lighttablewindow.cpp
+++ b/src/utilities/lighttable/lighttablewindow.cpp
diff --git a/digikam/utilities/lighttable/lighttablewindow.h b/src/utilities/lighttable/lighttablewindow.h
index f080e2d1..f080e2d1 100644
--- a/digikam/utilities/lighttable/lighttablewindow.h
+++ b/src/utilities/lighttable/lighttablewindow.h
diff --git a/digikam/utilities/lighttable/lighttablewindowprivate.h b/src/utilities/lighttable/lighttablewindowprivate.h
index a96e0b08..a96e0b08 100644
--- a/digikam/utilities/lighttable/lighttablewindowprivate.h
+++ b/src/utilities/lighttable/lighttablewindowprivate.h
diff --git a/digikam/utilities/lighttable/lighttablewindowui.rc b/src/utilities/lighttable/lighttablewindowui.rc
index ae7ce721..ae7ce721 100644
--- a/digikam/utilities/lighttable/lighttablewindowui.rc
+++ b/src/utilities/lighttable/lighttablewindowui.rc
diff --git a/digikam/utilities/scripts/Makefile.am b/src/utilities/scripts/Makefile.am
index 198f6c0d..198f6c0d 100644
--- a/digikam/utilities/scripts/Makefile.am
+++ b/src/utilities/scripts/Makefile.am
diff --git a/digikam/utilities/scripts/digitaglinktree b/src/utilities/scripts/digitaglinktree
index 8d0d12c9..8d0d12c9 100644
--- a/digikam/utilities/scripts/digitaglinktree
+++ b/src/utilities/scripts/digitaglinktree
diff --git a/digikam/utilities/scripts/digitaglinktree.1 b/src/utilities/scripts/digitaglinktree.1
index fdfe9e09..fdfe9e09 100644
--- a/digikam/utilities/scripts/digitaglinktree.1
+++ b/src/utilities/scripts/digitaglinktree.1
diff --git a/digikam/utilities/setup/Makefile.am b/src/utilities/setup/Makefile.am
index 15c4bd7f..bd6fd66e 100644
--- a/digikam/utilities/setup/Makefile.am
+++ b/src/utilities/setup/Makefile.am
@@ -1,13 +1,13 @@
 METASOURCES = AUTO
 
-INCLUDES = -I$(top_srcdir)/digikam/digikam \
-	   -I$(top_srcdir)/digikam/utilities/cameragui \
-	   -I$(top_srcdir)/digikam/utilities/batch \
-	   -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	   -I$(top_srcdir)/digikam/libs/dialogs \
-	   -I$(top_srcdir)/digikam/libs/dimg \
-	   -I$(top_srcdir)/digikam/libs/dimg/loaders \
-	   -I$(top_srcdir)/digikam/libs/widgets/common \
+INCLUDES = -I$(top_srcdir)/src/digikam \
+	   -I$(top_srcdir)/src/utilities/cameragui \
+	   -I$(top_srcdir)/src/utilities/batch \
+	   -I$(top_srcdir)/src/utilities/imageeditor/canvas \
+	   -I$(top_srcdir)/src/libs/dialogs \
+	   -I$(top_srcdir)/src/libs/dimg \
+	   -I$(top_srcdir)/src/libs/dimg/loaders \
+	   -I$(top_srcdir)/src/libs/widgets/common \
 	   $(LIBKIPI_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes)
 
 noinst_LTLIBRARIES = libsetup.la libshowfotosetup.la
diff --git a/digikam/utilities/setup/cameraselection.cpp b/src/utilities/setup/cameraselection.cpp
index 2cf2635c..2cf2635c 100644
--- a/digikam/utilities/setup/cameraselection.cpp
+++ b/src/utilities/setup/cameraselection.cpp
diff --git a/digikam/utilities/setup/cameraselection.h b/src/utilities/setup/cameraselection.h
index 0458f13b..0458f13b 100644
--- a/digikam/utilities/setup/cameraselection.h
+++ b/src/utilities/setup/cameraselection.h
diff --git a/digikam/utilities/setup/setup.cpp b/src/utilities/setup/setup.cpp
index bd47796f..bd47796f 100644
--- a/digikam/utilities/setup/setup.cpp
+++ b/src/utilities/setup/setup.cpp
diff --git a/digikam/utilities/setup/setup.h b/src/utilities/setup/setup.h
index ce5e57b1..ce5e57b1 100644
--- a/digikam/utilities/setup/setup.h
+++ b/src/utilities/setup/setup.h
diff --git a/digikam/utilities/setup/setupcamera.cpp b/src/utilities/setup/setupcamera.cpp
index 1b8d0bb8..1b8d0bb8 100644
--- a/digikam/utilities/setup/setupcamera.cpp
+++ b/src/utilities/setup/setupcamera.cpp
diff --git a/digikam/utilities/setup/setupcamera.h b/src/utilities/setup/setupcamera.h
index f0df8a71..f0df8a71 100644
--- a/digikam/utilities/setup/setupcamera.h
+++ b/src/utilities/setup/setupcamera.h
diff --git a/digikam/utilities/setup/setupcollections.cpp b/src/utilities/setup/setupcollections.cpp
index 10a25c31..10a25c31 100644
--- a/digikam/utilities/setup/setupcollections.cpp
+++ b/src/utilities/setup/setupcollections.cpp
diff --git a/digikam/utilities/setup/setupcollections.h b/src/utilities/setup/setupcollections.h
index c65b93e1..c65b93e1 100644
--- a/digikam/utilities/setup/setupcollections.h
+++ b/src/utilities/setup/setupcollections.h
diff --git a/digikam/utilities/setup/setupdcraw.cpp b/src/utilities/setup/setupdcraw.cpp
index 57f9cb2d..57f9cb2d 100644
--- a/digikam/utilities/setup/setupdcraw.cpp
+++ b/src/utilities/setup/setupdcraw.cpp
diff --git a/digikam/utilities/setup/setupdcraw.h b/src/utilities/setup/setupdcraw.h
index 835199f4..835199f4 100644
--- a/digikam/utilities/setup/setupdcraw.h
+++ b/src/utilities/setup/setupdcraw.h
diff --git a/digikam/utilities/setup/setupeditor.cpp b/src/utilities/setup/setupeditor.cpp
index 337b5655..337b5655 100644
--- a/digikam/utilities/setup/setupeditor.cpp
+++ b/src/utilities/setup/setupeditor.cpp
diff --git a/digikam/utilities/setup/setupeditor.h b/src/utilities/setup/setupeditor.h
index bc7793ad..bc7793ad 100644
--- a/digikam/utilities/setup/setupeditor.h
+++ b/src/utilities/setup/setupeditor.h
diff --git a/digikam/utilities/setup/setupgeneral.cpp b/src/utilities/setup/setupgeneral.cpp
index 2a8db22c..2a8db22c 100644
--- a/digikam/utilities/setup/setupgeneral.cpp
+++ b/src/utilities/setup/setupgeneral.cpp
diff --git a/digikam/utilities/setup/setupgeneral.h b/src/utilities/setup/setupgeneral.h
index 768c4154..768c4154 100644
--- a/digikam/utilities/setup/setupgeneral.h
+++ b/src/utilities/setup/setupgeneral.h
diff --git a/digikam/utilities/setup/setupicc.cpp b/src/utilities/setup/setupicc.cpp
index b08750c1..b08750c1 100644
--- a/digikam/utilities/setup/setupicc.cpp
+++ b/src/utilities/setup/setupicc.cpp
diff --git a/digikam/utilities/setup/setupicc.h b/src/utilities/setup/setupicc.h
index 8eaaece1..8eaaece1 100644
--- a/digikam/utilities/setup/setupicc.h
+++ b/src/utilities/setup/setupicc.h
diff --git a/digikam/utilities/setup/setupidentity.cpp b/src/utilities/setup/setupidentity.cpp
index ecbfdfbf..ecbfdfbf 100644
--- a/digikam/utilities/setup/setupidentity.cpp
+++ b/src/utilities/setup/setupidentity.cpp
diff --git a/digikam/utilities/setup/setupidentity.h b/src/utilities/setup/setupidentity.h
index ae26dc77..ae26dc77 100644
--- a/digikam/utilities/setup/setupidentity.h
+++ b/src/utilities/setup/setupidentity.h
diff --git a/digikam/utilities/setup/setupiofiles.cpp b/src/utilities/setup/setupiofiles.cpp
index 6cdf23de..6cdf23de 100644
--- a/digikam/utilities/setup/setupiofiles.cpp
+++ b/src/utilities/setup/setupiofiles.cpp
diff --git a/digikam/utilities/setup/setupiofiles.h b/src/utilities/setup/setupiofiles.h
index 060dbba1..060dbba1 100644
--- a/digikam/utilities/setup/setupiofiles.h
+++ b/src/utilities/setup/setupiofiles.h
diff --git a/digikam/utilities/setup/setuplighttable.cpp b/src/utilities/setup/setuplighttable.cpp
index 0ed01eab..0ed01eab 100644
--- a/digikam/utilities/setup/setuplighttable.cpp
+++ b/src/utilities/setup/setuplighttable.cpp
diff --git a/digikam/utilities/setup/setuplighttable.h b/src/utilities/setup/setuplighttable.h
index 20af9a64..20af9a64 100644
--- a/digikam/utilities/setup/setuplighttable.h
+++ b/src/utilities/setup/setuplighttable.h
diff --git a/digikam/utilities/setup/setupmetadata.cpp b/src/utilities/setup/setupmetadata.cpp
index e4f74ede..e4f74ede 100644
--- a/digikam/utilities/setup/setupmetadata.cpp
+++ b/src/utilities/setup/setupmetadata.cpp
diff --git a/digikam/utilities/setup/setupmetadata.h b/src/utilities/setup/setupmetadata.h
index 45511065..45511065 100644
--- a/digikam/utilities/setup/setupmetadata.h
+++ b/src/utilities/setup/setupmetadata.h
diff --git a/digikam/utilities/setup/setupmime.cpp b/src/utilities/setup/setupmime.cpp
index 6ac069e3..6ac069e3 100644
--- a/digikam/utilities/setup/setupmime.cpp
+++ b/src/utilities/setup/setupmime.cpp
diff --git a/digikam/utilities/setup/setupmime.h b/src/utilities/setup/setupmime.h
index 3bff1525..3bff1525 100644
--- a/digikam/utilities/setup/setupmime.h
+++ b/src/utilities/setup/setupmime.h
diff --git a/digikam/utilities/setup/setupmisc.cpp b/src/utilities/setup/setupmisc.cpp
index 8dc16e96..8dc16e96 100644
--- a/digikam/utilities/setup/setupmisc.cpp
+++ b/src/utilities/setup/setupmisc.cpp
diff --git a/digikam/utilities/setup/setupmisc.h b/src/utilities/setup/setupmisc.h
index 92918ba4..92918ba4 100644
--- a/digikam/utilities/setup/setupmisc.h
+++ b/src/utilities/setup/setupmisc.h
diff --git a/digikam/utilities/setup/setupplugins.cpp b/src/utilities/setup/setupplugins.cpp
index e0d9c494..e0d9c494 100644
--- a/digikam/utilities/setup/setupplugins.cpp
+++ b/src/utilities/setup/setupplugins.cpp
diff --git a/digikam/utilities/setup/setupplugins.h b/src/utilities/setup/setupplugins.h
index 31b71121..31b71121 100644
--- a/digikam/utilities/setup/setupplugins.h
+++ b/src/utilities/setup/setupplugins.h
diff --git a/digikam/utilities/setup/setupslideshow.cpp b/src/utilities/setup/setupslideshow.cpp
index 970d9c67..970d9c67 100644
--- a/digikam/utilities/setup/setupslideshow.cpp
+++ b/src/utilities/setup/setupslideshow.cpp
diff --git a/digikam/utilities/setup/setupslideshow.h b/src/utilities/setup/setupslideshow.h
index 9ba68035..9ba68035 100644
--- a/digikam/utilities/setup/setupslideshow.h
+++ b/src/utilities/setup/setupslideshow.h
diff --git a/digikam/utilities/setup/setuptooltip.cpp b/src/utilities/setup/setuptooltip.cpp
index 2a5c62c8..2a5c62c8 100644
--- a/digikam/utilities/setup/setuptooltip.cpp
+++ b/src/utilities/setup/setuptooltip.cpp
diff --git a/digikam/utilities/setup/setuptooltip.h b/src/utilities/setup/setuptooltip.h
index 8474de78..8474de78 100644
--- a/digikam/utilities/setup/setuptooltip.h
+++ b/src/utilities/setup/setuptooltip.h
diff --git a/digikam/utilities/slideshow/Makefile.am b/src/utilities/slideshow/Makefile.am
index c642d1b5..5340e80c 100644
--- a/digikam/utilities/slideshow/Makefile.am
+++ b/src/utilities/slideshow/Makefile.am
@@ -1,10 +1,10 @@
 METASOURCES = AUTO
 
-INCLUDES = -I$(top_srcdir)/digikam/digikam \
-	   -I$(top_srcdir)/digikam/libs/dimg \
-	   -I$(top_srcdir)/digikam/libs/dmetadata \
-	   -I$(top_srcdir)/digikam/libs/themeengine \
-	   -I$(top_srcdir)/digikam/libs/threadimageio \
+INCLUDES = -I$(top_srcdir)/src/digikam \
+	   -I$(top_srcdir)/src/libs/dimg \
+	   -I$(top_srcdir)/src/libs/dmetadata \
+	   -I$(top_srcdir)/src/libs/themeengine \
+	   -I$(top_srcdir)/src/libs/threadimageio \
 	   $(LIBKDCRAW_CFLAGS) \
 	   $(all_includes)
 
diff --git a/digikam/utilities/slideshow/slideshow.cpp b/src/utilities/slideshow/slideshow.cpp
index 33cf9edc..33cf9edc 100644
--- a/digikam/utilities/slideshow/slideshow.cpp
+++ b/src/utilities/slideshow/slideshow.cpp
diff --git a/digikam/utilities/slideshow/slideshow.h b/src/utilities/slideshow/slideshow.h
index dc15ce1c..dc15ce1c 100644
--- a/digikam/utilities/slideshow/slideshow.h
+++ b/src/utilities/slideshow/slideshow.h
diff --git a/digikam/utilities/slideshow/slideshowsettings.h b/src/utilities/slideshow/slideshowsettings.h
index 85057f27..85057f27 100644
--- a/digikam/utilities/slideshow/slideshowsettings.h
+++ b/src/utilities/slideshow/slideshowsettings.h
diff --git a/digikam/utilities/slideshow/toolbar.cpp b/src/utilities/slideshow/toolbar.cpp
index dbecd4ad..dbecd4ad 100644
--- a/digikam/utilities/slideshow/toolbar.cpp
+++ b/src/utilities/slideshow/toolbar.cpp
diff --git a/digikam/utilities/slideshow/toolbar.h b/src/utilities/slideshow/toolbar.h
index 97262c12..97262c12 100644
--- a/digikam/utilities/slideshow/toolbar.h
+++ b/src/utilities/slideshow/toolbar.h
diff --git a/subdirs b/subdirs
index 6eb2c1b4..0b50d7c1 100644
--- a/subdirs
+++ b/subdirs
@@ -1,4 +1,4 @@
 data
-digikam
+src
 doc
 translations