diff --git a/cpu-miner.c b/cpu-miner.c
index d381defb..6168713f 100644
--- a/cpu-miner.c
+++ b/cpu-miner.c
@@ -9,7 +9,7 @@
  * any later version.  See COPYING for more details.
  */
 
-#include "cpuminer-config.h"
+#include "config.h"
 #define _GNU_SOURCE
 
 #include <stdio.h>
diff --git a/sha256_4way.c b/sha256_4way.c
index 82dd6caf..b13f86de 100644
--- a/sha256_4way.c
+++ b/sha256_4way.c
@@ -4,7 +4,7 @@
 
 // tcatm's 4-way 128-bit SSE2 SHA-256
 
-#include "cpuminer-config.h"
+#include "config.h"
 #include "miner.h"
 
 #ifdef WANT_SSE2_4WAY
diff --git a/sha256_cryptopp.c b/sha256_cryptopp.c
index c3eb29f9..4a8785e7 100644
--- a/sha256_cryptopp.c
+++ b/sha256_cryptopp.c
@@ -1,5 +1,5 @@
 
-#include "cpuminer-config.h"
+#include "config.h"
 
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/sha256_generic.c b/sha256_generic.c
index 789b20e9..5d70b558 100644
--- a/sha256_generic.c
+++ b/sha256_generic.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "cpuminer-config.h"
+#include "config.h"
 
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/sha256_sse2_amd64.c b/sha256_sse2_amd64.c
index 3aa154c2..eb6ae8f4 100644
--- a/sha256_sse2_amd64.c
+++ b/sha256_sse2_amd64.c
@@ -9,7 +9,7 @@
  *
  */
 
-#include "cpuminer-config.h"
+#include "config.h"
 
 #include "miner.h"
 
diff --git a/sha256_via.c b/sha256_via.c
index 1f0596c2..aa72055d 100644
--- a/sha256_via.c
+++ b/sha256_via.c
@@ -1,5 +1,5 @@
 
-#include "cpuminer-config.h"
+#include "config.h"
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/util.c b/util.c
index f7c8cc40..d4ac0bce 100644
--- a/util.c
+++ b/util.c
@@ -9,7 +9,7 @@
  */
 
 #define _GNU_SOURCE
-#include "cpuminer-config.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -93,6 +93,7 @@ void applog(int prio, const char *fmt, ...)
 			tm.tm_sec,
 			fmt);
 		vfprintf(stderr, f, ap);	/* atomic write to stderr */
+		fflush(stderr);
 	}
 	va_end(ap);
 	fflush(stderr);