diff --git a/include/wininet.h b/include/wininet.h
index 9a8da6f1ee..ac15d54dbe 100644
--- a/include/wininet.h
+++ b/include/wininet.h
@@ -801,31 +801,56 @@ typedef struct {
 DECL_WINELIB_TYPE_AW(GOPHER_UNKNOWN_ATTRIBUTE_TYPE)
 DECL_WINELIB_TYPE_AW(LPGOPHER_UNKNOWN_ATTRIBUTE_TYPE)
 
-/*
 typedef struct {
     DWORD CategoryId;   
     DWORD AttributeId;  
     union {
-        GOPHER_ADMIN_ATTRIBUTE_TYPE Admin;
+        GOPHER_ADMIN_ATTRIBUTE_TYPEA Admin;
         GOPHER_MOD_DATE_ATTRIBUTE_TYPE ModDate;
         GOPHER_TTL_ATTRIBUTE_TYPE Ttl;
         GOPHER_SCORE_ATTRIBUTE_TYPE Score;
         GOPHER_SCORE_RANGE_ATTRIBUTE_TYPE ScoreRange;
-        GOPHER_SITE_ATTRIBUTE_TYPE Site;
-        GOPHER_ORGANIZATION_ATTRIBUTE_TYPE Organization;
-        GOPHER_LOCATION_ATTRIBUTE_TYPE Location;
+        GOPHER_SITE_ATTRIBUTE_TYPEA Site;
+        GOPHER_ORGANIZATION_ATTRIBUTE_TYPEA Organization;
+        GOPHER_LOCATION_ATTRIBUTE_TYPEA Location;
         GOPHER_GEOGRAPHICAL_LOCATION_ATTRIBUTE_TYPE GeographicalLocation;
         GOPHER_TIMEZONE_ATTRIBUTE_TYPE TimeZone;
-        GOPHER_PROVIDER_ATTRIBUTE_TYPE Provider;
-        GOPHER_VERSION_ATTRIBUTE_TYPE Version;
-        GOPHER_ABSTRACT_ATTRIBUTE_TYPE Abstract;
-        GOPHER_VIEW_ATTRIBUTE_TYPE View;
+        GOPHER_PROVIDER_ATTRIBUTE_TYPEA Provider;
+        GOPHER_VERSION_ATTRIBUTE_TYPEA Version;
+        GOPHER_ABSTRACT_ATTRIBUTE_TYPEA Abstract;
+        GOPHER_VIEW_ATTRIBUTE_TYPEA View;
         GOPHER_VERONICA_ATTRIBUTE_TYPE Veronica;
-        GOPHER_ASK_ATTRIBUTE_TYPE Ask;
-        GOPHER_UNKNOWN_ATTRIBUTE_TYPE Unknown;
+        GOPHER_ASK_ATTRIBUTE_TYPEA Ask;
+        GOPHER_UNKNOWN_ATTRIBUTE_TYPEA Unknown;
     } AttributeType;
-} GOPHER_ATTRIBUTE_TYPE,* LPGOPHER_ATTRIBUTE_TYPE;
-*/
+} GOPHER_ATTRIBUTE_TYPEA, *LPGOPHER_ATTRIBUTE_TYPEA;
+
+typedef struct {
+    DWORD CategoryId;   
+    DWORD AttributeId;  
+    union {
+        GOPHER_ADMIN_ATTRIBUTE_TYPEW Admin;
+        GOPHER_MOD_DATE_ATTRIBUTE_TYPE ModDate;
+        GOPHER_TTL_ATTRIBUTE_TYPE Ttl;
+        GOPHER_SCORE_ATTRIBUTE_TYPE Score;
+        GOPHER_SCORE_RANGE_ATTRIBUTE_TYPE ScoreRange;
+        GOPHER_SITE_ATTRIBUTE_TYPEW Site;
+        GOPHER_ORGANIZATION_ATTRIBUTE_TYPEW Organization;
+        GOPHER_LOCATION_ATTRIBUTE_TYPEW Location;
+        GOPHER_GEOGRAPHICAL_LOCATION_ATTRIBUTE_TYPE GeographicalLocation;
+        GOPHER_TIMEZONE_ATTRIBUTE_TYPE TimeZone;
+        GOPHER_PROVIDER_ATTRIBUTE_TYPEW Provider;
+        GOPHER_VERSION_ATTRIBUTE_TYPEW Version;
+        GOPHER_ABSTRACT_ATTRIBUTE_TYPEW Abstract;
+        GOPHER_VIEW_ATTRIBUTE_TYPEW View;
+        GOPHER_VERONICA_ATTRIBUTE_TYPE Veronica;
+        GOPHER_ASK_ATTRIBUTE_TYPEW Ask;
+        GOPHER_UNKNOWN_ATTRIBUTE_TYPEW Unknown;
+    } AttributeType;
+} GOPHER_ATTRIBUTE_TYPEW, *LPGOPHER_ATTRIBUTE_TYPEW;
+
+DECL_WINELIB_TYPE_AW(GOPHER_ATTRIBUTE_TYPE)
+DECL_WINELIB_TYPE_AW(LPGOPHER_ATTRIBUTE_TYPE)
 
 #define MAX_GOPHER_CATEGORY_NAME    128     
 #define MAX_GOPHER_ATTRIBUTE_NAME   128     
@@ -901,15 +926,17 @@ INTERNETAPI HINTERNET WINAPI GopherOpenFileA(HINTERNET ,LPCSTR ,LPCSTR lpszView
 INTERNETAPI HINTERNET WINAPI GopherOpenFileW(HINTERNET ,LPCWSTR ,LPCWSTR lpszView ,DWORD ,DWORD);
 #define GopherOpenFile  WINELIB_NAME_AW(GopherOpenFile)
 
-/*
-typedef BOOL CALLBACK (*GOPHER_ATTRIBUTE_ENUMERATOR)(LPGOPHER_ATTRIBUTE_TYPE ,DWORD);
+typedef BOOL CALLBACK (*GOPHER_ATTRIBUTE_ENUMERATORA)(LPGOPHER_ATTRIBUTE_TYPEA ,DWORD);
+typedef BOOL CALLBACK (*GOPHER_ATTRIBUTE_ENUMERATORW)(LPGOPHER_ATTRIBUTE_TYPEW ,DWORD);
+
+DECL_WINELIB_TYPE_AW(GOPHER_ATTRIBUTE_ENUMERATOR)
 
 BOOLAPI GopherGetAttributeA(HINTERNET ,LPCSTR ,LPCSTR lpszAttributeName ,LPBYTE ,
-	DWORD ,LPDWORD ,GOPHER_ATTRIBUTE_ENUMERATOR lpfnEnumerator ,DWORD);
+	DWORD ,LPDWORD ,GOPHER_ATTRIBUTE_ENUMERATORA lpfnEnumerator ,DWORD);
 BOOLAPI GopherGetAttributeW(HINTERNET ,LPCWSTR ,LPCWSTR lpszAttributeName ,LPBYTE ,
-	DWORD ,LPDWORD ,GOPHER_ATTRIBUTE_ENUMERATOR lpfnEnumerator ,DWORD);
+	DWORD ,LPDWORD ,GOPHER_ATTRIBUTE_ENUMERATORW lpfnEnumerator ,DWORD);
 #define GopherGetAttribute  WINELIB_NAME_AW(GopherGetAttribute)
-*/
+
 #define HTTP_MAJOR_VERSION      1
 #define HTTP_MINOR_VERSION      0
 #define HTTP_VERSION            TEXT("HTTP/1.0")