Index: libcfa/Makefile.in
===================================================================
--- libcfa/Makefile.in	(revision ad8e0628661fb3a1280de308f864deccdc6779b6)
+++ libcfa/Makefile.in	(revision 643a2e135d899ce33f37fad84d995e331a9c1af8)
@@ -9,5 +9,4 @@
 	${INSTALL} -d @CFA_LIBDIR@
 	${INSTALL} prelude.cf @CFA_LIBDIR@
-	${INSTALL} builtins.cf @CFA_LIBDIR@
 	${INSTALL} libcfa.a @CFA_LIBDIR@
 
@@ -18,4 +17,5 @@
 builtins.cf: builtins.c
 	@BACKEND_CC@ -E -P $^ | sed -e "/targetm/s/.*//" -e "/_Decimal/s/.*//" -e "s/void (const char \*)0();//" -e "s/\"//g" -e "s/\(__builtin_\) /\1/" > $@
+	${INSTALL} builtins.cf @CFA_LIBDIR@
 
 libcfa-prelude.c: ../translator/cfa-cpp prelude.cf builtins.cf
Index: libcfa/prototypes.awk
===================================================================
--- libcfa/prototypes.awk	(revision ad8e0628661fb3a1280de308f864deccdc6779b6)
+++ libcfa/prototypes.awk	(revision 643a2e135d899ce33f37fad84d995e331a9c1af8)
@@ -67,12 +67,10 @@
 	} # if
 
+	printf( "#define %s(NAME) FUNC_SIMPLE(", prototype )
+
 	if ( sub( "BT_FN_", "", prototype ) == 0 ) {
-	    if ( sub( "BT_", "", prototype ) == 0 ) {
-		printf( "\n********** BAD MACRO NAME \"%s\" **********\n", prototype )
-		exit 0
-	    } #if
+	    printf( "\n********** BAD MACRO NAME \"%s\" **********\n", prototype )
+	    exit 0
 	} # if
-
-	printf( "#define %s(NAME) FUNC_SIMPLE(", prototype )
 
 	# generate function return type as macro