diff --git a/ChangeLog b/ChangeLog
index 58f02e92ef..1eb51586b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -103,15 +103,11 @@
 2018-04-18  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* conform/data/sys/un.h-data: Allow sun_ prefix.
-	* sysdeps/mach/include/lock-intern.h: Move to include/.
-	* sysdeps/mach/include/mach.h: Move to include/.
-	* sysdeps/mach/include/mach/mig_support.h: Move to include/mach/.
-	* sysdeps/mach/include/mach_error.h: Move to include/.
-	* include/lock-intern.h [!_ISOMAC]: Do not declare libc hidden
+	* sysdeps/mach/include/lock-intern.h: Do not declare libc hidden
 	prototypes.
-	* include/mach.h [!_ISOMAC]: Likewise.
-	* include/mach/mig_support.h [!_ISOMAC]: Likewise.
-	* include/mach_error.h [!_ISOMAC]: Likewise.
+	* sysdeps/mach/include/mach.h: Likewise.
+	* sysdeps/mach/include/mach/mig_support.h: Likewise.
+	* sysdeps/mach/include/mach_error.h: Likewise.
 
 2018-04-16  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
diff --git a/include/lock-intern.h b/sysdeps/mach/include/lock-intern.h
similarity index 100%
rename from include/lock-intern.h
rename to sysdeps/mach/include/lock-intern.h
diff --git a/include/mach.h b/sysdeps/mach/include/mach.h
similarity index 100%
rename from include/mach.h
rename to sysdeps/mach/include/mach.h
diff --git a/include/mach/mig_support.h b/sysdeps/mach/include/mach/mig_support.h
similarity index 100%
rename from include/mach/mig_support.h
rename to sysdeps/mach/include/mach/mig_support.h
diff --git a/include/mach_error.h b/sysdeps/mach/include/mach_error.h
similarity index 100%
rename from include/mach_error.h
rename to sysdeps/mach/include/mach_error.h