diff --git a/src/core/android/SDL_android.h b/src/core/android/SDL_android.h
index 9045eb5df..d53652f88 100644
--- a/src/core/android/SDL_android.h
+++ b/src/core/android/SDL_android.h
@@ -20,6 +20,13 @@
 */
 #include "SDL_config.h"
 
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+/* *INDENT-OFF* */
+extern "C" {
+/* *INDENT-ON* */
+#endif
+
 #include "SDL_rect.h"
 
 /* Interface from the SDL library into the Android Java activity */
@@ -61,4 +68,11 @@ int Android_JNI_SetupThread(void);
 /* Generic messages */
 int Android_JNI_SendMessage(int command, int param);
 
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+/* *INDENT-OFF* */
+}
+/* *INDENT-ON* */
+#endif
+
 /* vi: set ts=4 sw=4 expandtab: */