diff --git a/src/db/db/dbArray.h b/src/db/db/dbArray.h
index 083a02843..253a043bb 100644
--- a/src/db/db/dbArray.h
+++ b/src/db/db/dbArray.h
@@ -1208,7 +1208,7 @@ struct array_iterator
   typedef void pointer_type;
   typedef void difference_type;
   typedef void pointer;
-  typedef void iterator_category;
+  typedef std::forward_iterator_tag iterator_category;
 
   /**
    *  @brief The default constructor
diff --git a/src/db/db/gsiDeclDbLayoutQuery.cc b/src/db/db/gsiDeclDbLayoutQuery.cc
index 5f2b47ec2..0c417e0fc 100644
--- a/src/db/db/gsiDeclDbLayoutQuery.cc
+++ b/src/db/db/gsiDeclDbLayoutQuery.cc
@@ -70,7 +70,7 @@ struct LayoutQueryIteratorWrapper
 {
   typedef db::LayoutQueryIterator &reference;
   //  Dummy declarations
-  typedef void iterator_category;
+  typedef std::forward_iterator_tag iterator_category;
   typedef void value_type;
   typedef void difference_type;
   typedef void pointer;
diff --git a/src/db/db/gsiDeclDbShape.cc b/src/db/db/gsiDeclDbShape.cc
index 69b926d5d..96dbf44c1 100644
--- a/src/db/db/gsiDeclDbShape.cc
+++ b/src/db/db/gsiDeclDbShape.cc
@@ -954,7 +954,7 @@ struct ConvertingIteratorWrapper
   typedef T value_type;
   typedef T reference;
   typedef void pointer;
-  typedef void iterator_category;
+  typedef std::forward_iterator_tag iterator_category;
 
   ConvertingIteratorWrapper (double dbu, const I &b, const I &e)
     : m_b (b), m_e (e), m_dbu (dbu)
@@ -989,7 +989,7 @@ struct ConvertingFreeIteratorWrapper
   typedef T value_type;
   typedef T reference;
   typedef void pointer;
-  typedef void iterator_category;
+  typedef std::forward_iterator_tag iterator_category;
 
   ConvertingFreeIteratorWrapper (double dbu, const I &b)
     : m_b (b), m_dbu (dbu)
diff --git a/src/gsi/gsi/gsiIterators.h b/src/gsi/gsi/gsiIterators.h
index 35c53253f..87d69fdcd 100644
--- a/src/gsi/gsi/gsiIterators.h
+++ b/src/gsi/gsi/gsiIterators.h
@@ -28,6 +28,8 @@
 #include "tlTypeTraits.h"
 #include "gsiSerialisation.h"
 
+#include <iterator>
+
 //  For a comprehensive documentation see gsi.h
 
 namespace gsi
diff --git a/src/laybasic/laybasic/gsiDeclLayLayoutView.cc b/src/laybasic/laybasic/gsiDeclLayLayoutView.cc
index 0d28c0693..3ce4c3c90 100644
--- a/src/laybasic/laybasic/gsiDeclLayLayoutView.cc
+++ b/src/laybasic/laybasic/gsiDeclLayLayoutView.cc
@@ -320,7 +320,7 @@ namespace {
     typedef lay::LayerPropertiesNodeRef value_type;
     typedef lay::LayerPropertiesNodeRef reference;
     //  Dummy declarations required for std::iterator_traits
-    typedef void iterator_category;
+    typedef std::forward_iterator_tag iterator_category;
     typedef void difference_type;
     typedef void pointer;