Index: tests/linking/exception-nothreads.cfa
===================================================================
--- tests/linking/exception-nothreads.cfa	(revision 237df76db82f504ef572c9139c965eb7aa1bfcfb)
+++ tests/linking/exception-nothreads.cfa	(revision 1dbbef6589e7fa96c6a3e4dfdc0c68971d35cd60)
@@ -15,8 +15,7 @@
 
 #include <stdlib.hfa>
-#include <exception.hfa>
 
-EHM_EXCEPTION(ping)();
-EHM_VIRTUAL_TABLE(ping, ping_vt);
+exception ping {};
+vtable(ping) ping_vt;
 
 int main(void) {
Index: tests/linking/exception-withthreads.cfa
===================================================================
--- tests/linking/exception-withthreads.cfa	(revision 237df76db82f504ef572c9139c965eb7aa1bfcfb)
+++ tests/linking/exception-withthreads.cfa	(revision 1dbbef6589e7fa96c6a3e4dfdc0c68971d35cd60)
@@ -15,9 +15,8 @@
 
 #include <stdlib.hfa>
-#include <exception.hfa>
 #include "../exceptions/with-threads.hfa"
 
-EHM_EXCEPTION(ping)();
-EHM_VIRTUAL_TABLE(ping, ping_vt);
+exception ping {};
+vtable(ping) ping_vt;
 
 int main(void) {