diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index d478254fc..b44c14998 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-24  Corinna Vinschen  <corinna@vinschen.de>
+
+	* include/lmaccess.h (struct _USER_INFO_4): Define.
+	(struct _USER_INFO_23): Define.
+	(struct _GROUP_INFO_3): Define.
+
 2008-07-14  Corinna Vinschen  <corinna@vinschen.de>
 
 	* include/iphlpapi.h (GetExtendedTcpTable): Add prototype.
diff --git a/winsup/w32api/include/lmaccess.h b/winsup/w32api/include/lmaccess.h
index 044a7a607..5c14db88c 100644
--- a/winsup/w32api/include/lmaccess.h
+++ b/winsup/w32api/include/lmaccess.h
@@ -269,6 +269,37 @@ typedef struct _USER_INFO_3 {
 	LPWSTR usri3_home_dir_drive;
 	DWORD usri3_password_expired;
 }USER_INFO_3,*PUSER_INFO_3,*LPUSER_INFO_3;
+typedef struct _USER_INFO_4 {
+	LPWSTR usri4_name;
+	LPWSTR usri4_password;
+	DWORD usri4_password_age;
+	DWORD usri4_priv;
+	LPWSTR usri4_home_dir;
+	LPWSTR usri4_comment;
+	DWORD usri4_flags;
+	LPWSTR usri4_script_path;
+	DWORD usri4_auth_flags;
+	LPWSTR usri4_full_name;
+	LPWSTR usri4_usr_comment;
+	LPWSTR usri4_parms;
+	LPWSTR usri4_workstations;
+	DWORD usri4_last_logon;
+	DWORD usri4_last_logoff;
+	DWORD usri4_acct_expires;
+	DWORD usri4_max_storage;
+	DWORD usri4_units_per_week;
+	PBYTE usri4_logon_hours;
+	DWORD usri4_bad_pw_count;
+	DWORD usri4_num_logons;
+	LPWSTR usri4_logon_server;
+	DWORD usri4_country_code;
+	DWORD usri4_code_page;
+	PSID usri4_user_sid;
+	DWORD usri4_primary_group_id;
+	LPWSTR usri4_profile;
+	LPWSTR usri4_home_dir_drive;
+	DWORD usri4_password_expired;
+}USER_INFO_4,*PUSER_INFO_4,*LPUSER_INFO_4;
 typedef struct _USER_INFO_10 {
 	LPWSTR usri10_name;
 	LPWSTR usri10_comment;
@@ -332,7 +363,14 @@ typedef struct _USER_INFO_22 {
 	LPWSTR usri22_logon_server;
 	DWORD usri22_country_code;
 	DWORD usri22_code_page;
-	}USER_INFO_22,*PUSER_INFO_22,*LPUSER_INFO_22;
+}USER_INFO_22,*PUSER_INFO_22,*LPUSER_INFO_22;
+typedef struct _USER_INFO_23 {
+	LPWSTR usri23_name;
+	LPWSTR usri23_full_name;
+	LPWSTR usri23_comment;
+	DWORD usri23_flags;
+	PSID usri23_user_sid;
+}USER_INFO_23,*PUSER_INFO_23,*LPUSER_INFO_23;
 typedef struct _USER_INFO_1003 {
 	LPWSTR usri1003_password;
 } USER_INFO_1003,*PUSER_INFO_1003,*LPUSER_INFO_1003;
@@ -448,6 +486,12 @@ typedef struct _GROUP_INFO_2 {
 	DWORD grpi2_group_id;
 	DWORD grpi2_attributes;
 }GROUP_INFO_2,*PGROUP_INFO_2;
+typedef struct _GROUP_INFO_3 {
+	LPWSTR grpi3_name;
+	LPWSTR grpi3_comment;
+	PSID grpi3_group_sid;
+	DWORD grpi3_attributes;
+}GROUP_INFO_3,*PGROUP_INFO_3;
 typedef struct _GROUP_INFO_1002 {
 	LPWSTR grpi1002_comment;
 } GROUP_INFO_1002,*PGROUP_INFO_1002,*LPGROUP_INFO_1002;