2 files changed, 18 insertions, 1 deletions
diff --git a/cpukit/libcsupport/include/rtems/assoc.h b/cpukit/libcsupport/include/rtems/assoc.h
index bfcc467e41..5b72b8d086 100644
--- a/cpukit/libcsupport/include/rtems/assoc.h
+++ b/cpukit/libcsupport/include/rtems/assoc.h
@@ -14,6 +14,12 @@
 #ifndef _RTEMS_RTEMS_ASSOC_H
 #define _RTEMS_RTEMS_ASSOC_H
 
+#include <stdint.h> /* uint32_t */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct {
     const char  *name;
     uint32_t     local_value;
@@ -107,5 +113,8 @@ const char *rtems_assoc_name_bad(
 );
 #endif
 
+#ifdef __cplusplus
+}
+#endif
 
-#endif /* ! _INCLUDE_ASSOC_H */
+#endif /* ! _RTEMS_RTEMS_ASSOC_H */
diff --git a/cpukit/libcsupport/include/rtems/malloc.h b/cpukit/libcsupport/include/rtems/malloc.h
index d5b5eb691d..d3018db73c 100644
--- a/cpukit/libcsupport/include/rtems/malloc.h
+++ b/cpukit/libcsupport/include/rtems/malloc.h
@@ -23,6 +23,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  *  Malloc Statistics Structure
  */
@@ -145,4 +149,8 @@ int rtems_memalign(
   size_t   size
 );
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif