diff --git a/ridlbe/ccmx11/facets/dds/templates/idl/dds/bitmask.erb b/ridlbe/ccmx11/facets/dds/templates/idl/dds/bitmask.erb
index eb9c1015..2a7bb4c3 100644
--- a/ridlbe/ccmx11/facets/dds/templates/idl/dds/bitmask.erb
+++ b/ridlbe/ccmx11/facets/dds/templates/idl/dds/bitmask.erb
@@ -1,7 +1,9 @@
 
 // generated from <%= ridl_template_path %>
 /// @copydoc <%= doc_scoped_name %>
-@bit_bound(<%= bitbound_bits %>)
+% annotations.each do |_a|
+@<%= _a.id %><% unless _a.fields.empty? %>(<% _a.fields.values.each do |f| %><%= f %><% end %>)<% end %>
+% end
 bitmask <%= unescaped_name %> {
   <%= bitvalues.collect {|e| "/// @copydoc #{e.doc_scoped_name}\n  #{e.name}" }.join(",\n  ") %>
 };
diff --git a/ridlbe/ccmx11/facets/dds/templates/idl/dds/enum.erb b/ridlbe/ccmx11/facets/dds/templates/idl/dds/enum.erb
index 0967fe2a..2d79075d 100644
--- a/ridlbe/ccmx11/facets/dds/templates/idl/dds/enum.erb
+++ b/ridlbe/ccmx11/facets/dds/templates/idl/dds/enum.erb
@@ -1,7 +1,9 @@
 
 // generated from <%= ridl_template_path %>
 /// @copydoc <%= doc_scoped_name %>
-@bit_bound(<%= bitbound_bits %>)
+% annotations.each do |_a|
+@<%= _a.id %><% unless _a.fields.empty? %>(<% _a.fields.values.each do |f| %><%= f %><% end %>)<% end %>
+% end
 enum <%= unescaped_name %> {
   <%= enumerators.collect {|e| "/// @copydoc #{e.doc_scoped_name}\n  #{e.name}" }.join(",\n  ") %>
 };