diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt
index 14391530..24c9759a 100644
--- a/config/CMakeChecks.txt
+++ b/config/CMakeChecks.txt
@@ -41,8 +41,6 @@ INCLUDE( GNUInstallDirs )
 
 INCLUDE( FindIconv )
 
-SET( STDC_HEADERS ON )
-
 INCLUDE_DIRECTORIES( ${CMAKE_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/include )
 LINK_DIRECTORIES( ${CMAKE_LIBRARY_PATH} )
 
@@ -62,26 +60,6 @@ ENDIF( EXIV2_ENABLE_COMMERCIAL )
 # checking for Header files
 check_include_file( "inttypes.h" have_inttypes_h )
 
-# time.h and sys/time.h can be included in the same file
-CHECK_C_SOURCE_COMPILES( "#include <time.h>
-#include <sys/time.h>
-int main() {
-return 0;
-}" TIME_WITH_SYS_TIME )
-
-# for msvc define to int in exv_conf.h
-IF( NOT MSVC )
-    SET( HAVE_PID_T TRUE )
-ENDIF( NOT MSVC )
-
-SET( EXV_SYMBOLS )
-
-FOREACH( entry ${EXV_SYMBOLS} )
-    SET( EXV_${entry} ${${entry}} )
-    # NOTE: to hack...
-    # MESSAGE( EXV_${entry} " : " ${${entry}} )
-ENDFOREACH( entry ${EXV_SYMBOLS} )
-
 # when removing support of VS solution files, get rid of this stuff
 #VSslnCompat
 IF (MSVC)
diff --git a/config/config.h.cmake b/config/config.h.cmake
index 6014102a..f2e51a11 100644
--- a/config/config.h.cmake
+++ b/config/config.h.cmake
@@ -144,13 +144,6 @@
 /* Define to the version of this package. */
 #cmakedefine EXV_PACKAGE_VERSION "@PACKAGE_VERSION@"
 
-/* Define to 1 if you have the ANSI C header files. */
-#cmakedefine STDC_HEADERS 1
-
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #cmakedefine const
 
@@ -163,9 +156,6 @@
 /* Define to rpl_malloc if the replacement function should be used. */
 #cmakedefine malloc
 
-/* Define to `int' if <sys/types.h> does not define. */
-#cmakedefine HAVE_PID_T 1
-
 /* Define to rpl_realloc if the replacement function should be used. */
 #cmakedefine realloc
 
diff --git a/config/config.h.in b/config/config.h.in
index d6e1c4cd..fdc3abf2 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -138,15 +138,9 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
 /* Define to 1 if strerror_r returns char *. */
 #undef STRERROR_R_CHAR_P
 
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
diff --git a/include/exiv2/exv_msvc.h b/include/exiv2/exv_msvc.h
index 46f49a71..aab0248e 100644
--- a/include/exiv2/exv_msvc.h
+++ b/include/exiv2/exv_msvc.h
@@ -141,15 +141,9 @@
 /* Define to the version of this package. */
 #define EXV_PACKAGE_VERSION "0.26"
 
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
 /* Define to 1 if strerror_r returns char *. */
 /* #undef STRERROR_R_CHAR_P */
 
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
@@ -163,7 +157,7 @@
 /* #undef malloc */
 
 /* On Microsoft compilers pid_t has to be set to int. */
-#ifndef HAVE_PID_T
+#ifdef _MSC_VER
 typedef int pid_t;
 #endif