diff --git a/core/annotations_p.h b/core/annotations_p.h
index ec628354d..6a862ef75 100644
--- a/core/annotations_p.h
+++ b/core/annotations_p.h
@@ -7,8 +7,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#ifndef OKULAR_ANNOTATION_P_H
-#define OKULAR_ANNOTATION_P_H
+#ifndef OKULAR_ANNOTATIONS_P_H
+#define OKULAR_ANNOTATIONS_P_H
 
 #include "area.h"
 #include "annotations.h"
diff --git a/core/audioplayer_p.h b/core/audioplayer_p.h
index 9b865f3fc..c6d43cf3c 100644
--- a/core/audioplayer_p.h
+++ b/core/audioplayer_p.h
@@ -7,6 +7,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#ifndef _OKULAR_AUDIOPLAYER_P_H_
+#define _OKULAR_AUDIOPLAYER_P_H_
+
 // qt/kde includes
 #include <qhash.h>
 #include <qsignalmapper.h>
@@ -42,3 +45,5 @@ public:
 };
 
 }
+
+#endif
diff --git a/core/rotationjob_p.h b/core/rotationjob_p.h
index 6505427a9..5aaff0182 100644
--- a/core/rotationjob_p.h
+++ b/core/rotationjob_p.h
@@ -7,8 +7,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#ifndef _OKULAR_ROTATIONJOB_H
-#define _OKULAR_ROTATIONJOB_H
+#ifndef _OKULAR_ROTATIONJOB_P_H_
+#define _OKULAR_ROTATIONJOB_P_H_
 
 #include <QtGui/QImage>
 
diff --git a/core/textpage.h b/core/textpage.h
index b7f79061a..d611658a8 100644
--- a/core/textpage.h
+++ b/core/textpage.h
@@ -7,8 +7,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#ifndef _OKULAR_TETXTPAGE_H_
-#define _OKULAR_TETXTPAGE_H_
+#ifndef _OKULAR_TEXTTPAGE_H_
+#define _OKULAR_TEXTTPAGE_H_
 
 #include <QtCore/QList>
 #include <QtCore/QString>
diff --git a/generators/djvu/generator_djvu.h b/generators/djvu/generator_djvu.h
index c496c15ec..b865029cb 100644
--- a/generators/djvu/generator_djvu.h
+++ b/generators/djvu/generator_djvu.h
@@ -7,8 +7,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#ifndef _DJVU_GENERATOR_H_
-#define _DJVU_GENERATOR_H_
+#ifndef _GENERATOR_DJVU_H_
+#define _GENERATOR_DJVU_H_
 
 #include <okular/core/generator.h>
 
diff --git a/ui/annotationpropertiesdialog.h b/ui/annotationpropertiesdialog.h
index 3a50713c2..b6c0fe222 100644
--- a/ui/annotationpropertiesdialog.h
+++ b/ui/annotationpropertiesdialog.h
@@ -7,8 +7,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#ifndef _ANNOTSPROPERTIESDIALOG_H_
-#define _ANNOTSPROPERTIESDIALOG_H_
+#ifndef _ANNOTATIONSSPROPERTIESDIALOG_H_
+#define _ANNOTATIONSSPROPERTIESDIALOG_H_
 
 #include <kpagedialog.h>