Index: libcfa/src/Exception.hfa
===================================================================
--- libcfa/src/Exception.hfa	(revision 3543e991e011a9dddd3bbcbe5bf9f22d0266f764)
+++ libcfa/src/Exception.hfa	(revision 3543e991e011a9dddd3bbcbe5bf9f22d0266f764)
@@ -0,0 +1,5 @@
+#pragma once
+
+// TEMPORARY
+#define ExceptionDecl( name, fields... ) exception name{ fields }; __attribute__(( cfa_linkonce )) vtable( name ) name ## _vt
+#define ExceptionInst( name, values... ) (name){ &name ## _vt, values }
Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision d32679d538afe4b499d20b11c9407b3fc906cd84)
+++ libcfa/src/Makefile.am	(revision 3543e991e011a9dddd3bbcbe5bf9f22d0266f764)
@@ -11,6 +11,6 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Thu May 25 15:20:04 2023
-## Update Count     : 259
+## Last Modified On : Mon Aug 14 17:10:51 2023
+## Update Count     : 262
 ###############################################################################
 
@@ -40,4 +40,5 @@
 if BUILDLIB
 inst_headers_nosrc = \
+	Exception.hfa \
 	bitmanip.hfa \
 	clock.hfa \
Index: libcfa/src/common.hfa
===================================================================
--- libcfa/src/common.hfa	(revision d32679d538afe4b499d20b11c9407b3fc906cd84)
+++ libcfa/src/common.hfa	(revision 3543e991e011a9dddd3bbcbe5bf9f22d0266f764)
@@ -10,16 +10,9 @@
 // Created On       : Wed Jul 11 17:54:36 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug  7 10:16:35 2023
-// Update Count     : 34
+// Last Modified On : Mon Aug 14 17:01:47 2023
+// Update Count     : 38
 //
 
 #pragma once
-
-// TEMPORARY
-#define Exception( name, fields... ) exception name{ fields }; static vtable( name ) name ## _vt
-#define ExceptionDecl( name, fields... ) exception name{ fields }
-#define ExceptionDefn( name, fields... ) static vtable( name ) name ## _vt
-#define ExceptionValue( name, values... ) (name){ &name ## _vt, values }
-#define Throw( name, values... ) throw (name){ values }
 
 //---------------------------------------