3 files changed, 18 insertions, 8 deletions

diff --git a/src/include/platform.h b/src/include/platform.h
index 07fbe0ee7..a649d3aa5 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -160,7 +160,9 @@
 
 #include "plibc.h"
 
+#undef HAVE_CONFIG_H
 #include <pthread.h>
+#define HAVE_CONFIG_H 1
 #include <locale.h>
 #ifndef FRAMEWORK_BUILD
 #include "gettext.h"
diff --git a/src/include/winproc.h b/src/include/winproc.h
index a4a173a13..9619f60d9 100644
--- a/src/include/winproc.h
+++ b/src/include/winproc.h
@@ -44,8 +44,7 @@
 #include <Ntsecapi.h>
 #include <lm.h>
 #include <Aclapi.h>
-#include "gnunet_util.h"
-#include "platform.h"
+
 
 #ifdef __cplusplus
 extern "C"
diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index 4068ed94b..2fdd17ca7 100644
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -123,6 +123,8 @@ static struct CustomLogger *loggers;
  */
 static unsigned int skip_log;
 
+static FILE *GNUNET_stderr;
+
 /**
  * Convert a textual description of a loglevel
  * to the respective GNUNET_GE_KIND.
@@ -163,9 +165,9 @@ GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile)
       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "fopen", logfile);
       return GNUNET_SYSERR;
     }
-  if (stderr != NULL)
-    fclose (stderr);
-  stderr = altlog;
+  if (GNUNET_stderr != NULL)
+    fclose (GNUNET_stderr);
+  GNUNET_stderr = altlog;
   return GNUNET_OK;
 }
 
@@ -220,8 +222,8 @@ output_message (enum GNUNET_ErrorType kind,
                 const char *comp, const char *datestr, const char *msg)
 {
   struct CustomLogger *pos;
-  if (stderr != NULL)
-    fprintf (stderr, "%s %s %s %s", datestr, comp,
+  if (GNUNET_stderr != NULL)
+    fprintf (GNUNET_stderr, "%s %s %s %s", datestr, comp,
              GNUNET_error_type_to_string (kind), msg);
   pos = loggers;
   while (pos != NULL)
@@ -396,6 +398,13 @@ GNUNET_i2s (const struct GNUNET_PeerIdentity *pid)
   return (const char *) ret.encoding;
 }
 
-
+/**
+ * Initializer
+ */
+void __attribute__ ((constructor))
+GNUNET_util_cl_init()
+{
+  GNUNET_stderr = stderr;
+}
 
 /* end of common_logging.c */