diff --git a/examples/sample.source.MHEG5/Makefile b/examples/sample.source.MHEG5/Makefile
index dc3afa60..5625db50 100644
--- a/examples/sample.source.MHEG5/Makefile
+++ b/examples/sample.source.MHEG5/Makefile
@@ -382,58 +382,20 @@ ASN_MODULE_HEADERS=	\
 
 ASN_MODULE_HEADERS+=ANY.h
 ASN_MODULE_SOURCES+=ANY.c
-ASN_MODULE_HEADERS+=BMPString.h
-ASN_MODULE_SOURCES+=BMPString.c
-ASN_MODULE_HEADERS+=UTF8String.h
 ASN_MODULE_HEADERS+=BOOLEAN.h
 ASN_MODULE_SOURCES+=BOOLEAN.c
 ASN_MODULE_HEADERS+=ENUMERATED.h
 ASN_MODULE_SOURCES+=ENUMERATED.c
 ASN_MODULE_HEADERS+=INTEGER.h
 ASN_MODULE_HEADERS+=NativeEnumerated.h
-ASN_MODULE_HEADERS+=GeneralString.h
-ASN_MODULE_SOURCES+=GeneralString.c
-ASN_MODULE_HEADERS+=GeneralizedTime.h
-ASN_MODULE_SOURCES+=GeneralizedTime.c
-ASN_MODULE_HEADERS+=GraphicString.h
-ASN_MODULE_SOURCES+=GraphicString.c
 ASN_MODULE_HEADERS+=IA5String.h
 ASN_MODULE_SOURCES+=IA5String.c
 ASN_MODULE_SOURCES+=INTEGER.c
-ASN_MODULE_HEADERS+=ISO646String.h
-ASN_MODULE_SOURCES+=ISO646String.c
 ASN_MODULE_HEADERS+=NULL.h
 ASN_MODULE_SOURCES+=NULL.c
 ASN_MODULE_SOURCES+=NativeEnumerated.c
 ASN_MODULE_HEADERS+=NativeInteger.h
 ASN_MODULE_SOURCES+=NativeInteger.c
-ASN_MODULE_HEADERS+=NativeReal.h
-ASN_MODULE_SOURCES+=NativeReal.c
-ASN_MODULE_HEADERS+=REAL.h
-ASN_MODULE_HEADERS+=NumericString.h
-ASN_MODULE_SOURCES+=NumericString.c
-ASN_MODULE_HEADERS+=OBJECT_IDENTIFIER.h
-ASN_MODULE_SOURCES+=OBJECT_IDENTIFIER.c
-ASN_MODULE_HEADERS+=ObjectDescriptor.h
-ASN_MODULE_SOURCES+=ObjectDescriptor.c
-ASN_MODULE_HEADERS+=PrintableString.h
-ASN_MODULE_SOURCES+=PrintableString.c
-ASN_MODULE_SOURCES+=REAL.c
-ASN_MODULE_HEADERS+=RELATIVE-OID.h
-ASN_MODULE_SOURCES+=RELATIVE-OID.c
-ASN_MODULE_HEADERS+=T61String.h
-ASN_MODULE_SOURCES+=T61String.c
-ASN_MODULE_HEADERS+=TeletexString.h
-ASN_MODULE_SOURCES+=TeletexString.c
-ASN_MODULE_HEADERS+=UTCTime.h
-ASN_MODULE_SOURCES+=UTCTime.c
-ASN_MODULE_SOURCES+=UTF8String.c
-ASN_MODULE_HEADERS+=UniversalString.h
-ASN_MODULE_SOURCES+=UniversalString.c
-ASN_MODULE_HEADERS+=VideotexString.h
-ASN_MODULE_SOURCES+=VideotexString.c
-ASN_MODULE_HEADERS+=VisibleString.h
-ASN_MODULE_SOURCES+=VisibleString.c
 ASN_MODULE_HEADERS+=asn_SEQUENCE_OF.h
 ASN_MODULE_SOURCES+=asn_SEQUENCE_OF.c
 ASN_MODULE_HEADERS+=asn_SET_OF.h
diff --git a/examples/sample.source.PKIX1/Makefile b/examples/sample.source.PKIX1/Makefile
index caa5b851..3d804742 100644
--- a/examples/sample.source.PKIX1/Makefile
+++ b/examples/sample.source.PKIX1/Makefile
@@ -265,38 +265,20 @@ ASN_MODULE_HEADERS+=ENUMERATED.h
 ASN_MODULE_SOURCES+=ENUMERATED.c
 ASN_MODULE_HEADERS+=INTEGER.h
 ASN_MODULE_HEADERS+=NativeEnumerated.h
-ASN_MODULE_HEADERS+=GeneralString.h
-ASN_MODULE_SOURCES+=GeneralString.c
 ASN_MODULE_HEADERS+=GeneralizedTime.h
 ASN_MODULE_SOURCES+=GeneralizedTime.c
-ASN_MODULE_HEADERS+=GraphicString.h
-ASN_MODULE_SOURCES+=GraphicString.c
 ASN_MODULE_HEADERS+=IA5String.h
 ASN_MODULE_SOURCES+=IA5String.c
 ASN_MODULE_SOURCES+=INTEGER.c
-ASN_MODULE_HEADERS+=ISO646String.h
-ASN_MODULE_SOURCES+=ISO646String.c
-ASN_MODULE_HEADERS+=NULL.h
-ASN_MODULE_SOURCES+=NULL.c
 ASN_MODULE_SOURCES+=NativeEnumerated.c
 ASN_MODULE_HEADERS+=NativeInteger.h
 ASN_MODULE_SOURCES+=NativeInteger.c
-ASN_MODULE_HEADERS+=NativeReal.h
-ASN_MODULE_SOURCES+=NativeReal.c
-ASN_MODULE_HEADERS+=REAL.h
 ASN_MODULE_HEADERS+=NumericString.h
 ASN_MODULE_SOURCES+=NumericString.c
 ASN_MODULE_HEADERS+=OBJECT_IDENTIFIER.h
 ASN_MODULE_SOURCES+=OBJECT_IDENTIFIER.c
-ASN_MODULE_HEADERS+=ObjectDescriptor.h
-ASN_MODULE_SOURCES+=ObjectDescriptor.c
 ASN_MODULE_HEADERS+=PrintableString.h
 ASN_MODULE_SOURCES+=PrintableString.c
-ASN_MODULE_SOURCES+=REAL.c
-ASN_MODULE_HEADERS+=RELATIVE-OID.h
-ASN_MODULE_SOURCES+=RELATIVE-OID.c
-ASN_MODULE_HEADERS+=T61String.h
-ASN_MODULE_SOURCES+=T61String.c
 ASN_MODULE_HEADERS+=TeletexString.h
 ASN_MODULE_SOURCES+=TeletexString.c
 ASN_MODULE_HEADERS+=UTCTime.h
@@ -304,8 +286,6 @@ ASN_MODULE_SOURCES+=UTCTime.c
 ASN_MODULE_SOURCES+=UTF8String.c
 ASN_MODULE_HEADERS+=UniversalString.h
 ASN_MODULE_SOURCES+=UniversalString.c
-ASN_MODULE_HEADERS+=VideotexString.h
-ASN_MODULE_SOURCES+=VideotexString.c
 ASN_MODULE_HEADERS+=VisibleString.h
 ASN_MODULE_SOURCES+=VisibleString.c
 ASN_MODULE_HEADERS+=asn_SEQUENCE_OF.h
diff --git a/examples/sample.source.TAP3/Makefile b/examples/sample.source.TAP3/Makefile
index f260ed48..624ec864 100644
--- a/examples/sample.source.TAP3/Makefile
+++ b/examples/sample.source.TAP3/Makefile
@@ -616,60 +616,14 @@ ASN_MODULE_HEADERS=	\
 	NumberString.h	\
 	PercentageRate.h
 
-ASN_MODULE_HEADERS+=ANY.h
-ASN_MODULE_SOURCES+=ANY.c
-ASN_MODULE_HEADERS+=BMPString.h
-ASN_MODULE_SOURCES+=BMPString.c
-ASN_MODULE_HEADERS+=UTF8String.h
-ASN_MODULE_HEADERS+=BOOLEAN.h
-ASN_MODULE_SOURCES+=BOOLEAN.c
-ASN_MODULE_HEADERS+=ENUMERATED.h
-ASN_MODULE_SOURCES+=ENUMERATED.c
 ASN_MODULE_HEADERS+=INTEGER.h
 ASN_MODULE_HEADERS+=NativeEnumerated.h
-ASN_MODULE_HEADERS+=GeneralString.h
-ASN_MODULE_SOURCES+=GeneralString.c
-ASN_MODULE_HEADERS+=GeneralizedTime.h
-ASN_MODULE_SOURCES+=GeneralizedTime.c
-ASN_MODULE_HEADERS+=GraphicString.h
-ASN_MODULE_SOURCES+=GraphicString.c
 ASN_MODULE_HEADERS+=IA5String.h
 ASN_MODULE_SOURCES+=IA5String.c
 ASN_MODULE_SOURCES+=INTEGER.c
-ASN_MODULE_HEADERS+=ISO646String.h
-ASN_MODULE_SOURCES+=ISO646String.c
-ASN_MODULE_HEADERS+=NULL.h
-ASN_MODULE_SOURCES+=NULL.c
 ASN_MODULE_SOURCES+=NativeEnumerated.c
 ASN_MODULE_HEADERS+=NativeInteger.h
 ASN_MODULE_SOURCES+=NativeInteger.c
-ASN_MODULE_HEADERS+=NativeReal.h
-ASN_MODULE_SOURCES+=NativeReal.c
-ASN_MODULE_HEADERS+=REAL.h
-ASN_MODULE_HEADERS+=NumericString.h
-ASN_MODULE_SOURCES+=NumericString.c
-ASN_MODULE_HEADERS+=OBJECT_IDENTIFIER.h
-ASN_MODULE_SOURCES+=OBJECT_IDENTIFIER.c
-ASN_MODULE_HEADERS+=ObjectDescriptor.h
-ASN_MODULE_SOURCES+=ObjectDescriptor.c
-ASN_MODULE_HEADERS+=PrintableString.h
-ASN_MODULE_SOURCES+=PrintableString.c
-ASN_MODULE_SOURCES+=REAL.c
-ASN_MODULE_HEADERS+=RELATIVE-OID.h
-ASN_MODULE_SOURCES+=RELATIVE-OID.c
-ASN_MODULE_HEADERS+=T61String.h
-ASN_MODULE_SOURCES+=T61String.c
-ASN_MODULE_HEADERS+=TeletexString.h
-ASN_MODULE_SOURCES+=TeletexString.c
-ASN_MODULE_HEADERS+=UTCTime.h
-ASN_MODULE_SOURCES+=UTCTime.c
-ASN_MODULE_SOURCES+=UTF8String.c
-ASN_MODULE_HEADERS+=UniversalString.h
-ASN_MODULE_SOURCES+=UniversalString.c
-ASN_MODULE_HEADERS+=VideotexString.h
-ASN_MODULE_SOURCES+=VideotexString.c
-ASN_MODULE_HEADERS+=VisibleString.h
-ASN_MODULE_SOURCES+=VisibleString.c
 ASN_MODULE_HEADERS+=asn_SEQUENCE_OF.h
 ASN_MODULE_SOURCES+=asn_SEQUENCE_OF.c
 ASN_MODULE_HEADERS+=asn_SET_OF.h
@@ -681,8 +635,6 @@ ASN_MODULE_SOURCES+=constr_SEQUENCE.c
 ASN_MODULE_HEADERS+=constr_SEQUENCE_OF.h
 ASN_MODULE_SOURCES+=constr_SEQUENCE_OF.c
 ASN_MODULE_HEADERS+=constr_SET_OF.h
-ASN_MODULE_HEADERS+=constr_SET.h
-ASN_MODULE_SOURCES+=constr_SET.c
 ASN_MODULE_SOURCES+=constr_SET_OF.c
 ASN_MODULE_HEADERS+=asn_application.h
 ASN_MODULE_HEADERS+=asn_system.h
diff --git a/libasn1compiler/asn1c_fdeps.c b/libasn1compiler/asn1c_fdeps.c
index eb83d7c8..e34cb6f5 100644
--- a/libasn1compiler/asn1c_fdeps.c
+++ b/libasn1compiler/asn1c_fdeps.c
@@ -13,7 +13,7 @@ asn1c_activate_dependency(asn1c_fdeps_t *deps, asn1c_fdeps_t *cur, const char *d
 		return 0;
 	if(!cur) cur = deps;
 
-	if(cur->usage != FDEP_NOTUSED)
+	if(cur->usage > FDEP_NOTUSED)
 		return 1;	/* Already activated */
 
 	fname = data;
@@ -66,7 +66,7 @@ asn1c_read_file_dependencies(arg_t *arg, const char *datadir) {
 	asn1c_fdeps_t *deps;
 	asn1c_fdeps_t *cur;
 	FILE *f;
-	enum fdep_usage special_section = FDEP_REFERRED;
+	enum fdep_usage special_section = FDEP_NOTUSED;
 
 	(void)arg;
 
@@ -112,7 +112,6 @@ asn1c_read_file_dependencies(arg_t *arg, const char *datadir) {
 				continue;
 
 			d = asn1c_new_dep(p);
-			assert(d);
 			d->usage = special_section;
 
 			if(asn1c_dep_add(cur, d) == 1)