diff --git a/modules/calib3d/src/rho.cpp b/modules/calib3d/src/rho.cpp
index 7126e2f196..b42eace1ba 100644
--- a/modules/calib3d/src/rho.cpp
+++ b/modules/calib3d/src/rho.cpp
@@ -48,7 +48,6 @@
 #include <opencv2/core.hpp>
 #include <stdlib.h>
 #include <stdio.h>
-#include <stdint.h>
 #include <string.h>
 #include <stddef.h>
 #include <limits.h>
diff --git a/modules/calib3d/src/rho.h b/modules/calib3d/src/rho.h
index e45082d77c..a8211161af 100644
--- a/modules/calib3d/src/rho.h
+++ b/modules/calib3d/src/rho.h
@@ -51,7 +51,6 @@
 
 /* Includes */
 #include <opencv2/core.hpp>
-#include <stdint.h>
 
 
 
diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h
index bd28b7a9d4..823a2693f1 100644
--- a/modules/core/include/opencv2/core/cvdef.h
+++ b/modules/core/include/opencv2/core/cvdef.h
@@ -452,6 +452,50 @@ Cv64suf;
 #  endif
 #endif
 
+
+// Integer types portatibility
+#ifdef OPENCV_STDINT_HEADER
+#include OPENCV_STDINT_HEADER
+#else
+#if defined(_MSC_VER) && _MSC_VER < 1600 /* MSVS 2010 */
+namespace cv {
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef signed __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+}
+#elif defined(_MSC_VER) || __cplusplus >= 201103L
+#include <cstdint>
+namespace cv {
+using std::int8_t;
+using std::uint8_t;
+using std::int16_t;
+using std::uint16_t;
+using std::int32_t;
+using std::uint32_t;
+using std::int64_t;
+using std::uint64_t;
+}
+#else
+#include <stdint.h>
+namespace cv {
+typedef ::int8_t int8_t;
+typedef ::uint8_t uint8_t;
+typedef ::int16_t int16_t;
+typedef ::uint16_t uint16_t;
+typedef ::int32_t int32_t;
+typedef ::uint32_t uint32_t;
+typedef ::int64_t int64_t;
+typedef ::uint64_t uint64_t;
+}
+#endif
+#endif
+
+
 //! @}
 
 #endif // OPENCV_CORE_CVDEF_H
diff --git a/modules/core/include/opencv2/core/softfloat.hpp b/modules/core/include/opencv2/core/softfloat.hpp
index d773c3c778..547098038d 100644
--- a/modules/core/include/opencv2/core/softfloat.hpp
+++ b/modules/core/include/opencv2/core/softfloat.hpp
@@ -45,18 +45,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "cvdef.h"
 
-// int32_t / uint32_t
-#if defined(_MSC_VER) && _MSC_VER < 1600 /* MSVS 2010 */
-namespace cv {
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-}
-#elif defined(_MSC_VER) || __cplusplus >= 201103L
-#include <cstdint>
-#else
-#include <stdint.h>
-#endif
-
 namespace cv
 {
 
diff --git a/modules/core/src/persistence.hpp b/modules/core/src/persistence.hpp
index 1149386278..392143de2b 100644
--- a/modules/core/src/persistence.hpp
+++ b/modules/core/src/persistence.hpp
@@ -8,13 +8,9 @@
 
 #include "opencv2/core/types_c.h"
 #include <deque>
-#include <deque>
 #include <sstream>
 #include <string>
 #include <iterator>
-#ifdef _MSC_VER
-#include <cstdint>
-#endif // _MSC_VER
 
 #define USE_ZLIB 1
 #if USE_ZLIB
diff --git a/modules/dnn/src/precomp.hpp b/modules/dnn/src/precomp.hpp
index e860598283..8b5a31c1c4 100644
--- a/modules/dnn/src/precomp.hpp
+++ b/modules/dnn/src/precomp.hpp
@@ -43,7 +43,6 @@
 #include <opencv2/core/ocl.hpp>
 #include <opencv2/core/opencl/ocl_defs.hpp>
 #include <opencv2/core/utils/trace.hpp>
-#include <opencv2/core/softfloat.hpp> // int32_t (MSVS 2010-2013)
 #include "cvconfig.h"
 #include <opencv2/dnn.hpp>
 #include <opencv2/dnn/all_layers.hpp>
diff --git a/modules/imgcodecs/src/exif.cpp b/modules/imgcodecs/src/exif.cpp
index 6f19dd025d..350123431c 100644
--- a/modules/imgcodecs/src/exif.cpp
+++ b/modules/imgcodecs/src/exif.cpp
@@ -40,9 +40,8 @@
 //
 //M*/
 
+#include "precomp.hpp"
 #include "exif.hpp"
-#include "opencv2/core/cvdef.h"
-#include "opencv2/core/base.hpp"
 
 namespace {
 
diff --git a/modules/imgcodecs/src/exif.hpp b/modules/imgcodecs/src/exif.hpp
index 094236be40..bbc92e813e 100644
--- a/modules/imgcodecs/src/exif.hpp
+++ b/modules/imgcodecs/src/exif.hpp
@@ -48,7 +48,6 @@
 #include <map>
 #include <utility>
 #include <algorithm>
-#include <stdint.h>
 #include <string>
 #include <vector>
 #include <iostream>
diff --git a/modules/imgproc/src/drawing.cpp b/modules/imgproc/src/drawing.cpp
index a3251cebc1..05a9150d77 100644
--- a/modules/imgproc/src/drawing.cpp
+++ b/modules/imgproc/src/drawing.cpp
@@ -40,8 +40,6 @@
 //M*/
 #include "precomp.hpp"
 
-#include <stdint.h>
-
 namespace cv
 {