diff --git a/libasn1compiler/asn1c_save.c b/libasn1compiler/asn1c_save.c
index 00a4496edf7b5716462c15508b662452803df460..381404e4f1f28990bd58860d1238e2752e0b79e6 100644
--- a/libasn1compiler/asn1c_save.c
+++ b/libasn1compiler/asn1c_save.c
@@ -216,7 +216,7 @@ asn1c_save_streams(arg_t *arg, asn1c_fdeps_t *deps) {
fprintf(fp_h, "#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n");
- fprintf(fp_h, "#include <constr_TYPE.h>\n\n");
+ fprintf(fp_h, "#include <asn_application.h>\n\n");
TQ_FOR(ot, &(cs->destination[OT_INCLUDES].chunks), next) {
asn1c_activate_dependency(deps, 0, ot->buf);
diff --git a/skeletons/ANY.h b/skeletons/ANY.h
index d010de4a1590d67a741c8c1f8adc44ac1b0e6f89..ae62596ff47edeca0b45d64ee660f7be0f4c231a 100644
--- a/skeletons/ANY.h
+++ b/skeletons/ANY.h
@@ -5,7 +5,6 @@
#ifndef ASN_TYPE_ANY_H
#define ASN_TYPE_ANY_H
-#include <constr_TYPE.h>
#include <OCTET_STRING.h> /* Implemented via OCTET SRING type */
typedef struct ANY {
diff --git a/skeletons/BIT_STRING.h b/skeletons/BIT_STRING.h
index f9ebf9b7e39fb8de5737ae06b58095e2af1236c9..ff622a3250f3deb93d9e3bb240f2739976d7e4d9 100644
--- a/skeletons/BIT_STRING.h
+++ b/skeletons/BIT_STRING.h
@@ -5,10 +5,9 @@
#ifndef _BIT_STRING_H_
#define _BIT_STRING_H_
-#include <constr_TYPE.h>
#include <OCTET_STRING.h>
-typedef OCTET_STRING_t BIT_STRING_t; /* Implemented in terms of OCTET STRING */
+typedef OCTET_STRING_t BIT_STRING_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_BIT_STRING;
diff --git a/skeletons/BMPString.h b/skeletons/BMPString.h
index 31d67eaeefd7abe5def0cf58523e2a44e79ddd34..2860e6baaa0eb25a3e76bf8560888a814dec3eea 100644
--- a/skeletons/BMPString.h
+++ b/skeletons/BMPString.h
@@ -5,10 +5,9 @@
#ifndef _BMPString_H_
#define _BMPString_H_
-#include <constr_TYPE.h>
#include <OCTET_STRING.h>
-typedef OCTET_STRING_t BMPString_t; /* Implemented in terms of OCTET STRING */
+typedef OCTET_STRING_t BMPString_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_BMPString;
diff --git a/skeletons/BOOLEAN.h b/skeletons/BOOLEAN.h
index b9b836ee51e607aa209ab423248d121357d58b98..2b195dc1be903295f6fc3dfd518801b0d1e1afae 100644
--- a/skeletons/BOOLEAN.h
+++ b/skeletons/BOOLEAN.h
@@ -5,7 +5,7 @@
#ifndef _BOOLEAN_H_
#define _BOOLEAN_H_
-#include <constr_TYPE.h>
+#include <asn_application.h>
/*
* The underlying integer may contain various values, but everything
diff --git a/skeletons/ENUMERATED.h b/skeletons/ENUMERATED.h
index a0948ed062be0e15ea50fc53cb229328b28778d0..b926eb263facc3cee2cb14cf549834c2d0529ffa 100644
--- a/skeletons/ENUMERATED.h
+++ b/skeletons/ENUMERATED.h
@@ -5,10 +5,9 @@
#ifndef _ENUMERATED_H_
#define _ENUMERATED_H_
-#include <constr_TYPE.h>
#include <INTEGER.h>
-typedef INTEGER_t ENUMERATED_t; /* Implemented in terms of INTEGER */
+typedef INTEGER_t ENUMERATED_t; /* Implemented via INTEGER */
extern asn1_TYPE_descriptor_t asn1_DEF_ENUMERATED;
diff --git a/skeletons/GeneralString.h b/skeletons/GeneralString.h
index 6d5bfdf67f6b072a2a238289078bf850767161c8..d8d07e97b365283a9ea78d0bae5a9126cc5ba376 100644
--- a/skeletons/GeneralString.h
+++ b/skeletons/GeneralString.h
@@ -5,10 +5,9 @@
#ifndef _GeneralString_H_
#define _GeneralString_H_
-#include <constr_TYPE.h>
#include <OCTET_STRING.h>
-typedef OCTET_STRING_t GeneralString_t; /* Implemented in terms of OCTET STRING */
+typedef OCTET_STRING_t GeneralString_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_GeneralString;
diff --git a/skeletons/GeneralizedTime.h b/skeletons/GeneralizedTime.h
index 06b4ca5f71fc0a490f70bec624108a67870e6369..6681183b60b82173677dba46d8c0c10c9092c169 100644
--- a/skeletons/GeneralizedTime.h
+++ b/skeletons/GeneralizedTime.h
@@ -5,10 +5,9 @@
#ifndef _GeneralizedTime_H_
#define _GeneralizedTime_H_
-#include <constr_TYPE.h>
#include <OCTET_STRING.h>
-typedef OCTET_STRING_t GeneralizedTime_t; /* Implemented using OCTET STRING */
+typedef OCTET_STRING_t GeneralizedTime_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_GeneralizedTime;
diff --git a/skeletons/GraphicString.h b/skeletons/GraphicString.h
index b37b2c7e0ed7227528602d277bce0cdafc300bca..64fcf642de66e6fe6f2f1d7ee99d9111e38f106e 100644
--- a/skeletons/GraphicString.h
+++ b/skeletons/GraphicString.h
@@ -5,10 +5,9 @@
#ifndef _GraphicString_H_
#define _GraphicString_H_
-#include <constr_TYPE.h>
#include <OCTET_STRING.h>
-typedef OCTET_STRING_t GraphicString_t; /* Implemented in terms of OCTET STRING */
+typedef OCTET_STRING_t GraphicString_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_GraphicString;
diff --git a/skeletons/IA5String.h b/skeletons/IA5String.h
index a80004e8c4205a01c4999d2925ee1e8c6913cfd3..6c40a954d4c78141cb83a82753593930a9a3c8e1 100644
--- a/skeletons/IA5String.h
+++ b/skeletons/IA5String.h
@@ -5,10 +5,9 @@
#ifndef _IA5String_H_
#define _IA5String_H_
-#include <constr_TYPE.h>
#include <OCTET_STRING.h>
-typedef OCTET_STRING_t IA5String_t; /* Implemented in terms of OCTET STRING */
+typedef OCTET_STRING_t IA5String_t; /* Implemented via OCTET STRING */
/*
* IA5String ASN.1 type definition.
diff --git a/skeletons/INTEGER.h b/skeletons/INTEGER.h
index 8e3c5458b9963a8e18bf5b32dd3ceea78020e7fe..89ab1af59dcfcc518a546f307ff98bdf1c2e8d62 100644
--- a/skeletons/INTEGER.h
+++ b/skeletons/INTEGER.h
@@ -5,7 +5,7 @@
#ifndef _INTEGER_H_
#define _INTEGER_H_
-#include <constr_TYPE.h>
+#include <asn_application.h>
typedef struct INTEGER {
uint8_t *buf; /* Buffer with consecutive INTEGER bits (big-endian) */
diff --git a/skeletons/ISO646String.h b/skeletons/ISO646String.h
index 566ce3bea660ffd39a689b2d1a1dfc1b02143418..c1ff80f7e9712408444bbfca7977c241fa87ea76 100644
--- a/skeletons/ISO646String.h
+++ b/skeletons/ISO646String.h
@@ -5,7 +5,7 @@
#ifndef _ISO646String_H_
#define _ISO646String_H_
-#include <constr_TYPE.h>
+#include <asn_application.h>
#include <VisibleString.h>
typedef VisibleString_t ISO646String_t; /* Implemented using VisibleString */
diff --git a/skeletons/NULL.h b/skeletons/NULL.h
index 0c07ffe85af0d8498fbb1237e074ee6535d3dcb4..64c02f70704b7d4823ea3656e4f478c5d1cf8d69 100644
--- a/skeletons/NULL.h
+++ b/skeletons/NULL.h
@@ -5,7 +5,7 @@
#ifndef ASN_TYPE_NULL_H
#define ASN_TYPE_NULL_H
-#include <constr_TYPE.h>
+#include <asn_application.h>
/*
* The value of the NULL type is meaningless: see BOOLEAN if you want to
diff --git a/skeletons/NativeInteger.h b/skeletons/NativeInteger.h
index 2d0cddaadf68eb31fe8fee18256c1fa217520f8b..5c1e5e41b885bf0c09df3e1789a66028e88aebb4 100644
--- a/skeletons/NativeInteger.h
+++ b/skeletons/NativeInteger.h
@@ -12,7 +12,7 @@
#ifndef _NativeInteger_H_
#define _NativeInteger_H_
-#include <constr_TYPE.h>
+#include <asn_application.h>
extern asn1_TYPE_descriptor_t asn1_DEF_NativeInteger;
diff --git a/skeletons/NativeReal.h b/skeletons/NativeReal.h
index a130a334b77d69691109e631441fcd7abca28379..2f3b0a60c949f8e9c3361d2932b5047c02f4820c 100644
--- a/skeletons/NativeReal.h
+++ b/skeletons/NativeReal.h
@@ -11,7 +11,7 @@
#ifndef ASN_TYPE_NativeReal_H
#define ASN_TYPE_NativeReal_H
-#include <constr_TYPE.h>
+#include <asn_application.h>
extern asn1_TYPE_descriptor_t asn1_DEF_NativeReal;
diff --git a/skeletons/NumericString.h b/skeletons/NumericString.h
index 71f72c76921fc40e761a6afac7aa2daa4399120d..2e06255eab279ca57171df22931954e858b86ffa 100644
--- a/skeletons/NumericString.h
+++ b/skeletons/NumericString.h
@@ -5,10 +5,9 @@
#ifndef _NumericString_H_
#define _NumericString_H_
-#include <constr_TYPE.h>
#include <OCTET_STRING.h>
-typedef OCTET_STRING_t NumericString_t; /* Implemented in terms of OCTET STRING */
+typedef OCTET_STRING_t NumericString_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_NumericString;
diff --git a/skeletons/OBJECT_IDENTIFIER.h b/skeletons/OBJECT_IDENTIFIER.h
index 4f45090cf86a36699d46a3f49142de41e6b06ece..e232f70b74a536a861d3ac2db26d287042d0f0dc 100644
--- a/skeletons/OBJECT_IDENTIFIER.h
+++ b/skeletons/OBJECT_IDENTIFIER.h
@@ -5,10 +5,9 @@
#ifndef _OBJECT_IDENTIFIER_H_
#define _OBJECT_IDENTIFIER_H_
-#include <constr_TYPE.h>
#include <INTEGER.h>
-typedef INTEGER_t OBJECT_IDENTIFIER_t; /* Implemented in terms of INTEGER */
+typedef INTEGER_t OBJECT_IDENTIFIER_t; /* Implemented via INTEGER */
extern asn1_TYPE_descriptor_t asn1_DEF_OBJECT_IDENTIFIER;
diff --git a/skeletons/OCTET_STRING.h b/skeletons/OCTET_STRING.h
index a67cef94b5712690d009c54e295a0f087cd134d4..3c4509b68a2f790a1164547cd1103e93876b484e 100644
--- a/skeletons/OCTET_STRING.h
+++ b/skeletons/OCTET_STRING.h
@@ -5,7 +5,7 @@
#ifndef _OCTET_STRING_H_
#define _OCTET_STRING_H_
-#include <constr_TYPE.h>
+#include <asn_application.h>
typedef struct OCTET_STRING {
uint8_t *buf; /* Buffer with consecutive OCTET_STRING bits */
diff --git a/skeletons/ObjectDescriptor.h b/skeletons/ObjectDescriptor.h
index 67addf243f7814d1ed8aeca902f4744193684e0f..2620d139eaa8873d1db0f810b15e23be3178a8a4 100644
--- a/skeletons/ObjectDescriptor.h
+++ b/skeletons/ObjectDescriptor.h
@@ -5,10 +5,9 @@
#ifndef _ObjectDescriptor_H_
#define _ObjectDescriptor_H_
-#include <constr_TYPE.h>
#include <GraphicString.h>
-typedef GraphicString_t ObjectDescriptor_t; /* Implemented in terms of. */
+typedef GraphicString_t ObjectDescriptor_t; /* Implemented via GraphicString */
extern asn1_TYPE_descriptor_t asn1_DEF_ObjectDescriptor;
diff --git a/skeletons/PrintableString.h b/skeletons/PrintableString.h
index b44a61ec359388b8f3077b3126a61b9d0a1c68d7..fffb86ee1da44c393751c715e8bfde8aef795853 100644
--- a/skeletons/PrintableString.h
+++ b/skeletons/PrintableString.h
@@ -5,10 +5,9 @@
#ifndef _PrintableString_H_
#define _PrintableString_H_
-#include <constr_TYPE.h>
#include <OCTET_STRING.h>
-typedef OCTET_STRING_t PrintableString_t; /* Implemented in terms of OCTET STRING */
+typedef OCTET_STRING_t PrintableString_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_PrintableString;
diff --git a/skeletons/REAL.h b/skeletons/REAL.h
index 83f96d019c1e1c8c76d04e34db03697e159fc8d5..2f7809b5213dd6701016ada6291d7760ef983af3 100644
--- a/skeletons/REAL.h
+++ b/skeletons/REAL.h
@@ -5,7 +5,7 @@
#ifndef ASN_TYPE_REAL_H
#define ASN_TYPE_REAL_H
-#include <constr_TYPE.h>
+#include <asn_application.h>
typedef struct REAL {
uint8_t *buf; /* Buffer with REAL type encoding */
diff --git a/skeletons/RELATIVE-OID.h b/skeletons/RELATIVE-OID.h
index e6af9346673ebedeffb14592979823e5c9009268..855391c9a3a8d9fcea8afe40d51dc0a3fcc0a761 100644
--- a/skeletons/RELATIVE-OID.h
+++ b/skeletons/RELATIVE-OID.h
@@ -5,10 +5,9 @@
#ifndef _RELATIVE_OID_H_
#define _RELATIVE_OID_H_
-#include <constr_TYPE.h>
#include <OBJECT_IDENTIFIER.h>
-/* Implemented in terms of OBJECT IDENTIFIER */
+/* Implemented via OBJECT IDENTIFIER */
typedef OBJECT_IDENTIFIER_t RELATIVE_OID_t;
extern asn1_TYPE_descriptor_t asn1_DEF_RELATIVE_OID;
diff --git a/skeletons/T61String.h b/skeletons/T61String.h
index 1485577efad30ed089ba6b5b1e530cf86e603bd5..f523444bbefe9fe104171a278116c03aedad7099 100644
--- a/skeletons/T61String.h
+++ b/skeletons/T61String.h
@@ -5,10 +5,9 @@
#ifndef _T61String_H_
#define _T61String_H_
-#include <constr_TYPE.h>
#include <OCTET_STRING.h>
-typedef OCTET_STRING_t T61String_t; /* Implemented in terms of OCTET STRING */
+typedef OCTET_STRING_t T61String_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_T61String;
diff --git a/skeletons/TeletexString.h b/skeletons/TeletexString.h
index 6f513581a31d0f419fff8e27b529d6960d161386..e92f7c2dcd1666b0550e4ef00dc7fc2df4ef629e 100644
--- a/skeletons/TeletexString.h
+++ b/skeletons/TeletexString.h
@@ -5,10 +5,9 @@
#ifndef _TeletexString_H_
#define _TeletexString_H_
-#include <constr_TYPE.h>
#include <OCTET_STRING.h>
-typedef OCTET_STRING_t TeletexString_t; /* Implemented in terms of OCTET STRING */
+typedef OCTET_STRING_t TeletexString_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_TeletexString;
diff --git a/skeletons/UTCTime.h b/skeletons/UTCTime.h
index b026deddb8a93b65678239d8a49bcc62ddbba8ea..65de7a3a46e2d5ccabffc20c8061756d9fcacf6c 100644
--- a/skeletons/UTCTime.h
+++ b/skeletons/UTCTime.h
@@ -5,10 +5,9 @@
#ifndef _UTCTime_H_
#define _UTCTime_H_
-#include <constr_TYPE.h>
#include <OCTET_STRING.h>
-typedef OCTET_STRING_t UTCTime_t; /* Implemented using OCTET STRING */
+typedef OCTET_STRING_t UTCTime_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_UTCTime;
diff --git a/skeletons/UTF8String.h b/skeletons/UTF8String.h
index 543d3196999c60b7ea6d17abfe6357984a827c94..bb58bbea5576ad7503c76ccdddbe2008c90a22a3 100644
--- a/skeletons/UTF8String.h
+++ b/skeletons/UTF8String.h
@@ -5,10 +5,9 @@
#ifndef _UTF8String_H_
#define _UTF8String_H_
-#include <constr_TYPE.h>
#include <OCTET_STRING.h>
-typedef OCTET_STRING_t UTF8String_t; /* Implemented in terms of OCTET STRING */
+typedef OCTET_STRING_t UTF8String_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_UTF8String;
diff --git a/skeletons/UniversalString.h b/skeletons/UniversalString.h
index 88875236f954e8f40e21d9a8f0757679eea1e1eb..fe74f0fd7e4234d6017278abd4a400775bf9fbf8 100644
--- a/skeletons/UniversalString.h
+++ b/skeletons/UniversalString.h
@@ -5,10 +5,9 @@
#ifndef _UniversalString_H_
#define _UniversalString_H_
-#include <constr_TYPE.h>
#include <OCTET_STRING.h>
-typedef OCTET_STRING_t UniversalString_t; /* Implemented in terms of OCTET STRING */
+typedef OCTET_STRING_t UniversalString_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_UniversalString;
diff --git a/skeletons/VideotexString.h b/skeletons/VideotexString.h
index 4dd7c8e7b78bda54a4b87075b900c67b6df279a0..6b60341f528dea7b3839f43c733f62a59bf1e492 100644
--- a/skeletons/VideotexString.h
+++ b/skeletons/VideotexString.h
@@ -5,10 +5,9 @@
#ifndef _VideotexString_H_
#define _VideotexString_H_
-#include <constr_TYPE.h>
#include <OCTET_STRING.h>
-typedef OCTET_STRING_t VideotexString_t; /* Implemented in terms of OCTET STRING */
+typedef OCTET_STRING_t VideotexString_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_VideotexString;
diff --git a/skeletons/VisibleString.h b/skeletons/VisibleString.h
index 3c1df420a5057074546adfa9ac5f840c78c67684..b90234c68e274a97f988af7bdb34980b1d157189 100644
--- a/skeletons/VisibleString.h
+++ b/skeletons/VisibleString.h
@@ -5,10 +5,9 @@
#ifndef _VisibleString_H_
#define _VisibleString_H_
-#include <constr_TYPE.h>
#include <OCTET_STRING.h>
-typedef OCTET_STRING_t VisibleString_t; /* Implemented in terms of OCTET STRING */
+typedef OCTET_STRING_t VisibleString_t; /* Implemented via OCTET STRING */
extern asn1_TYPE_descriptor_t asn1_DEF_VisibleString;
diff --git a/skeletons/ber_decoder.h b/skeletons/ber_decoder.h
index 4842adb539769eb2f72b9c5af5af761cdf24677c..3e1b84f388227c5f01ba769b17f229097d207e17 100644
--- a/skeletons/ber_decoder.h
+++ b/skeletons/ber_decoder.h
@@ -5,7 +5,7 @@
#ifndef _BER_DECODER_H_
#define _BER_DECODER_H_
-#include <constr_TYPE.h>
+#include <asn_application.h>
struct asn1_TYPE_descriptor_s; /* Forward declaration */
@@ -68,7 +68,7 @@ typedef ber_dec_rval_t (ber_type_decoder_f)(
* head->last_tag_form is non-zero.
*/
ber_dec_rval_t ber_check_tags(struct asn1_TYPE_descriptor_s *type_dsc,
- ber_dec_ctx_t *ctx, /* saved context */
+ ber_dec_ctx_t *opt_ctx, /* saved context */
void *ptr, size_t size,
int tag_mode, /* {-1,0,1}: IMPLICIT, no, EXPLICIT */
ber_tlv_len_t *last_length,
diff --git a/skeletons/constr_CHOICE.h b/skeletons/constr_CHOICE.h
index 35b951105af17b77911de99e1b78558982944e96..4e296413cdc798387e08b02febd54af25066c086 100644
--- a/skeletons/constr_CHOICE.h
+++ b/skeletons/constr_CHOICE.h
@@ -5,7 +5,7 @@
#ifndef _CONSTR_CHOICE_H_
#define _CONSTR_CHOICE_H_
-#include <constr_TYPE.h>
+#include <asn_application.h>
typedef struct asn1_CHOICE_specifics_s {
/*
diff --git a/skeletons/constr_SEQUENCE.h b/skeletons/constr_SEQUENCE.h
index 156db8c744cb8643baa8811ff9b07dbab06ebcd8..27903b13ab8f2595acdb90eb32a4034e605a8447 100644
--- a/skeletons/constr_SEQUENCE.h
+++ b/skeletons/constr_SEQUENCE.h
@@ -5,7 +5,7 @@
#ifndef _CONSTR_SEQUENCE_H_
#define _CONSTR_SEQUENCE_H_
-#include <constr_TYPE.h>
+#include <asn_application.h>
typedef struct asn1_SEQUENCE_specifics_s {
/*
diff --git a/skeletons/constr_SEQUENCE_OF.h b/skeletons/constr_SEQUENCE_OF.h
index ee117508c371f09cb7f266efeb74ab6dc9464ccd..f6b714914d0b7a8ea18531905335f7e491c74f8c 100644
--- a/skeletons/constr_SEQUENCE_OF.h
+++ b/skeletons/constr_SEQUENCE_OF.h
@@ -5,7 +5,7 @@
#ifndef _CONSTR_SEQUENCE_OF_H_
#define _CONSTR_SEQUENCE_OF_H_
-#include <constr_TYPE.h>
+#include <asn_application.h>
#include <constr_SET_OF.h> /* Implemented using SET OF */
/*
diff --git a/skeletons/constr_SET.h b/skeletons/constr_SET.h
index eaf7df0ac3d25cbb51b158ed98ac471ad32172b1..17fb613253c6780ad55b696d23da80ea2c3a27e5 100644
--- a/skeletons/constr_SET.h
+++ b/skeletons/constr_SET.h
@@ -5,7 +5,7 @@
#ifndef _CONSTR_SET_H_
#define _CONSTR_SET_H_
-#include <constr_TYPE.h>
+#include <asn_application.h>
typedef struct asn1_SET_specifics_s {
diff --git a/skeletons/constr_SET_OF.h b/skeletons/constr_SET_OF.h
index 1a1384daf9a3fd0aac894ed8fb8451913fd6487f..b013dd6f1c4f9573c623c9422127639f0f628d79 100644
--- a/skeletons/constr_SET_OF.h
+++ b/skeletons/constr_SET_OF.h
@@ -5,7 +5,7 @@
#ifndef _CONSTR_SET_OF_H_
#define _CONSTR_SET_OF_H_
-#include <constr_TYPE.h>
+#include <asn_application.h>
typedef struct asn1_SET_OF_specifics_s {
/*
diff --git a/skeletons/constr_TYPE.h b/skeletons/constr_TYPE.h
index 28e8e2cdde696260e7dbbf1e30d725107c0e6baf..c8982f9d267fb01563641cf51dbf0b3ebee79663 100644
--- a/skeletons/constr_TYPE.h
+++ b/skeletons/constr_TYPE.h
@@ -11,8 +11,6 @@
#ifndef _CONSTR_TYPE_H
#define _CONSTR_TYPE_H
-#include <asn_types.h> /* System-dependent types */
-
struct asn1_TYPE_descriptor_s; /* Forward declaration */
struct asn1_TYPE_member_s; /* Forward declaration */
diff --git a/skeletons/constraints.c b/skeletons/constraints.c
index d95e3cbd0846d300f826932c7fe4cec0d19082ab..9c348851c5321ba99615ba6ad8b20cbce21c3e46 100644
--- a/skeletons/constraints.c
+++ b/skeletons/constraints.c
@@ -1,6 +1,5 @@
#include <asn_internal.h>
#include <constraints.h>
-#include <constr_TYPE.h>
int
asn_generic_no_constraint(asn1_TYPE_descriptor_t *type_descriptor,
diff --git a/skeletons/der_encoder.c b/skeletons/der_encoder.c
index 4f1936f8e248dbecc46b3f714ee7da15d1da4868..3d5cc8594aaa08bbc9f43515ade6d38b479e10fd 100644
--- a/skeletons/der_encoder.c
+++ b/skeletons/der_encoder.c
@@ -3,7 +3,6 @@
* Redistribution and modifications are permitted subject to BSD license.
*/
#include <asn_internal.h>
-#include <constr_TYPE.h>
#include <assert.h>
#include <errno.h>
diff --git a/skeletons/der_encoder.h b/skeletons/der_encoder.h
index fe64bccf901d0d95ecb75752421fc76bda7a33e9..2acccaafbc86b1f10a7881771717300662ffbf6e 100644
--- a/skeletons/der_encoder.h
+++ b/skeletons/der_encoder.h
@@ -5,7 +5,7 @@
#ifndef _DER_ENCODER_H_
#define _DER_ENCODER_H_
-#include <constr_TYPE.h>
+#include <asn_application.h>
struct asn1_TYPE_descriptor_s; /* Forward declaration */
diff --git a/skeletons/file-dependencies b/skeletons/file-dependencies
index 25d10a0799c3f3df6c09cacfb6b71410c6b6befe..559d2725fee12228043511ce7c7ae930681da152 100644
--- a/skeletons/file-dependencies
+++ b/skeletons/file-dependencies
@@ -43,8 +43,9 @@ constr_SET.h constr_SET.c
constr_SET_OF.h constr_SET_OF.c asn_SET_OF.h
COMMON-FILES: # This is a special section
-asn_types.h
+asn_application.h
asn_internal.h
+asn_types.h
OCTET_STRING.h OCTET_STRING.c # This one is used too widely
ber_decoder.h ber_decoder.c
ber_tlv_length.h ber_tlv_length.c
diff --git a/skeletons/xer_encoder.c b/skeletons/xer_encoder.c
index e4581aaafe5450475751dca3764f45f34bb0064e..876980e17358f8d8178c1fcf751e3114da2d6f1b 100644
--- a/skeletons/xer_encoder.c
+++ b/skeletons/xer_encoder.c
@@ -3,7 +3,6 @@
* Redistribution and modifications are permitted subject to BSD license.
*/
#include <asn_internal.h>
-#include <constr_TYPE.h>
#include <stdio.h>
#include <assert.h>
#include <errno.h>
@@ -43,7 +42,7 @@ xer_encode(asn1_TYPE_descriptor_t *td, void *sptr,
}
/*
- * This is a helper function for xer_fprint, which directs all the incoming data
+ * This is a helper function for xer_fprint, which directs all incoming data
* into the provided file descriptor.
*/
static int
diff --git a/skeletons/xer_encoder.h b/skeletons/xer_encoder.h
index 43c192d39fe58c00370489cd427d657a5f8fe527..fbb7a8171705142a7efaaa03caf6b8e3fb3b1b87 100644
--- a/skeletons/xer_encoder.h
+++ b/skeletons/xer_encoder.h
@@ -5,7 +5,7 @@
#ifndef _XER_ENCODER_H_
#define _XER_ENCODER_H_
-#include <constr_TYPE.h>
+#include <asn_application.h>
struct asn1_TYPE_descriptor_s; /* Forward declaration */