diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,6 +126,8 @@
 
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
+kde_enable_exceptions()
+
 ## dirs to build
 add_subdirectory(lib)
 add_subdirectory(app)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -220,12 +220,6 @@
         )
 endif()
 
-kde_source_files_enable_exceptions(
-    exiv2imageloader.cpp
-    imagemetainfomodel.cpp
-    timeutils.cpp
-    )
-
 ki18n_wrap_ui(gwenviewlib_SRCS
     crop/cropwidget.ui
     documentview/messageview.ui
diff --git a/lib/cms/cmsprofile.h b/lib/cms/cmsprofile.h
--- a/lib/cms/cmsprofile.h
+++ b/lib/cms/cmsprofile.h
@@ -30,7 +30,7 @@
 #include <QSharedData>
 
 // Exiv2
-#include <exiv2/image.hpp>
+#include <exiv2/exiv2.hpp>
 
 class QByteArray;
 class QString;
diff --git a/lib/document/document.h b/lib/document/document.h
--- a/lib/document/document.h
+++ b/lib/document/document.h
@@ -23,7 +23,7 @@
 #include <lib/gwenviewlib_export.h>
 
 #include <string.h>
-#include <exiv2/image.hpp>
+#include <exiv2/exiv2.hpp>
 
 // Qt
 #include <QObject>
diff --git a/lib/exiv2imageloader.h b/lib/exiv2imageloader.h
--- a/lib/exiv2imageloader.h
+++ b/lib/exiv2imageloader.h
@@ -29,7 +29,7 @@
 
 // Exiv2
 #include <string.h>
-#include <exiv2/image.hpp>
+#include <exiv2/exiv2.hpp>
 
 // Local
 
diff --git a/lib/exiv2imageloader.cpp b/lib/exiv2imageloader.cpp
--- a/lib/exiv2imageloader.cpp
+++ b/lib/exiv2imageloader.cpp
@@ -28,10 +28,6 @@
 
 // KDE
 
-// Exiv2
-#include <exiv2/error.hpp>
-#include <exiv2/types.hpp>
-
 // Local
 
 namespace Gwenview
diff --git a/lib/imagemetainfomodel.cpp b/lib/imagemetainfomodel.cpp
--- a/lib/imagemetainfomodel.cpp
+++ b/lib/imagemetainfomodel.cpp
@@ -33,9 +33,7 @@
 #include <KFormat>
 
 // Exiv2
-#include <exiv2/exif.hpp>
-#include <exiv2/image.hpp>
-#include <exiv2/iptc.hpp>
+#include <exiv2/exiv2.hpp>
 
 // Local
 #ifdef HAVE_FITS
diff --git a/lib/jpegcontent.cpp b/lib/jpegcontent.cpp
--- a/lib/jpegcontent.cpp
+++ b/lib/jpegcontent.cpp
@@ -41,10 +41,6 @@
 // KDE
 #include <KLocalizedString>
 
-// Exiv2
-#include <exiv2/exif.hpp>
-#include <exiv2/image.hpp>
-
 // Local
 #include "jpegerrormanager.h"
 #include "iodevicejpegsourcemanager.h"
diff --git a/lib/timeutils.cpp b/lib/timeutils.cpp
--- a/lib/timeutils.cpp
+++ b/lib/timeutils.cpp
@@ -29,10 +29,6 @@
 // KDE
 #include <KFileItem>
 
-// Exiv2
-#include <exiv2/exif.hpp>
-#include <exiv2/image.hpp>
-
 // Local
 #include <lib/exiv2imageloader.h>
 #include <lib/urlutils.h>
diff --git a/tests/auto/documenttest.cpp b/tests/auto/documenttest.cpp
--- a/tests/auto/documenttest.cpp
+++ b/tests/auto/documenttest.cpp
@@ -39,8 +39,6 @@
 #include "../lib/transformimageoperation.h"
 #include "testutils.h"
 
-#include <exiv2/exif.hpp>
-
 #include "documenttest.h"
 
 QTEST_MAIN(DocumentTest)
diff --git a/tests/auto/imagemetainfomodeltest.cpp b/tests/auto/imagemetainfomodeltest.cpp
--- a/tests/auto/imagemetainfomodeltest.cpp
+++ b/tests/auto/imagemetainfomodeltest.cpp
@@ -28,8 +28,6 @@
 #include "../lib/imagemetainfomodel.h"
 #include "testutils.h"
 
-#include <exiv2/exif.hpp>
-
 #include "imagemetainfomodeltest.h"
 
 QTEST_MAIN(ImageMetaInfoModelTest)