diff --git a/src/framework/logger.cpp b/src/framework/logger.cpp
index a5ce6309..1f54eb1f 100644
--- a/src/framework/logger.cpp
+++ b/src/framework/logger.cpp
@@ -26,7 +26,7 @@
 #include "util.h"
 
 #include <iostream>
-#include <stdarg.h>
+#include <cstdlib>
 
 void Logger::log(int level, const char *trace, const char *format, ...)
 {
diff --git a/src/framework/util.cpp b/src/framework/util.cpp
index 727b80fa..9f08f9fd 100644
--- a/src/framework/util.cpp
+++ b/src/framework/util.cpp
@@ -23,8 +23,7 @@
 
 
 #include "util.h"
-
-#include <stdarg.h>
+#include <cstdio>
 
 std::string vformat(const char *format, va_list args)
 {
diff --git a/src/framework/util.h b/src/framework/util.h
index 403dace0..2dfca475 100644
--- a/src/framework/util.h
+++ b/src/framework/util.h
@@ -26,6 +26,7 @@
 #define UTIL_H
 
 #include "logger.h"
+#include <stdarg.h>
 #include <boost/lexical_cast.hpp>
 
 /// Formatting like printf for std::string, va_list input version