diff --git a/lib/sectionsdclient/sectionsdcontrol.cpp b/lib/sectionsdclient/sectionsdcontrol.cpp
index fb40c867b..365100e21 100644
--- a/lib/sectionsdclient/sectionsdcontrol.cpp
+++ b/lib/sectionsdclient/sectionsdcontrol.cpp
@@ -24,6 +24,7 @@
  */
 
 #include <cstring>
+#include <cstdio>
 
 #include <sectionsdclient/sectionsdclient.h>
 
diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h
index e0d830b0a..b358935a5 100644
--- a/src/driver/rcinput.h
+++ b/src/driver/rcinput.h
@@ -33,6 +33,7 @@
 #define __MOD_rcinput__
 
 #include <linux/input.h>
+#include <stdint.h>
 #include <string>
 #include <vector>
 
diff --git a/src/gui/widget/messagebox.h b/src/gui/widget/messagebox.h
index a5bf8390d..0800e9f4e 100644
--- a/src/gui/widget/messagebox.h
+++ b/src/gui/widget/messagebox.h
@@ -35,6 +35,7 @@
 
 #include <gui/widget/hintboxext.h>
 
+#include <stdint.h>
 #include <string>
 
 
diff --git a/src/nhttpd/yhttpd.cpp b/src/nhttpd/yhttpd.cpp
index f0e813de2..3b7000608 100644
--- a/src/nhttpd/yhttpd.cpp
+++ b/src/nhttpd/yhttpd.cpp
@@ -6,6 +6,7 @@
 // system
 #include <csignal>
 #include <unistd.h>
+#include <cstdio>
 #include <cstdlib>
 #include <pwd.h>
 #include <grp.h>
diff --git a/src/nhttpd/yhttpd_core/helper.cpp b/src/nhttpd/yhttpd_core/helper.cpp
index 7490e090b..940b4d84f 100644
--- a/src/nhttpd/yhttpd_core/helper.cpp
+++ b/src/nhttpd/yhttpd_core/helper.cpp
@@ -82,7 +82,7 @@ std::string string_printf(const char *fmt, ...)
 	char buffer[bufferlen];
 	va_list arglist;
 	va_start( arglist, fmt );
-	if(arglist)
+	// if(arglist)
 		vsnprintf( buffer, bufferlen, fmt, arglist );
 	va_end(arglist);
 	return std::string(buffer);
diff --git a/src/nhttpd/yhttpd_core/ylogging.cpp b/src/nhttpd/yhttpd_core/ylogging.cpp
index 1a40c87cb..2663665ba 100644
--- a/src/nhttpd/yhttpd_core/ylogging.cpp
+++ b/src/nhttpd/yhttpd_core/ylogging.cpp
@@ -81,7 +81,7 @@ void CLogging::printf ( const char *fmt, ... )
 
 	va_list arglist;
 	va_start( arglist, fmt );
-	if(arglist)
+	// if(arglist)
 		vsnprintf( buffer, bufferlen, fmt, arglist );
 	va_end(arglist);
 
diff --git a/src/nhttpd/yhttpd_core/ysocket.cpp b/src/nhttpd/yhttpd_core/ysocket.cpp
index 0d8ef6d74..51a5cefb3 100644
--- a/src/nhttpd/yhttpd_core/ysocket.cpp
+++ b/src/nhttpd/yhttpd_core/ysocket.cpp
@@ -4,6 +4,7 @@
 //=============================================================================
 
 #include <cstring>
+#include <cstdio>
 
 // system
 #include <arpa/inet.h>
diff --git a/src/nhttpd/yhttpd_core/ywebserver.cpp b/src/nhttpd/yhttpd_core/ywebserver.cpp
index 27e32259a..2984ef1df 100644
--- a/src/nhttpd/yhttpd_core/ywebserver.cpp
+++ b/src/nhttpd/yhttpd_core/ywebserver.cpp
@@ -5,6 +5,7 @@
 // c++
 #include <cerrno>
 #include <csignal>
+#include <cstdio>
 
 // system
 #include <arpa/inet.h>
diff --git a/src/nhttpd/yhttpd_mods/mod_cache.cpp b/src/nhttpd/yhttpd_mods/mod_cache.cpp
index fb685e1c2..010fbda68 100644
--- a/src/nhttpd/yhttpd_mods/mod_cache.cpp
+++ b/src/nhttpd/yhttpd_mods/mod_cache.cpp
@@ -4,6 +4,7 @@
 //=============================================================================
 
 // system
+#include <cstdio>
 #include <pthread.h>
 #include <sys/stat.h>
 // yhttpd
diff --git a/src/nhttpd/yhttpd_mods/mod_weblog.cpp b/src/nhttpd/yhttpd_mods/mod_weblog.cpp
index 41cc37230..05fe685ff 100644
--- a/src/nhttpd/yhttpd_mods/mod_weblog.cpp
+++ b/src/nhttpd/yhttpd_mods/mod_weblog.cpp
@@ -5,6 +5,7 @@
 // Normally
 //=============================================================================
 #include <cstdarg>
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 
@@ -111,7 +112,7 @@ bool CmWebLog::printf(const char *fmt, ...)
 		pthread_mutex_lock(&WebLog_mutex); // yeah, its mine
 		va_list arglist;
 		va_start( arglist, fmt );
-		if(arglist)
+		// if(arglist)
 			vsnprintf( buffer, bufferlen, fmt, arglist );
 		va_end(arglist);
 		unsigned int len = strlen(buffer);
diff --git a/src/system/configure_network.cpp b/src/system/configure_network.cpp
index 1dfa8f721..f65bed07a 100644
--- a/src/system/configure_network.cpp
+++ b/src/system/configure_network.cpp
@@ -19,6 +19,7 @@
  *
  */
 #include <config.h>
+#include <cstdio>               /* perror... */
 #include <sys/wait.h>
 #include "configure_network.h"
 #include "libnet.h"             /* netGetNameserver, netSetNameserver   */
diff --git a/src/zapit/include/zapit/types.h b/src/zapit/include/zapit/types.h
index 81bbffe0a..e6bff41e5 100644
--- a/src/zapit/include/zapit/types.h
+++ b/src/zapit/include/zapit/types.h
@@ -27,6 +27,7 @@
 
 //typedef  void CS_DMX_PDATA;
 
+#include <stdint.h>
 #include "client/zapittypes.h"
 
 typedef uint64_t transponder_id_t;
diff --git a/src/zapit/src/channel.cpp b/src/zapit/src/channel.cpp
index e44c27073..3fbd6f574 100644
--- a/src/zapit/src/channel.cpp
+++ b/src/zapit/src/channel.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+#include <cstdio>
 #include <zapit/channel.h>
 
 CZapitChannel::CZapitChannel(const std::string & p_name, t_service_id p_sid, t_transport_stream_id p_tsid, t_original_network_id p_onid, unsigned char p_service_type, t_satellite_position p_satellite_position, freq_id_t p_freq)