6 files changed, 5 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 44807660415..24a7dc7de0b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-03  Glenn Morris  <rgm@gnu.org>
+
+	* m/ia64.h, s/gnu-linux.h, s/gnu.h, s/netbsd.h, s/usg5-4.h:
+	Remove NOT_C_CODE tests, it is always true now.
+
 2010-06-02  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	Fix config.h includes.
diff --git a/src/m/ia64.h b/src/m/ia64.h
index 03ec37b4269..76e2bb87d80 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -48,8 +48,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Convert that into an integer that is 100 for a load average of 1.0  */
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
-#ifndef NOT_C_CODE
-
 #ifdef REL_ALLOC
 #ifndef _MALLOC_INTERNAL
 /* "char *" because ralloc.c defines it that way.  gmalloc.c thinks it
@@ -60,8 +58,6 @@ extern void r_alloc_free ();
 #endif /* not _MALLOC_INTERNAL */
 #endif /* REL_ALLOC */
 
-#endif /* not NOT_C_CODE */
-
 #define HAVE_TEXT_START
 
 /* arch-tag: 9b8e9fb2-2e49-4c22-b68f-11a488e77c66
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 674f00f1d09..f1ec7d99a4b 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -29,7 +29,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "gnu/linux"		/* All the best software is free. */
 
-#ifndef NOT_C_CODE
 #ifdef emacs
 #ifdef HAVE_LINUX_VERSION_H
 #include <linux/version.h>
@@ -40,7 +39,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif /* LINUX_VERSION_CODE >= 0x20400 */
 #endif /* HAVE_LINUX_VERSION_H */
 #endif /* emacs */
-#endif /* NOT_C_CODE */
 
 #if defined HAVE_GRANTPT
 #define UNIX98_PTYS
diff --git a/src/s/gnu.h b/src/s/gnu.h
index 4567f4e9f4f..95b8017ddc1 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -34,9 +34,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Some losing code fails to include this and then assumes
    that because it is braindead that O_RDONLY==0.  */
-#ifndef NOT_C_CODE
 #include <fcntl.h>
-#endif
 
 #ifdef emacs
 #include <stdio.h>  /* Get the definition of _IO_STDIO_H.  */
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index af8fd00a6bd..6f5b24bcfa6 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -31,9 +31,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Greg A. Woods <woods@weird.com> says we must include signal.h
    before syssignal.h is included, to work around interface conflicts
    that are handled with CPP __RENAME() macro in signal.h.  */
-#ifndef NOT_C_CODE
 #include <signal.h>
-#endif
 
 /* Don't close pty in process.c to make it as controlling terminal.
    It is already a controlling terminal of subprocess, because we did
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 85499fb1124..864ace33d50 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -77,9 +77,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Get FIONREAD from <sys/filio.h>.  Get <sys/ttold.h> to get struct tchars.
    But get <termio.h> first to make sure ttold.h doesn't interfere.
    And don't try to use SIGIO yet.  */
-#ifndef NOT_C_CODE
 #include <sys/wait.h>
-#endif
 
 #ifdef emacs
 #include <sys/filio.h>