diff --git a/lib/asn1/der.h b/lib/asn1/der.h
index 84be00c17..f73234864 100644
--- a/lib/asn1/der.h
+++ b/lib/asn1/der.h
@@ -36,7 +36,7 @@
 #ifndef __DER_H__
 #define __DER_H__
 
-#include <roken.h>
+#include <stdint.h>
 
 typedef enum {
     ASN1_C_UNIV = 0,
diff --git a/lib/asn1/gen.c b/lib/asn1/gen.c
index f96d28940..5e64b8d0e 100644
--- a/lib/asn1/gen.c
+++ b/lib/asn1/gen.c
@@ -270,9 +270,7 @@ init_generate (const char *filename, const char *base)
              "#endif\n"
              "#include <stdio.h>\n"
 	     "#include <stdlib.h>\n"
-             "#ifdef HAVE_STDINT_H\n"
 	     "#include <stdint.h>\n"
-             "#endif\n"
 	     "#include <time.h>\n"
 	     "#include <string.h>\n"
 	     "#include <errno.h>\n"
@@ -375,9 +373,7 @@ generate_header_of_codefile(const char *name)
              "#define  ASN1_LIB\n\n"
 	     "#include <stdio.h>\n"
 	     "#include <stdlib.h>\n"
-             "#ifdef HAVE_STDINT_H\n"
-             "#include <stdint.h>\n"
-             "#endif\n"
+	     "#include <stdint.h>\n"
 	     "#include <time.h>\n"
 	     "#include <string.h>\n"
 	     "#include <errno.h>\n"
diff --git a/lib/asn1/heim_asn1.h b/lib/asn1/heim_asn1.h
index 50bdfefea..23041251b 100644
--- a/lib/asn1/heim_asn1.h
+++ b/lib/asn1/heim_asn1.h
@@ -34,7 +34,7 @@
 #ifndef __HEIM_ANY_H__
 #define __HEIM_ANY_H__ 1
 
-#include <roken.h>
+#include <stdint.h>
 
 int	encode_heim_any(unsigned char *, size_t, const heim_any *, size_t *);
 int	decode_heim_any(const unsigned char *, size_t, heim_any *, size_t *);
diff --git a/lib/asn1/symbol.h b/lib/asn1/symbol.h
index a40547f28..a00331617 100644
--- a/lib/asn1/symbol.h
+++ b/lib/asn1/symbol.h
@@ -36,8 +36,8 @@
 #ifndef _SYMBOL_H
 #define _SYMBOL_H
 
-#include <roken.h>
 #include "asn1_queue.h"
+#include <stdint.h>
 
 enum typetype {
     TBitString,
diff --git a/lib/roken/strtoll.c b/lib/roken/strtoll.c
index c8c141d77..89e1a77d3 100644
--- a/lib/roken/strtoll.c
+++ b/lib/roken/strtoll.c
@@ -44,6 +44,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <stdlib.h>
+#include <stdint.h>
 
 /*
  * Convert a string to a long long integer.
diff --git a/lib/roken/strtoull.c b/lib/roken/strtoull.c
index ee9201f97..b954a0706 100644
--- a/lib/roken/strtoull.c
+++ b/lib/roken/strtoull.c
@@ -44,6 +44,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <stdlib.h>
+#include <stdint.h>
 
 /*
  * Convert a string to an unsigned long long integer.