Index: gsoap/stdsoap2.h
--- gsoap/stdsoap2.h.orig	2016-02-24 20:11:10.000000000 +0100
+++ gsoap/stdsoap2.h	2016-03-06 21:20:35.272820217 +0100
@@ -598,7 +598,7 @@
 #endif
 
 /* if we have xlocale.h then we can use it WITH_C_LOCALE enabled to avoid decimal point conversion issues */
-#ifdef WITH_C_LOCALE
+#if defined(HAVE_XLOCALE_H)
 # ifdef WIN32
 #  include <locale.h>
 #  define SOAP_LOCALE(soap) ((soap)->c_locale ? (soap)->c_locale : ((soap)->c_locale = _create_locale(LC_ALL, "C")))
@@ -706,7 +706,7 @@
 #   include <sys/types.h>
 #  endif
 #  ifndef WITH_LEAN
-#   ifdef HAVE_SYS_TIMEB_H
+#   if defined(HAVE_SYS_TIMEB_H) && !defined(__FreeBSD__)
 #    include <sys/timeb.h>              /* for ftime() */
 #   endif
 #   include <time.h>