Index: src/podofo/base/util/PdfMutexImpl_noop.h
===================================================================
--- src/podofo/base/util/PdfMutexImpl_noop.h	(revision 2056)
+++ src/podofo/base/util/PdfMutexImpl_noop.h	(working copy)
@@ -31,6 +31,9 @@
  *   files in the program, then also delete it here.                       *
  ***************************************************************************/
 
+#ifndef PDFMUTEXIMPL_NOOP_H
+#define PDFMUTEXIMPL_NOOP_H
+
 #include "../PdfDefines.h"
 #include "../PdfDefinesPrivate.h"
 
@@ -77,3 +80,5 @@
 
 }; // Util
 }; // PoDoFo
+
+#endif // PDFMUTEXIMPL_NOOP_H
Index: src/podofo/base/util/PdfMutexImpl_pthread.h
===================================================================
--- src/podofo/base/util/PdfMutexImpl_pthread.h	(revision 2056)
+++ src/podofo/base/util/PdfMutexImpl_pthread.h	(working copy)
@@ -31,6 +31,9 @@
  *   files in the program, then also delete it here.                       *
  ***************************************************************************/
 
+#ifndef PDFMUTEXIMPL_PTHREAD_H
+#define PDFMUTEXIMPL_PTHREAD_H
+
 #include "../PdfDefines.h"
 #include "../PdfDefinesPrivate.h"
 
@@ -129,3 +132,5 @@
 
 }; // Util
 }; // PoDoFo
+
+#endif // PDFMUTEXIMPL_PTHREAD_H
Index: src/podofo/base/util/PdfMutexImpl_win32.h
===================================================================
--- src/podofo/base/util/PdfMutexImpl_win32.h	(revision 2056)
+++ src/podofo/base/util/PdfMutexImpl_win32.h	(working copy)
@@ -31,6 +31,9 @@
  *   files in the program, then also delete it here.                       *
  ***************************************************************************/
 
+#ifndef PDFMUTEXIMPL_WIN32_H
+#define PDFMUTEXIMPL_WIN32_H
+
 #include "../PdfDefines.h"
 #include "../PdfDefinesPrivate.h"
 
@@ -121,3 +124,5 @@
 
 }; // Util
 }; // PoDoFo
+
+#endif // PDFMUTEXIMPL_WIN32_H
Index: test/PdfTest.h
===================================================================
--- test/PdfTest.h	(revision 2056)
+++ test/PdfTest.h	(working copy)
@@ -1,4 +1,7 @@
 
+#ifndef PDFTEST_H
+#define PDFTEST_H
+
 #include <podofo.h>
 
 /* Common defines needed in all tests */
@@ -20,3 +23,5 @@
 #else
 #define PODOFO_UNIQUEU_PTR std::auto_ptr
 #endif
+
+#endif // PDFTEST_H
Index: test/unit/cppunitextensions.h
===================================================================
--- test/unit/cppunitextensions.h	(revision 2056)
+++ test/unit/cppunitextensions.h	(working copy)
@@ -18,6 +18,9 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#ifndef CPPUNITEXTENSIONS_H
+#define CPPUNITEXTENSIONS_H
+
 #include <cppunit/extensions/HelperMacros.h>
 #include <new>
 #include <exception>
@@ -98,3 +101,4 @@
 #define EXPECT_DOUBLE_EQ(expected, actual, delta) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected, actual, delta)
 #define ASSERT_DOUBLE_EQ(expected, actual, delta) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected, actual, delta)
 
+#endif // CPPUNITEXTENSIONS_H
Index: tools/podofocolor/lua_compat.h
===================================================================
--- tools/podofocolor/lua_compat.h	(revision 2056)
+++ tools/podofocolor/lua_compat.h	(working copy)
@@ -1,3 +1,6 @@
+#ifndef LUA_COMPAT_H_COLOR
+#define LUA_COMPAT_H_COLOR
+
 extern "C" {
 #include "lua.h"
 // Note: If you're missing these, you're using lua 5.0 and haven't installed
@@ -46,3 +49,5 @@
     return luaL_getn(L, t);
 }
 #endif
+
+#endif // LUA_COMPAT_H_COLOR
Index: tools/podofoimg2pdf/ImageConverter.h
===================================================================
--- tools/podofoimg2pdf/ImageConverter.h	(revision 2056)
+++ tools/podofoimg2pdf/ImageConverter.h	(working copy)
@@ -18,6 +18,9 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#ifndef IMAGECONVERTER_H
+#define IMAGECONVERTER_H
+
 #include <string>
 #include <vector>
 
@@ -45,3 +48,5 @@
     std::string              m_sOutputFilename;
     bool                     m_bUseImageSize;
 };
+
+#endif // IMAGECONVERTER_H
Index: tools/podofoimpose/lua_compat.h
===================================================================
--- tools/podofoimpose/lua_compat.h	(revision 2056)
+++ tools/podofoimpose/lua_compat.h	(working copy)
@@ -1,3 +1,6 @@
+#ifndef LUA_COMPAT_H_IMPOSE
+#define LUA_COMPAT_H_IMPOSE
+
 extern "C" {
 #include "lua.h"
 // Note: If you're missing these, you're using lua 5.0 and haven't installed
@@ -34,3 +37,5 @@
     return lua_dofile(L, path);
 }
 #endif
+
+#endif // LUA_COMPAT_H_IMPOSE