of <symbol>PGoauthBearerRequest</symbol>, which should be filled in
          by the implementation:
 <synopsis>
-typedef struct _PGoauthBearerRequest
+typedef struct PGoauthBearerRequest
 {
     /* Hook inputs (constant across all calls) */
-    const char *const openid_configuration; /* OIDC discovery URL */
-    const char *const scope;                /* required scope(s), or NULL */
+    const char *openid_configuration; /* OIDC discovery URL */
+    const char *scope;                /* required scope(s), or NULL */
 
     /* Hook outputs */
 
     /* Callback implementing a custom asynchronous OAuth flow. */
     PostgresPollingStatusType (*async) (PGconn *conn,
-                                        struct _PGoauthBearerRequest *request,
+                                        struct PGoauthBearerRequest *request,
                                         SOCKTYPE *altsock);
 
     /* Callback to clean up custom allocations. */
-    void        (*cleanup) (PGconn *conn, struct _PGoauthBearerRequest *request);
+    void        (*cleanup) (PGconn *conn, struct PGoauthBearerRequest *request);
 
     char       *token;   /* acquired Bearer token */
     void       *user;    /* hook-defined allocated data */
 
 #define SOCKTYPE int
 #endif
 
-typedef struct _PGoauthBearerRequest
+typedef struct PGoauthBearerRequest
 {
        /* Hook inputs (constant across all calls) */
-       const char *const openid_configuration; /* OIDC discovery URI */
-       const char *const scope;        /* required scope(s), or NULL */
+       const char *openid_configuration;       /* OIDC discovery URI */
+       const char *scope;                      /* required scope(s), or NULL */
 
        /* Hook outputs */
 
         * request->token must be set by the hook.
         */
        PostgresPollingStatusType (*async) (PGconn *conn,
-                                                                               struct _PGoauthBearerRequest *request,
+                                                                               struct PGoauthBearerRequest *request,
                                                                                SOCKTYPE * altsock);
 
        /*
         * This is technically optional, but highly recommended, because there is
         * no other indication as to when it is safe to free the token.
         */
-       void            (*cleanup) (PGconn *conn, struct _PGoauthBearerRequest *request);
+       void            (*cleanup) (PGconn *conn, struct PGoauthBearerRequest *request);
 
        /*
         * The hook should set this to the Bearer token contents for the