diff --git a/src/buffer.c b/src/buffer.c
index 318fee753..a83ca8792 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -7,7 +7,6 @@
 #include "buffer.h"
 #include "posix.h"
 #include "git2/buffer.h"
-#include <stdarg.h>
 #include <ctype.h>
 
 /* Used as default value for git_buf->ptr so that people can always
diff --git a/src/buffer.h b/src/buffer.h
index 564a4f561..4c852b3cb 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -7,8 +7,6 @@
 #ifndef INCLUDE_buffer_h__
 #define INCLUDE_buffer_h__
 
-#include <stdarg.h>
-
 #include "common.h"
 #include "git2/strarray.h"
 #include "git2/buffer.h"
diff --git a/src/cc-compat.h b/src/cc-compat.h
index 37f1ea81e..e73cb6de8 100644
--- a/src/cc-compat.h
+++ b/src/cc-compat.h
@@ -7,6 +7,8 @@
 #ifndef INCLUDE_compat_h__
 #define INCLUDE_compat_h__
 
+#include <stdarg.h>
+
 /*
  * See if our compiler is known to support flexible array members.
  */
diff --git a/src/commit.c b/src/commit.c
index de50e772e..2f5a5b51e 100644
--- a/src/commit.c
+++ b/src/commit.c
@@ -17,8 +17,6 @@
 #include "signature.h"
 #include "message.h"
 
-#include <stdarg.h>
-
 void git_commit__free(void *_commit)
 {
 	git_commit *commit = _commit;
diff --git a/src/errors.c b/src/errors.c
index a0b085923..393a7875f 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -8,7 +8,6 @@
 #include "global.h"
 #include "posix.h"
 #include "buffer.h"
-#include <stdarg.h>
 
 /********************************************
  * New error handling
diff --git a/src/filebuf.c b/src/filebuf.c
index 9c3dae811..d23bcc11c 100644
--- a/src/filebuf.c
+++ b/src/filebuf.c
@@ -4,8 +4,6 @@
  * This file is part of libgit2, distributed under the GNU GPL v2 with
  * a Linking Exception. For full terms see the included COPYING file.
  */
-#include <stdarg.h>
-
 #include "common.h"
 #include "filebuf.h"
 #include "fileops.h"
diff --git a/src/object.c b/src/object.c
index 3fc984b45..40cae184f 100644
--- a/src/object.c
+++ b/src/object.c
@@ -4,8 +4,6 @@
  * This file is part of libgit2, distributed under the GNU GPL v2 with
  * a Linking Exception. For full terms see the included COPYING file.
  */
-#include <stdarg.h>
-
 #include "git2/object.h"
 
 #include "common.h"
diff --git a/src/path.c b/src/path.c
index feb273915..89409eae4 100644
--- a/src/path.c
+++ b/src/path.c
@@ -12,7 +12,6 @@
 #else
 #include <dirent.h>
 #endif
-#include <stdarg.h>
 #include <stdio.h>
 #include <ctype.h>
 
diff --git a/src/repository.c b/src/repository.c
index 96ed30666..8b336c215 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -4,7 +4,6 @@
  * This file is part of libgit2, distributed under the GNU GPL v2 with
  * a Linking Exception. For full terms see the included COPYING file.
  */
-#include <stdarg.h>
 #include <ctype.h>
 
 #include "git2/object.h"
diff --git a/src/settings.c b/src/settings.c
index 748f76560..7c2a30377 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -5,8 +5,6 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include <stdarg.h>
-
 #include <git2.h>
 #include "common.h"
 #include "fileops.h"
diff --git a/src/trace.h b/src/trace.h
index 77b1e03ef..4d4e3bf53 100644
--- a/src/trace.h
+++ b/src/trace.h
@@ -7,8 +7,6 @@
 #ifndef INCLUDE_trace_h__
 #define INCLUDE_trace_h__
 
-#include <stdarg.h>
-
 #include <git2/trace.h>
 #include "buffer.h"