diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 697dc85a0..a9c50467e 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,22 @@
+2015-07-28  Sebastian Huber  <sebastian.huber@embedded-brains.de>
+
+	libc/sys/rtems/machine/_types.h: Move to ...
+	libc/sys/rtems/include/machine/_types.h: ... here.
+	libc/sys/rtems/machine/limits.h: Move to ...
+	libc/sys/rtems/include/machine/limits.h: ... here.
+	libc/sys/rtems/machine/param.h: Move to ...
+	libc/sys/rtems/include/machine/param.h: ... here.
+	libc/sys/rtems/sys/cpuset.h: Move to ...
+	libc/sys/rtems/include/sys/cpuset.h: ... here.
+	libc/sys/rtems/sys/dirent.h: Move to ...
+	libc/sys/rtems/include/sys/dirent.h: ... here.
+	libc/sys/rtems/sys/param.h: Move to ...
+	libc/sys/rtems/include/sys/param.h: ... here.
+	libc/sys/rtems/sys/syslimits.h: Move to ...
+	libc/sys/rtems/include/sys/syslimits.h: ... here.
+	libc/sys/rtems/sys/utime.h: Move to ...
+	libc/sys/rtems/include/sys/utime.h: ... here.
+
 2015-07-28  Sebastian Huber  <sebastian.huber@embedded-brains.de>
 
 	* libc/sys/rtems/include/sys/lock.h: New.
diff --git a/newlib/libc/sys/rtems/machine/_types.h b/newlib/libc/sys/rtems/include/machine/_types.h
similarity index 100%
rename from newlib/libc/sys/rtems/machine/_types.h
rename to newlib/libc/sys/rtems/include/machine/_types.h
diff --git a/newlib/libc/sys/rtems/machine/limits.h b/newlib/libc/sys/rtems/include/machine/limits.h
similarity index 97%
rename from newlib/libc/sys/rtems/machine/limits.h
rename to newlib/libc/sys/rtems/include/machine/limits.h
index 5a6ee0337..2b4c47e48 100644
--- a/newlib/libc/sys/rtems/machine/limits.h
+++ b/newlib/libc/sys/rtems/include/machine/limits.h
@@ -3,4 +3,3 @@
  */
 
 /* intentionally empty file */
-
diff --git a/newlib/libc/sys/rtems/machine/param.h b/newlib/libc/sys/rtems/include/machine/param.h
similarity index 100%
rename from newlib/libc/sys/rtems/machine/param.h
rename to newlib/libc/sys/rtems/include/machine/param.h
diff --git a/newlib/libc/sys/rtems/sys/cpuset.h b/newlib/libc/sys/rtems/include/sys/cpuset.h
similarity index 100%
rename from newlib/libc/sys/rtems/sys/cpuset.h
rename to newlib/libc/sys/rtems/include/sys/cpuset.h
diff --git a/newlib/libc/sys/rtems/sys/dirent.h b/newlib/libc/sys/rtems/include/sys/dirent.h
similarity index 99%
rename from newlib/libc/sys/rtems/sys/dirent.h
rename to newlib/libc/sys/rtems/include/sys/dirent.h
index 8d2aa38cb..5a3a54dbf 100644
--- a/newlib/libc/sys/rtems/sys/dirent.h
+++ b/newlib/libc/sys/rtems/include/sys/dirent.h
@@ -58,7 +58,7 @@ int scandir ( const char *dirname,
 
 #ifdef __cplusplus
 }
-#endif 
+#endif
 
 
 #endif
diff --git a/newlib/libc/sys/rtems/sys/param.h b/newlib/libc/sys/rtems/include/sys/param.h
similarity index 98%
rename from newlib/libc/sys/rtems/sys/param.h
rename to newlib/libc/sys/rtems/include/sys/param.h
index 808745f85..f1e598c88 100644
--- a/newlib/libc/sys/rtems/sys/param.h
+++ b/newlib/libc/sys/rtems/include/sys/param.h
@@ -131,13 +131,13 @@
  *
  * BKVASIZE -	Nominal buffer space per buffer, in bytes.  BKVASIZE is the
  *		minimum KVM memory reservation the kernel is willing to make.
- *		Filesystems can of course request smaller chunks.  Actual 
+ *		Filesystems can of course request smaller chunks.  Actual
  *		backing memory uses a chunk size of a page (PAGE_SIZE).
  *
  *		If you make BKVASIZE too small you risk seriously fragmenting
  *		the buffer KVM map which may slow things down a bit.  If you
- *		make it too big the kernel will not be able to optimally use 
- *		the KVM memory reserved for the buffer cache and will wind 
+ *		make it too big the kernel will not be able to optimally use
+ *		the KVM memory reserved for the buffer cache and will wind
  *		up with too-few buffers.
  *
  *		The default is 16384, roughly 2x the block size used by a
diff --git a/newlib/libc/sys/rtems/sys/syslimits.h b/newlib/libc/sys/rtems/include/sys/syslimits.h
similarity index 100%
rename from newlib/libc/sys/rtems/sys/syslimits.h
rename to newlib/libc/sys/rtems/include/sys/syslimits.h
diff --git a/newlib/libc/sys/rtems/sys/utime.h b/newlib/libc/sys/rtems/include/sys/utime.h
similarity index 100%
rename from newlib/libc/sys/rtems/sys/utime.h
rename to newlib/libc/sys/rtems/include/sys/utime.h