Index: trunk/glueforge/templates/psdb/header.tt
===================================================================
--- trunk/glueforge/templates/psdb/header.tt	(revision 4346)
+++ trunk/glueforge/templates/psdb/header.tt	(revision 5907)
@@ -1,4 +1,4 @@
-#ifndef [% namespace FILTER upper %]_DB_H
-#define [% namespace FILTER upper %]_DB_H 1
+#ifndef [% pkg_name FILTER upper %]_H
+#define [% pkg_name FILTER upper %]_H 1
 
 #include <pslib.h>
@@ -11,4 +11,5 @@
 /// @{
 
+[% FOREACH table = tables -%]
 [% INCLUDE object_h.tt %]
 [% INCLUDE alloc_h.tt %]
@@ -26,4 +27,5 @@
 [% INCLUDE metadatafromobject_h.tt %]
 [% INCLUDE objectfrommetadata_h.tt -%]
+[% END -%]
 
 /// @}
@@ -33,3 +35,3 @@
 #endif
 
-#endif // [% namespace FILTER upper %]_DB_H
+#endif // [% table.namespace FILTER upper %]_DB_H