fix headers (see headercheck)

[[Imported from SVN: r5285]]

common/propertymap.hh

@@ -5,6 +5,8 @@
 #define DUNE_PROPERTYMAP_HH
 
 #include <cstddef>
+#include <iterator>
+
 #include "static_assert.hh"
 #include "typetraits.hh"
 

common/version.hh

@@ -3,7 +3,7 @@
 #ifndef DUNE_VERSION_HH
 #define DUNE_VERSION_HH
 
-#define DUNE_VERSION_JOIN(module,type) ## module ## _VERSION_ ## type
+#define DUNE_VERSION_JOIN(module,type) module ## _VERSION_ ## type
 
 #define DUNE_VERSION_EQUAL(module,major,minor) \
   ((DUNE_VERSION_JOIN(module,MAJOR) == major) && \