```
+#define NETBSD_OS_D_BUILTINS_ELF() \
+ do \
+ { \
+    NETBSD_OS_D_BUILTINS_COMMON(); \
+ } \
+ while (0)
+
```

Why not just skip ```NETBSD_OS_D_BUILTINS_ELF``` and call ```NETBSD_OS_D_BUILTINS_COMMON``` directly from where it is needed. :)