diff --git a/include/hardware/hw_auth_token.h b/include/hardware/hw_auth_token.h
index ffb72a9..154c1fd 100644
--- a/include/hardware/hw_auth_token.h
+++ b/include/hardware/hw_auth_token.h
@@ -19,7 +19,9 @@
 #ifndef ANDROID_HARDWARE_HW_AUTH_TOKEN_H
 #define ANDROID_HARDWARE_HW_AUTH_TOKEN_H
 
-__BEGIN_DECLS
+#ifndef __cplusplus
+extern "C" {
+#endif  // __cplusplus
 
 typedef enum {
     HW_AUTH_NONE = 0,
@@ -42,6 +44,8 @@
     uint8_t hmac[32];
 } hw_auth_token_t;
 
-__END_DECLS
+#ifndef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus
 
 #endif  // ANDROID_HARDWARE_HW_AUTH_TOKEN_H
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index e7ef5b5..664d3a7 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -21,7 +21,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-__BEGIN_DECLS
+#ifndef __cplusplus
+extern "C" {
+#endif  // __cplusplus
 
 /**
  * Authorization tags each have an associated type.  This enumeration facilitates tagging each with
@@ -546,6 +548,8 @@
     }
 }
 
-__END_DECLS
+#ifndef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus
 
 #endif  // ANDROID_HARDWARE_KEYMASTER_DEFS_H