diff --git a/include/alltypes.h.in b/include/alltypes.h.in
index 8335899661482ad32676ce6a1a936711c60d2f3e..f3481fc23b0b4f4dc6255b21400da8d21d7d28db 100644
--- a/include/alltypes.h.in
+++ b/include/alltypes.h.in
@@ -3,6 +3,7 @@ TYPEDEF unsigned _Addr uintptr_t;
 TYPEDEF _Addr ptrdiff_t;
 TYPEDEF _Addr ssize_t;
 TYPEDEF _Addr intptr_t;
+TYPEDEF _Addr regoff_t;
 
 TYPEDEF signed char     int8_t;
 TYPEDEF short           int16_t;
diff --git a/include/regex.h b/include/regex.h
index ea9b894bfb8c923eaf95f57d0a868a815a19d46d..dce217718f8c825acec8d7dad38806db2064b4ec 100644
--- a/include/regex.h
+++ b/include/regex.h
@@ -7,13 +7,12 @@ extern "C" {
 
 #include <features.h>
 
+#define __NEED_regoff_t
 #define __NEED_size_t
 
 #include <bits/alltypes.h>
 
-typedef long regoff_t;
-
-typedef struct {
+typedef struct re_pattern_buffer {
 	size_t re_nsub;
 	void *__opaque, *__padding[4];
 	size_t __nsub2;