diff --git a/ChangeLog b/ChangeLog
index 9ff1949f8a..d616178156 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-03-13  Zack Weinberg  <zackw@panix.com>
+
+	* sysdeps/generic/inttypes.h, sysdeps/generic/stdint.h:
+	Move to stdlib.
+	* include/inttypes.h: Adjust to match.
+	* include/stdint.h: New wrapper.
+
 2019-03-13  Zack Weinberg  <zackw@panix.com>
 
 	* scripts/check-obsolete-constructs.py: New test script.
diff --git a/include/inttypes.h b/include/inttypes.h
index 33219e2a9f..3a583c6c07 100644
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -1,5 +1,5 @@
 #ifndef _INTTYPES_H
-#include_next <inttypes.h>
+#include <stdlib/inttypes.h>
 #ifndef _ISOMAC
 libc_hidden_proto (strtoumax)
 #endif
diff --git a/include/stdint.h b/include/stdint.h
new file mode 100644
index 0000000000..7f428741d7
--- /dev/null
+++ b/include/stdint.h
@@ -0,0 +1 @@
+#include <stdlib/stdint.h>
diff --git a/sysdeps/generic/inttypes.h b/stdlib/inttypes.h
similarity index 100%
rename from sysdeps/generic/inttypes.h
rename to stdlib/inttypes.h
diff --git a/sysdeps/generic/stdint.h b/stdlib/stdint.h
similarity index 100%
rename from sysdeps/generic/stdint.h
rename to stdlib/stdint.h