diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index de0ba04dd..1129ea38f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-23  Corinna Vinschen  <corinna@vinschen.de>
+
+	* userinfo.h (struct fetch_full_grp_t): Define only when building
+	Cygwin itself.
+	(struct fetch_user_arg_t): Ditto.
+
 2015-02-23  Corinna Vinschen  <corinna@vinschen.de>
 
 	* autoload.cc (LsaLookupSids): Import.
diff --git a/winsup/cygwin/userinfo.h b/winsup/cygwin/userinfo.h
index db557a77e..ba957273e 100644
--- a/winsup/cygwin/userinfo.h
+++ b/winsup/cygwin/userinfo.h
@@ -17,6 +17,8 @@ enum fetch_user_arg_type_t {
   FULL_grp_arg,
 };
 
+#ifdef __INSIDE_CYGWIN__
+
 struct fetch_full_grp_t {
   cygpsid sid;
   PUNICODE_STRING name;
@@ -36,3 +38,5 @@ struct fetch_user_arg_t
   /* Only used in fetch_account_from_file/line. */
   size_t len;
 };
+
+#endif