diff --git a/skeletons/OBJECT_IDENTIFIER.c b/skeletons/OBJECT_IDENTIFIER.c
index b428acad..baf3e423 100644
--- a/skeletons/OBJECT_IDENTIFIER.c
+++ b/skeletons/OBJECT_IDENTIFIER.c
@@ -345,7 +345,7 @@ OBJECT_IDENTIFIER_get_arcs(OBJECT_IDENTIFIER_t *oid, void *arcs,
 /*
  * Save the single value as an object identifier arc.
  */
-inline int
+int
 OBJECT_IDENTIFIER_set_single_arc(uint8_t *arcbuf, void *arcval, unsigned int arcval_size, int prepared_order) {
 	/*
 	 * The following conditions must hold:
diff --git a/skeletons/asn_types.h b/skeletons/asn_types.h
index 4785f968..fb0f7eb9 100644
--- a/skeletons/asn_types.h
+++ b/skeletons/asn_types.h
@@ -14,7 +14,7 @@
 #include <sys/types.h>	/* For size_t */
 #include <stdarg.h>	/* For va_start */
 #include <stddef.h>	/* for offsetof and ptrdiff_t */
-#if __STDC_VERSION__ < 199901L
+#ifndef	WIN32
 #include <inttypes.h>	/* C99 Standard specifies this file, for uintXX_t */
 #else
 typedef	unsigned char		uint8_t;
diff --git a/skeletons/constr_CHOICE.c b/skeletons/constr_CHOICE.c
index 7bcf5c5f..23303f12 100644
--- a/skeletons/constr_CHOICE.c
+++ b/skeletons/constr_CHOICE.c
@@ -58,8 +58,8 @@
 /*
  * See the definitions.
  */
-static inline int _fetch_present_idx(const void *struct_ptr, int off, int size);
-static inline void _set_present_idx(void *sptr, int offset, int size, int pres);
+static int _fetch_present_idx(const void *struct_ptr, int off, int size);
+static void _set_present_idx(void *sptr, int offset, int size, int pres);
 
 /*
  * Tags are canonically sorted in the tag to member table.
@@ -593,7 +593,7 @@ CHOICE_free(asn1_TYPE_descriptor_t *td, void *ptr, int contents_only) {
  * is guaranteed to be aligned properly. ASN.1 compiler itself does not
  * produce packed code.
  */
-static inline int
+static int
 _fetch_present_idx(const void *struct_ptr, int pres_offset, int pres_size) {
 	const void *present_ptr;
 	int present;
@@ -613,7 +613,7 @@ _fetch_present_idx(const void *struct_ptr, int pres_offset, int pres_size) {
 	return present;
 }
 
-static inline void
+static void
 _set_present_idx(void *struct_ptr, int pres_offset, int pres_size, int present) {
 	void *present_ptr;
 	present_ptr = ((char *)struct_ptr) + pres_offset;