diff --git a/ChangeLog b/ChangeLog
index f99ed17139..96f760b1f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6671,3 +6671,6 @@
 	* arch/arm/src/sama5/sam_adc.h:  Fix typos in the SAMA5 ADC register
 	  definition header file (2014-2-26).
 	* arch/arm/src/sam34:  The port to the SAM4E is code complete (2014-2-16).
+	* include/cxx: Fix some bad idempotence defintions in header files
+	  (2014-2-27).
+
diff --git a/include/cxx/cstddef b/include/cxx/cstddef
index 73dbcd526e..74811d830b 100644
--- a/include/cxx/cstddef
+++ b/include/cxx/cstddef
@@ -1,7 +1,7 @@
 //***************************************************************************
 // include/cxx/cstddef
 //
-//   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+//   Copyright (C) 2009, 2014 Gregory Nutt. All rights reserved.
 //   Author: Gregory Nutt <gnutt@nuttx.org>
 //
 // Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
 //
 //***************************************************************************
 
-#ifndef __INCLUDE_CXX_CCTYPE
-#define __INCLUDE_CXX_CCTYPE
+#ifndef __INCLUDE_CXX_CSTDDEF
+#define __INCLUDE_CXX_CSTDDEF
 
 //***************************************************************************
 // Included Files
@@ -78,4 +78,4 @@ namespace std
   using ::sa_family_t;
 }
 
-#endif // __INCLUDE_CXX_CCTYPE
+#endif // __INCLUDE_CXX_CSTDDEF
diff --git a/include/cxx/cstdio b/include/cxx/cstdio
index 6a9620e1ad..ff64f59196 100644
--- a/include/cxx/cstdio
+++ b/include/cxx/cstdio
@@ -1,7 +1,7 @@
 //***************************************************************************
 // include/cxx/cstdio
 //
-//   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+//   Copyright (C) 2009, 2014 Gregory Nutt. All rights reserved.
 //   Author: Gregory Nutt <gnutt@nuttx.org>
 //
 // Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
 //
 //***************************************************************************
 
-#ifndef __INCLUDE_CXX_CCTYPE
-#define __INCLUDE_CXX_CCTYPE
+#ifndef __INCLUDE_CXX_CSTDIO
+#define __INCLUDE_CXX_CSTDIO
 
 //***************************************************************************
 // Included Files
@@ -93,4 +93,4 @@ namespace std
   using ::statfs;
 }
 
-#endif // __INCLUDE_CXX_CCTYPE
+#endif // __INCLUDE_CXX_CSTDIO