diff --git a/src/OpenMesh/Core/Mesh/CirculatorsT.hh b/src/OpenMesh/Core/Mesh/CirculatorsT.hh
index 750528ee..4594a2a1 100644
--- a/src/OpenMesh/Core/Mesh/CirculatorsT.hh
+++ b/src/OpenMesh/Core/Mesh/CirculatorsT.hh
@@ -54,7 +54,7 @@
 #include <OpenMesh/Core/System/config.h>
 #include <cassert>
 #include <cstddef>
-
+#include <iterator>
 
 //== NAMESPACES ===============================================================
 
diff --git a/src/OpenMesh/Core/Mesh/IteratorsT.hh b/src/OpenMesh/Core/Mesh/IteratorsT.hh
index db09fde3..3a27ab04 100644
--- a/src/OpenMesh/Core/Mesh/IteratorsT.hh
+++ b/src/OpenMesh/Core/Mesh/IteratorsT.hh
@@ -56,6 +56,7 @@
 #include <OpenMesh/Core/Mesh/Status.hh>
 #include <cassert>
 #include <cstddef>
+#include <iterator>
 
 
 //== NAMESPACES ===============================================================
diff --git a/src/OpenMesh/Core/System/config.h b/src/OpenMesh/Core/System/config.h
index d4523fd5..f3395312 100644
--- a/src/OpenMesh/Core/System/config.h
+++ b/src/OpenMesh/Core/System/config.h
@@ -79,7 +79,7 @@
 
 #if defined(_MSCVER)
 #define DEPRECATED(msg) __declspec(deprecated(msg))
-#elif defined(__GNUC__) or defined(__clang__)
+#elif defined(__GNUC__) || defined(__clang__)
 #define DEPRECATED(msg) __attribute__ ((deprecated(msg)))
 #else
 #define DEPRECATED(msg)