diff --git a/ChangeLog b/ChangeLog
index 93c82fef99..13b9640935 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,6 +54,12 @@
 	(struct statvfs64): Likewise.
 	* sysdeps/mach/hurd/bits/statfs.h (struct statfs, struct statfs64):
 	Likewise.
+	* bits/in.h [!__USE_MISC]: Do not define struct ip_opts.
+	* conform/data/netinet/in.h-data: Allow sin_ and sin6_ prefix.
+	* sysdeps/gnu/bits/msq.h (struct msqid_ds): Use __wait_queue struct
+	instead of wait_queue.
+	* sysdeps/gnu/bits/shm.h (struct shmid_ds): Use __vm_area_struct
+	instead of vm_area_struct.
 
 2018-04-18  Joseph Myers  <joseph@codesourcery.com>
 
diff --git a/bits/in.h b/bits/in.h
index aa683a59fb..1e854fddfb 100644
--- a/bits/in.h
+++ b/bits/in.h
@@ -44,6 +44,7 @@
 #define IP_ADD_MEMBERSHIP 12	/* ip_mreq; add an IP group membership */
 #define IP_DROP_MEMBERSHIP 13	/* ip_mreq; drop an IP group membership */
 
+#ifdef __USE_MISC
 /* Structure used to describe IP options for IP_OPTIONS and IP_RETOPTS.
    The `ip_dst' field is used for the first-hop gateway when using a
    source route (this gets put into the header proper).  */
@@ -52,6 +53,7 @@ struct ip_opts
     struct in_addr ip_dst;	/* First hop; zero without source route.  */
     char ip_opts[40];		/* Actually variable in size.  */
   };
+#endif
 
 /* Socket-level values for IPv6.  */
 #define SOL_IPV6		41
diff --git a/conform/data/netinet/in.h-data b/conform/data/netinet/in.h-data
index ac26a74e9e..ccc74db608 100644
--- a/conform/data/netinet/in.h-data
+++ b/conform/data/netinet/in.h-data
@@ -92,4 +92,6 @@ allow IPV6_*
 allow IPPORT_*
 allow IPPROTO_*
 allow SOCK_*
+allow sin_*
+allow sin6_*
 #endif
diff --git a/sysdeps/gnu/bits/msq.h b/sysdeps/gnu/bits/msq.h
index d38b984fa5..0a4a67d5e9 100644
--- a/sysdeps/gnu/bits/msq.h
+++ b/sysdeps/gnu/bits/msq.h
@@ -43,8 +43,8 @@ struct msqid_ds
   __time_t msg_stime;		/* time of last msgsnd command */
   __time_t msg_rtime;		/* time of last msgrcv command */
   __time_t msg_ctime;		/* time of last change */
-  struct wait_queue *__wwait;	/* ??? */
-  struct wait_queue *__rwait;	/* ??? */
+  struct __wait_queue *__wwait;	/* ??? */
+  struct __wait_queue *__rwait;	/* ??? */
   unsigned short int __msg_cbytes;/* current number of bytes on queue */
   msgqnum_t msg_qnum;		/* number of messages currently on queue */
   msglen_t msg_qbytes;		/* max number of bytes allowed on queue */
diff --git a/sysdeps/gnu/bits/shm.h b/sysdeps/gnu/bits/shm.h
index d9944f8c08..eef6729188 100644
--- a/sysdeps/gnu/bits/shm.h
+++ b/sysdeps/gnu/bits/shm.h
@@ -58,7 +58,7 @@ struct shmid_ds
     shmatt_t shm_nattch;		/* number of current attaches */
     unsigned short int __shm_npages;	/* size of segment (pages) */
     unsigned long int *__shm_pages;	/* array of ptrs to frames -> SHMMAX */
-    struct vm_area_struct *__attaches;	/* descriptors for attaches */
+    struct __vm_area_struct *__attaches;	/* descriptors for attaches */
   };
 
 #ifdef __USE_MISC