Index: libs/database/imagetagpair.h
===================================================================
--- libs/database/imagetagpair.h	(revision 1149793)
+++ libs/database/imagetagpair.h	(working copy)
@@ -41,7 +41,7 @@
 class ImageInfo;
 class ImageTagPairPriv;
 
-class DIGIKAM_EXPORT ImageTagPair
+class DIGIKAM_DATABASE_EXPORT ImageTagPair
 {
 public:
 
Index: libs/database/tagproperties.h
===================================================================
--- libs/database/tagproperties.h	(revision 1149793)
+++ libs/database/tagproperties.h	(working copy)
@@ -40,7 +40,7 @@
 
 class TagPropertiesPriv;
 
-class DIGIKAM_EXPORT TagProperties
+class DIGIKAM_DATABASE_EXPORT TagProperties
 {
 public:
 
Index: utilities/advancedrename/parser/options/database/keys/positionkeys.cpp
===================================================================
--- utilities/advancedrename/parser/options/database/keys/positionkeys.cpp	(revision 1149793)
+++ utilities/advancedrename/parser/options/database/keys/positionkeys.cpp	(working copy)
@@ -31,7 +31,7 @@
 
 #include "databaseinfocontainers.h"
 #include "imageinfo.h"
-#include "imageposition.cpp"
+#include "imageposition.h"
 
 static const QString KEY_LATITUDE("Latitude");
 static const QString KEY_LONGITUDE("Longitude");
Index: utilities/scriptiface/scriptiface.h
===================================================================
--- utilities/scriptiface/scriptiface.h	(revision 1149793)
+++ utilities/scriptiface/scriptiface.h	(working copy)
@@ -31,14 +31,12 @@
 
 // Local includes
 
-#include "digikam_export.h"
-
 namespace Digikam
 {
 
 class ScriptIfacePriv;
 
-class DIGIKAM_EXPORT ScriptIface : public KDialog
+class ScriptIface : public KDialog
 {
     Q_OBJECT
 
