diff --git a/skeletons/ber_tlv_length.c b/skeletons/ber_tlv_length.c
index 7daaaef6898d0c53339224cb883352e65076e2b2..bde022a2f42f9acaad09cf3f71d61445e5f01cf6 100644
--- a/skeletons/ber_tlv_length.c
+++ b/skeletons/ber_tlv_length.c
@@ -3,7 +3,6 @@
  * Redistribution and modifications are permitted subject to BSD license.
  */
 #include <asn_internal.h>
-#include <constr_TYPE.h>
 #include <ber_tlv_length.h>
 #include <ber_tlv_tag.h>
 
@@ -117,7 +116,7 @@ ber_skip_length(int _is_constructed, void *ptr, size_t size) {
 	/* UNREACHABLE */
 }
 
-ssize_t
+size_t
 der_tlv_length_serialize(ber_tlv_len_t len, void *bufp, size_t size) {
 	size_t required_size;	/* Size of len encoding */
 	uint8_t *buf = (uint8_t *)bufp;
diff --git a/skeletons/ber_tlv_length.h b/skeletons/ber_tlv_length.h
index 7e5d5f8aaade9ffd2883eda95eba606e1f95bd3b..5222bbf48b63576e41dbe189dcd0329f5cf9eba7 100644
--- a/skeletons/ber_tlv_length.h
+++ b/skeletons/ber_tlv_length.h
@@ -31,10 +31,10 @@ ssize_t ber_skip_length(int _is_constructed, void *bufptr, size_t size);
 
 /*
  * This function serializes the length (L from TLV) in DER format.
- * It always return number of bytes necessary to represent the length,
+ * It always returns number of bytes necessary to represent the length,
  * it is a caller's responsibility to check the return value
  * against the supplied buffer's size.
  */
-ssize_t der_tlv_length_serialize(ber_tlv_len_t len, void *bufptr, size_t size);
+size_t der_tlv_length_serialize(ber_tlv_len_t len, void *bufptr, size_t size);
 
 #endif	/* _BER_TLV_LENGTH_H_ */
diff --git a/skeletons/ber_tlv_tag.c b/skeletons/ber_tlv_tag.c
index d66b78835cb0f39514baa91f6ee15865d1a5e6f6..43a2d1ad7d83868c035beea30e2323444242c8f5 100644
--- a/skeletons/ber_tlv_tag.c
+++ b/skeletons/ber_tlv_tag.c
@@ -3,7 +3,6 @@
  * Redistribution and modifications are permitted subject to BSD license.
  */
 #include <asn_internal.h>
-#include <constr_TYPE.h>
 #include <ber_tlv_tag.h>
 #include <errno.h>
 
@@ -100,7 +99,7 @@ ber_tlv_tag_string(ber_tlv_tag_t tag) {
 }
 
 
-ssize_t
+size_t
 ber_tlv_tag_serialize(ber_tlv_tag_t tag, void *bufp, size_t size) {
 	int tclass = BER_TAG_CLASS(tag);
 	ber_tlv_tag_t tval = BER_TAG_VALUE(tag);
diff --git a/skeletons/ber_tlv_tag.h b/skeletons/ber_tlv_tag.h
index 22152ffdcfed96ab706fb21fba5be9fedc7698d3..c02a6862dd6583121105859da676406682ebcb5d 100644
--- a/skeletons/ber_tlv_tag.h
+++ b/skeletons/ber_tlv_tag.h
@@ -43,10 +43,10 @@ ssize_t ber_fetch_tag(void *bufptr, size_t size, ber_tlv_tag_t *tag_r);
 
 /*
  * This function serializes the tag (T from TLV) in BER format.
- * It always return number of bytes necessary to represent the tag,
+ * It always returns number of bytes necessary to represent the tag,
  * it is a caller's responsibility to check the return value
  * against the supplied buffer's size.
  */
-ssize_t ber_tlv_tag_serialize(ber_tlv_tag_t tag, void *bufptr, size_t size);
+size_t ber_tlv_tag_serialize(ber_tlv_tag_t tag, void *bufptr, size_t size);
 
 #endif	/* _BER_TLV_TAG_H_ */