diff --git a/include/log/log.h b/include/log/log.h
index 3ae3086cd..e3ecc6924 100644
--- a/include/log/log.h
+++ b/include/log/log.h
@@ -28,7 +28,6 @@
 #ifndef _LIBS_LOG_LOG_H
 #define _LIBS_LOG_LOG_H
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #ifdef HAVE_PTHREADS
 #include <pthread.h>
@@ -40,7 +39,9 @@
 #include <log/logd.h>
 #include <log/uio.h>
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 // ---------------------------------------------------------------------
 
@@ -558,6 +559,8 @@ typedef enum log_id {
 int __android_log_buf_write(int bufID, int prio, const char *tag, const char *text);
 int __android_log_buf_print(int bufID, int prio, const char *tag, const char *fmt, ...);
 
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif // _LIBS_CUTILS_LOG_H
diff --git a/include/log/logger.h b/include/log/logger.h
index 9ce37c956..a05b17451 100644
--- a/include/log/logger.h
+++ b/include/log/logger.h
@@ -10,11 +10,12 @@
 #ifndef _UTILS_LOGGER_H
 #define _UTILS_LOGGER_H
 
-#include <sys/cdefs.h>
 #include <stdint.h>
 #include <log/log.h>
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*
  * The userspace structure for version 1 of the logger_entry ABI.
@@ -182,6 +183,8 @@ const char *android_log_id_to_name(log_id_t log_id);
 
 #endif // HAVE_IOCTL
 
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _UTILS_LOGGER_H */