diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index 3f45d1a..f2c2e12 100755
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -26,8 +26,10 @@ distribution.
 #include <new>		// yes, this one new style header, is in the Android SDK.
 #if defined(ANDROID_NDK) || defined(__QNXNTO__)
 #   include <stddef.h>
+#   include <stdarg.h>
 #else
 #   include <cstddef>
+#   include <cstdarg>
 #endif
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (!defined WINCE)
diff --git a/tinyxml2.h b/tinyxml2.h
index 2443327..b873e34 100755
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -30,14 +30,12 @@ distribution.
 #   include <stdio.h>
 #   include <stdlib.h>
 #   include <string.h>
-#   include <stdarg.h>
 #else
 #   include <cctype>
 #   include <climits>
 #   include <cstdio>
 #   include <cstdlib>
 #   include <cstring>
-#   include <cstdarg>
 #endif
 
 /*