diff --git a/CMakeLists.txt b/CMakeLists.txt
index b152984e3..9364d1a56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,4 @@
 project(okular)
-KDE4_NO_ENABLE_FINAL(okular)
 add_subdirectory( ui )
 add_subdirectory( shell )
 add_subdirectory( generators )
diff --git a/generators/chm/lib/libchmfileimpl.h b/generators/chm/lib/libchmfileimpl.h
index a71e6bebc..86764fb86 100644
--- a/generators/chm/lib/libchmfileimpl.h
+++ b/generators/chm/lib/libchmfileimpl.h
@@ -19,7 +19,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
-
+#ifndef LCHMSEARCHPROGRESSRESULT_H
+#define LCHMSEARCHPROGRESSRESULT_H
 #include <sys/types.h>
 #include <stdint.h>
 
@@ -296,3 +297,4 @@ class LCHMFileImpl
 		//! Map url->topic
 		QMap< QString, QString >	m_url2topics;
 };
+#endif
diff --git a/generators/chm/lib/libchmtocimage.h b/generators/chm/lib/libchmtocimage.h
index b5c2cabca..c0d98b3ba 100644
--- a/generators/chm/lib/libchmtocimage.h
+++ b/generators/chm/lib/libchmtocimage.h
@@ -1,3 +1,6 @@
+
+#ifndef LCHMTOCIMAGEKEEPER_H
+#define LCHMTOCIMAGEKEEPER_H
 //Added by qt3to4:
 #include <QPixmap>
 /***************************************************************************
@@ -33,3 +36,4 @@ class LCHMTocImageKeeper
 	private:
 		QPixmap	m_images[LCHMBookIcons::MAX_BUILTIN_ICONS];
 };
+#endif
diff --git a/generators/plucker/unpluck/unpluck.h b/generators/plucker/unpluck/unpluck.h
index cf17af071..62b622bab 100644
--- a/generators/plucker/unpluck/unpluck.h
+++ b/generators/plucker/unpluck/unpluck.h
@@ -19,7 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
-
+#ifndef UNPLUCK_H
+#define UNPLUCK_H
 /*
  * This header file should be included after an #include of glib.h
  */
@@ -409,3 +410,4 @@ int plkr_GetConfigBoolean (
     char *option_name,
     int default_value
 );
+#endif
diff --git a/generators/plucker/unpluck/unpluckint.h b/generators/plucker/unpluck/unpluckint.h
index d37131c08..76e6deb5d 100644
--- a/generators/plucker/unpluck/unpluckint.h
+++ b/generators/plucker/unpluck/unpluckint.h
@@ -19,7 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
-
+#ifndef UNPLUGINT_H
+#define UNPLUGINT_H 
 /*
  * This header file should be included after an #include of glib.h
  */
@@ -166,3 +167,5 @@ int _plkr_AddToTable (
 /* Add the specified "obj" to the table with key "key".  Returns
    0 if key is already in table (and doesn't add "obj"), and returns
    1 if key was added to table. */
+
+#endif