diff --git a/modules/java/generator/gen_java.py b/modules/java/generator/gen_java.py
index 429360cd28..0f3ba1d336 100755
--- a/modules/java/generator/gen_java.py
+++ b/modules/java/generator/gen_java.py
@@ -871,22 +871,9 @@ public class %(jc)s {
 // This file is auto-generated, please don't edit!
 //
 
-#include <jni.h>
-
-#include "converters.h"
-
-#if defined DEBUG && defined ANDROID
-#  include <android/log.h>
-#  define MODULE_LOG_TAG "OpenCV.%(m)s"
-#  define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, MODULE_LOG_TAG, __VA_ARGS__))
-#else //DEBUG
-#  define LOGD(...)
-#endif //DEBUG
-
-#ifdef _MSC_VER
-#  pragma warning(disable:4800 4244)
-#endif
+#define LOG_TAG "org.opencv.%(m)s"
 
+#include "common.h"
 #include "opencv2/%(m)s/%(m)s.hpp"
 
 using namespace cv;
diff --git a/modules/java/generator/src/cpp/Mat.cpp b/modules/java/generator/src/cpp/Mat.cpp
index 3831e188a7..726dcaf5fb 100644
--- a/modules/java/generator/src/cpp/Mat.cpp
+++ b/modules/java/generator/src/cpp/Mat.cpp
@@ -1,27 +1,6 @@
-#include <jni.h>
-
-#include "converters.h"
-
-#ifdef ANDROID
-
-#include <android/log.h>
 #define LOG_TAG "org.opencv.core.Mat"
-#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__))
-#ifdef DEBUG
-#define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__))
-#else //!DEBUG
-#define LOGD(...)
-#endif //DEBUG
-
-#else
-#define LOGE(...)
-#define LOGD(...)
-#endif
-
-#ifdef _MSC_VER
-#  pragma warning(disable:4800)
-#endif
 
+#include "common.h"
 #include "opencv2/core/core.hpp"
 
 using namespace cv;
diff --git a/modules/java/generator/src/cpp/VideoCapture.cpp b/modules/java/generator/src/cpp/VideoCapture.cpp
index 48dc151b07..5b9266660f 100644
--- a/modules/java/generator/src/cpp/VideoCapture.cpp
+++ b/modules/java/generator/src/cpp/VideoCapture.cpp
@@ -1,12 +1,5 @@
-#include <jni.h>
-
-#if defined DEBUG && defined ANDROID
-#include <android/log.h>
-#define MODULE_LOG_TAG "OpenCV.highgui"
-#define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, MODULE_LOG_TAG, __VA_ARGS__))
-#else
-#define LOGD(...)
-#endif
+#define LOG_TAG "org.opencv.highgui.VideoCapture"
+#include "common.h"
 
 #include "opencv2/opencv_modules.hpp"
 #ifdef HAVE_OPENCV_HIGHGUI
diff --git a/modules/java/generator/src/cpp/common.h b/modules/java/generator/src/cpp/common.h
new file mode 100644
index 0000000000..56217e4a7a
--- /dev/null
+++ b/modules/java/generator/src/cpp/common.h
@@ -0,0 +1,29 @@
+#ifndef __JAVA_COMMON_H__
+#define __JAVA_COMMON_H__
+
+#if !defined(__ppc__)
+// to suppress warning from jni.h on OS X
+# define TARGET_RT_MAC_CFM 0
+#endif
+#include <jni.h>
+
+#ifdef __ANDROID__
+#  include <android/log.h>
+#  define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__))
+#  ifdef DEBUG
+#    define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__))
+#  else
+#    define LOGD(...)
+#  endif
+#else
+#  define LOGE(...)
+#  define LOGD(...)
+#endif
+
+#include "converters.h"
+
+#ifdef _MSC_VER
+#  pragma warning(disable:4800 4244)
+#endif
+
+#endif //__JAVA_COMMON_H__
\ No newline at end of file
diff --git a/modules/java/generator/src/cpp/converters.cpp b/modules/java/generator/src/cpp/converters.cpp
index 6bf52c00e3..860f0bc0ef 100644
--- a/modules/java/generator/src/cpp/converters.cpp
+++ b/modules/java/generator/src/cpp/converters.cpp
@@ -1,12 +1,4 @@
-#include "converters.h"
-
-#if defined DEBUG && defined ANDROID
-#include <android/log.h>
-#define MODULE_LOG_TAG "OpenCV.converters"
-#define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, MODULE_LOG_TAG, __VA_ARGS__))
-#else //DEBUG
-#define LOGD(...)
-#endif //DEBUG
+#include "common.h"
 
 using namespace cv;
 
diff --git a/modules/java/generator/src/cpp/converters.h b/modules/java/generator/src/cpp/converters.h
index dde73bc6ad..bdffe92699 100644
--- a/modules/java/generator/src/cpp/converters.h
+++ b/modules/java/generator/src/cpp/converters.h
@@ -1,5 +1,3 @@
-#include <jni.h>
-
 #include "opencv2/opencv_modules.hpp"
 #include "opencv2/core/core.hpp"
 #include "features2d_manual.hpp"
diff --git a/modules/java/generator/src/cpp/jni_part.cpp b/modules/java/generator/src/cpp/jni_part.cpp
index b0315a287b..df1bd142ca 100644
--- a/modules/java/generator/src/cpp/jni_part.cpp
+++ b/modules/java/generator/src/cpp/jni_part.cpp
@@ -1,4 +1,4 @@
-#include <jni.h>
+#include "common.h"
 
 #include "opencv2/opencv_modules.hpp"
 
diff --git a/modules/java/generator/src/cpp/utils.cpp b/modules/java/generator/src/cpp/utils.cpp
index 03a2bbdc23..9f6b1bfcff 100644
--- a/modules/java/generator/src/cpp/utils.cpp
+++ b/modules/java/generator/src/cpp/utils.cpp
@@ -1,24 +1,14 @@
-#include <jni.h>
+#define LOG_TAG "org.opencv.android.Utils"
+#include "common.h"
 
 #include "opencv2/core/core.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 
-#ifdef ANDROID
-
+#ifdef __ANDROID__
 #include <android/bitmap.h>
 
-#include <android/log.h>
-#define LOG_TAG "org.opencv.android.Utils"
-#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__))
-#ifdef DEBUG
-#define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__))
-#else //!DEBUG
-#define LOGD(...)
-#endif //DEBUG
-
 using namespace cv;
 
-
 extern "C" {
 
 /*
@@ -168,4 +158,4 @@ JNIEXPORT void JNICALL Java_org_opencv_android_Utils_nMatToBitmap
 
 } // extern "C"
 
-#endif //ANDROID
\ No newline at end of file
+#endif //__ANDROID__
\ No newline at end of file