diff --git a/examples/sample.source.PKIX1/Makefile b/examples/sample.source.PKIX1/Makefile
index c625ed8..8125af7 100644
--- a/examples/sample.source.PKIX1/Makefile
+++ b/examples/sample.source.PKIX1/Makefile
@@ -358,14 +358,14 @@
 	../../asn1c/asn1c -S ../../skeletons ../rfc3280-PKIX1Explicit88.asn1 ../rfc3280-PKIX1Implicit88.asn1
 
 
-Attribute.c: regenerate.Makefile
+Certificate.c: regenerate.Makefile
 	./regenerate.Makefile
-	@touch Attribute.c
+	@touch Certificate.c
 	make
 
 ASN_DECODER_TEMPLATE=../../skeletons/asn-decoder-template.c
 $(TARGET).o: $(ASN_DECODER_TEMPLATE)
-	$(CC) $(CFLAGS) -o $(TARGET).o -c $(ASN_DECODER_TEMPLATE)
+	$(CC) $(CFLAGS) -Dasn_DEF=asn_DEF_Certificate -o $(TARGET).o -c $(ASN_DECODER_TEMPLATE)
 
 distclean: clean
 	rm -f $(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS)
diff --git a/examples/sample.source.PKIX1/config.h b/examples/sample.source.PKIX1/config.h
index 2f6a392..2dda929 100644
--- a/examples/sample.source.PKIX1/config.h
+++ b/examples/sample.source.PKIX1/config.h
@@ -8,5 +8,3 @@
 			__FILE__, __LINE__);	\
 	} while(0)
 
-/* Which type is the PDU; for ../../skeletons/asn-decoder-template.c */
-#define	asn_DEF	asn_DEF_Certificate
diff --git a/examples/sample.source.TAP3/Makefile b/examples/sample.source.TAP3/Makefile
index fcc5126..f990b6d 100644
--- a/examples/sample.source.TAP3/Makefile
+++ b/examples/sample.source.TAP3/Makefile
@@ -702,7 +702,7 @@
 
 ASN_DECODER_TEMPLATE=../../skeletons/asn-decoder-template.c
 $(TARGET).o: $(ASN_DECODER_TEMPLATE)
-	$(CC) $(CFLAGS) -o $(TARGET).o -c $(ASN_DECODER_TEMPLATE)
+	$(CC) $(CFLAGS) -Dasn_DEF=asn_DEF_DataInterChange -o $(TARGET).o -c $(ASN_DECODER_TEMPLATE)
 
 distclean: clean
 	rm -f $(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS)
diff --git a/examples/sample.source.TAP3/config.h b/examples/sample.source.TAP3/config.h
index 30728e1..2dda929 100644
--- a/examples/sample.source.TAP3/config.h
+++ b/examples/sample.source.TAP3/config.h
@@ -8,5 +8,3 @@
 			__FILE__, __LINE__);	\
 	} while(0)
 
-/* Which type is the PDU; for ../../skeletons/asn-decoder-template.c */
-#define	asn_DEF	asn_DEF_DataInterChange