Index: apps/graph/include/max_cliques.h
===================================================================
--- apps/graph/include/max_cliques.h	(revision 10281)
+++ apps/graph/include/max_cliques.h	(working copy)
@@ -75,6 +75,18 @@
    void rewind() { Q.clear(); init(); }
 };
 
+} }
+
+namespace pm {
+
+template <typename GraphRef>
+class generic_of_GraphComponents<GraphRef, polymake::graph::max_cliques_iterator>
+   : public GenericSet< GraphComponents<GraphRef,polymake::graph::max_cliques_iterator>, Set<int>, operations::cmp > {};
+
+}
+
+namespace polymake { namespace graph {
+
 template <typename Graph> inline
 pm::GraphComponents<const Graph&, max_cliques_iterator>
 max_cliques(const GenericGraph<Graph,Undirected>& G) { return G.top(); }
@@ -91,9 +103,6 @@
 template <typename Graph>
 struct check_iterator_feature<polymake::graph::max_cliques_iterator<Graph>, rewindable> : True {};
 
-template <typename GraphRef>
-class generic_of_GraphComponents<GraphRef, polymake::graph::max_cliques_iterator>
-   : public GenericSet< GraphComponents<GraphRef,polymake::graph::max_cliques_iterator>, Set<int>, operations::cmp > {};
 }
 
 #include "polymake/graph/max_cliques.tcc"
Index: apps/topaz/src/graph.cc
===================================================================
--- apps/topaz/src/graph.cc	(revision 10281)
+++ apps/topaz/src/graph.cc	(working copy)
@@ -16,6 +16,7 @@
 */
 
 #include "polymake/client.h"
+#include "polymake/PowerSet.h"
 #include "polymake/topaz/graph.h"
 #include "polymake/topaz/complex_tools.h"
 
Index: lib/core/include/internal/CharBuffer.h
===================================================================
--- lib/core/include/internal/CharBuffer.h	(revision 10281)
+++ lib/core/include/internal/CharBuffer.h	(working copy)
@@ -21,6 +21,7 @@
 #include <sys/types.h>
 #include <cctype>
 #include <cstring>
+#include <cstddef>
 #include "polymake/socketstream.h"
 
 namespace pm {
Index: lib/core/include/internal/type_manip.h
===================================================================
--- lib/core/include/internal/type_manip.h	(revision 10281)
+++ lib/core/include/internal/type_manip.h	(working copy)
@@ -31,6 +31,7 @@
 #include <new>
 #include <memory>
 #include <limits>
+#include <cstddef>
 
 #if defined(__GNUC__)
 #  define _POLYMAKE_ALIGN(what,n) what __attribute__ ((aligned (n)))
Index: lib/core/include/list
===================================================================
--- lib/core/include/list	(revision 10281)
+++ lib/core/include/list	(working copy)
@@ -71,6 +71,10 @@
 
 #if POLYMAKE_GCC_NEW_STD_LIST
 
+#ifndef _GLIBCXX_STD
+#define _GLIBCXX_STD _GLIBCXX_STD_A
+#endif
+
 template <typename Value>
 struct iterator_cross_const_helper<_GLIBCXX_STD::_List_iterator<Value>, true> {
    typedef _GLIBCXX_STD::_List_iterator<Value> iterator;