diff --git a/docs/vulkan.dox b/docs/vulkan.dox
index a5400032..988c2b84 100644
--- a/docs/vulkan.dox
+++ b/docs/vulkan.dox
@@ -127,7 +127,7 @@ To query the instance extensions required, call @ref
 glfwGetRequiredInstanceExtensions.
 
 @code
-unsigned int count;
+uint32_t count;
 const char** extensions = glfwGetRequiredInstanceExtensions(&count);
 @endcode
 
diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h
index 809e2153..ebd7eb26 100644
--- a/include/GLFW/glfw3.h
+++ b/include/GLFW/glfw3.h
@@ -4029,7 +4029,7 @@ GLFWAPI int glfwVulkanSupported(void);
  *
  *  @ingroup vulkan
  */
-GLFWAPI const char** glfwGetRequiredInstanceExtensions(unsigned int* count);
+GLFWAPI const char** glfwGetRequiredInstanceExtensions(uint32_t* count);
 
 #if defined(VK_VERSION_1_0)
 
diff --git a/src/cocoa_window.m b/src/cocoa_window.m
index 152bae69..6f514392 100644
--- a/src/cocoa_window.m
+++ b/src/cocoa_window.m
@@ -1577,7 +1577,7 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
     return _glfw.ns.clipboardString;
 }
 
-char** _glfwPlatformGetRequiredInstanceExtensions(unsigned int* count)
+char** _glfwPlatformGetRequiredInstanceExtensions(uint32_t* count)
 {
     *count = 0;
     return NULL;
@@ -1585,7 +1585,7 @@ char** _glfwPlatformGetRequiredInstanceExtensions(unsigned int* count)
 
 int _glfwPlatformGetPhysicalDevicePresentationSupport(VkInstance instance,
                                                       VkPhysicalDevice device,
-                                                      unsigned int queuefamily)
+                                                      uint32_t queuefamily)
 {
     return GLFW_FALSE;
 }
diff --git a/src/internal.h b/src/internal.h
index fc33b0de..ae66c0be 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -92,8 +92,8 @@ typedef const GLubyte* (APIENTRY * PFNGLGETSTRINGIPROC)(GLenum,GLuint);
 typedef void* VkInstance;
 typedef void* VkPhysicalDevice;
 typedef uint64_t VkSurfaceKHR;
-typedef unsigned int VkFlags;
-typedef unsigned int VkBool32;
+typedef uint32_t VkFlags;
+typedef uint32_t VkBool32;
 
 typedef enum VkStructureType
 {
@@ -138,12 +138,12 @@ typedef struct VkAllocationCallbacks VkAllocationCallbacks;
 typedef struct VkExtensionProperties
 {
     char            extensionName[256];
-    unsigned int    specVersion;
+    uint32_t        specVersion;
 } VkExtensionProperties;
 
 typedef void (APIENTRY * PFN_vkVoidFunction)(void);
 typedef PFN_vkVoidFunction (APIENTRY * PFN_vkGetInstanceProcAddr)(VkInstance,const char*);
-typedef VkResult (APIENTRY * PFN_vkEnumerateInstanceExtensionProperties)(const char*,unsigned int*,VkExtensionProperties*);
+typedef VkResult (APIENTRY * PFN_vkEnumerateInstanceExtensionProperties)(const char*,uint32_t*,VkExtensionProperties*);
 
 #define vkEnumerateInstanceExtensionProperties _glfw.vk.EnumerateInstanceExtensionProperties
 #define vkGetInstanceProcAddr _glfw.vk.GetInstanceProcAddr
@@ -437,7 +437,7 @@ struct _GLFWlibrary
         GLFWbool        available;
         void*           handle;
         char**          extensions;
-        unsigned int    extensionCount;
+        uint32_t        extensionCount;
         PFN_vkEnumerateInstanceExtensionProperties EnumerateInstanceExtensionProperties;
         PFN_vkGetInstanceProcAddr GetInstanceProcAddr;
         GLFWbool        KHR_surface;
@@ -799,11 +799,11 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor);
 
 /*! @ingroup platform
  */
-char** _glfwPlatformGetRequiredInstanceExtensions(unsigned int* count);
+char** _glfwPlatformGetRequiredInstanceExtensions(uint32_t* count);
 
 /*! @ingroup platform
  */
-int _glfwPlatformGetPhysicalDevicePresentationSupport(VkInstance instance, VkPhysicalDevice device, unsigned int queuefamily);
+int _glfwPlatformGetPhysicalDevicePresentationSupport(VkInstance instance, VkPhysicalDevice device, uint32_t queuefamily);
 
 /*! @ingroup platform
  */
diff --git a/src/mir_window.c b/src/mir_window.c
index 8e6ceb89..6b6f4467 100644
--- a/src/mir_window.c
+++ b/src/mir_window.c
@@ -754,7 +754,7 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
     return NULL;
 }
 
-char** _glfwPlatformGetRequiredInstanceExtensions(unsigned int* count)
+char** _glfwPlatformGetRequiredInstanceExtensions(uint32_t* count)
 {
     char** extensions;
 
@@ -773,7 +773,7 @@ char** _glfwPlatformGetRequiredInstanceExtensions(unsigned int* count)
 
 int _glfwPlatformGetPhysicalDevicePresentationSupport(VkInstance instance,
                                                       VkPhysicalDevice device,
-                                                      unsigned int queuefamily)
+                                                      uint32_t queuefamily)
 {
     PFN_vkGetPhysicalDeviceMirPresentationSupportKHR vkGetPhysicalDeviceMirPresentationSupportKHR =
         (PFN_vkGetPhysicalDeviceMirPresentationSupportKHR)
diff --git a/src/vulkan.c b/src/vulkan.c
index b4712127..fb62a18f 100644
--- a/src/vulkan.c
+++ b/src/vulkan.c
@@ -40,7 +40,7 @@ void _glfwInitVulkan(void)
 {
     VkResult err;
     VkExtensionProperties* ep;
-    unsigned int i, count;
+    uint32_t i, count;
 #if defined(_GLFW_WIN32)
     const char* name = "vulkan-1.dll";
 #else
@@ -120,7 +120,7 @@ void _glfwInitVulkan(void)
 
 void _glfwTerminateVulkan(void)
 {
-    unsigned int i;
+    uint32_t i;
 
     for (i = 0;  i < _glfw.vk.extensionCount;  i++)
         free(_glfw.vk.extensions[i]);
@@ -196,7 +196,7 @@ GLFWAPI int glfwVulkanSupported(void)
     return _glfw.vk.available;
 }
 
-GLFWAPI const char** glfwGetRequiredInstanceExtensions(unsigned int* count)
+GLFWAPI const char** glfwGetRequiredInstanceExtensions(uint32_t* count)
 {
     *count = 0;
 
diff --git a/src/win32_window.c b/src/win32_window.c
index 5c9f8738..2ffa70a4 100644
--- a/src/win32_window.c
+++ b/src/win32_window.c
@@ -1601,7 +1601,7 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
     return _glfw.win32.clipboardString;
 }
 
-char** _glfwPlatformGetRequiredInstanceExtensions(unsigned int* count)
+char** _glfwPlatformGetRequiredInstanceExtensions(uint32_t* count)
 {
     char** extensions;
 
@@ -1620,7 +1620,7 @@ char** _glfwPlatformGetRequiredInstanceExtensions(unsigned int* count)
 
 int _glfwPlatformGetPhysicalDevicePresentationSupport(VkInstance instance,
                                                       VkPhysicalDevice device,
-                                                      unsigned int queuefamily)
+                                                      uint32_t queuefamily)
 {
     PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR vkGetPhysicalDeviceWin32PresentationSupportKHR =
         (PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR)
diff --git a/src/wl_window.c b/src/wl_window.c
index 0deef6d5..6a86f9e9 100644
--- a/src/wl_window.c
+++ b/src/wl_window.c
@@ -847,7 +847,7 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
     return NULL;
 }
 
-char** _glfwPlatformGetRequiredInstanceExtensions(unsigned int* count)
+char** _glfwPlatformGetRequiredInstanceExtensions(uint32_t* count)
 {
     char** extensions;
 
@@ -866,7 +866,7 @@ char** _glfwPlatformGetRequiredInstanceExtensions(unsigned int* count)
 
 int _glfwPlatformGetPhysicalDevicePresentationSupport(VkInstance instance,
                                                       VkPhysicalDevice device,
-                                                      unsigned int queuefamily)
+                                                      uint32_t queuefamily)
 {
     PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR vkGetPhysicalDeviceWaylandPresentationSupportKHR =
         (PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR)
diff --git a/src/x11_window.c b/src/x11_window.c
index 9e004010..2250ec2e 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -2273,7 +2273,7 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
     return _glfw.x11.clipboardString;
 }
 
-char** _glfwPlatformGetRequiredInstanceExtensions(unsigned int* count)
+char** _glfwPlatformGetRequiredInstanceExtensions(uint32_t* count)
 {
     char** extensions;
 
@@ -2299,7 +2299,7 @@ char** _glfwPlatformGetRequiredInstanceExtensions(unsigned int* count)
 
 int _glfwPlatformGetPhysicalDevicePresentationSupport(VkInstance instance,
                                                       VkPhysicalDevice device,
-                                                      unsigned int queuefamily)
+                                                      uint32_t queuefamily)
 {
     VisualID visualID = XVisualIDFromVisual(DefaultVisual(_glfw.x11.display,
                                                           _glfw.x11.screen));