diff --git a/configure.ac b/configure.ac
index 0a304e9a40f006ed6b19662532ad7b8e00a2eb7d..ce5dd50e887f1a741f32942f679d178b3cc42a3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -229,7 +229,7 @@ LSH_GCC_ATTRIBUTES
 
 # According to Simon Josefsson, looking for uint32_t and friends in
 # sys/types.h is needed on some systems, in particular cygwin.
-AX_CREATE_STDINT_H([nettle-types.h], [sys/types.h])
+AX_CREATE_STDINT_H([nettle-stdint.h], [sys/types.h])
 
 # Checks for libraries
 AC_CHECK_LIB(gmp, __gmpz_getlimbn,,
diff --git a/nettle-types.h b/nettle-types.h
new file mode 100644
index 0000000000000000000000000000000000000000..a9d854ff74ad7c1ae83658d6da7bfc7591ecd22f
--- /dev/null
+++ b/nettle-types.h
@@ -0,0 +1,41 @@
+/* nettle-types.h */
+
+/* nettle, low-level cryptographics library
+ *
+ * Copyright (C) 2005 Niels Möller
+ *  
+ * The nettle library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ * 
+ * The nettle library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ * License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ */
+
+#ifndef NETTLE_TYPES_H
+#define NETTLE_TYPES_H
+
+#include "nettle-stdint.h"
+
+/* Uses a void * for cipher contexts.
+
+   For block ciphers it would make sense with a const void * for the
+   context, but we use the same typedef for stream ciphers where the
+   internal state changes during the encryption. */
+
+typedef void (*nettle_crypt_func)(void *ctx,
+	      unsigned length, uint8_t *dst,
+	      const uint8_t *src);
+
+/* FIXME: Move more of the typedefs to this file? */
+
+#endif /* NETTLE_TYPES_H */
+