diff --git a/src/bindgen/bindings.rs b/src/bindgen/bindings.rs
index ecb2a33..dd77ca9 100644
--- a/src/bindgen/bindings.rs
+++ b/src/bindgen/bindings.rs
@@ -94,22 +94,25 @@ impl Bindings {
         }
 
         out.new_line_if_not_start();
-        if self.config.language == Language::C {
-            out.write("#include <stdarg.h>");
-            out.new_line();
-            out.write("#include <stdbool.h>");
-            out.new_line();
-            out.write("#include <stdint.h>");
-            out.new_line();
-            out.write("#include <stdlib.h>");
-            out.new_line();
-        } else {
-            out.write("#include <cstdarg>");
-            out.new_line();
-            out.write("#include <cstdint>");
-            out.new_line();
-            out.write("#include <cstdlib>");
-            out.new_line();
+        if !self.config.no_includes {
+            if self.config.language == Language::C {
+                out.write("#include <stdarg.h>");
+                out.new_line();
+                out.write("#include <stdbool.h>");
+                out.new_line();
+                out.write("#include <stdint.h>");
+                out.new_line();
+                out.write("#include <stdlib.h>");
+                out.new_line();
+            } else {
+                out.write("#include <cstdarg>");
+                out.new_line();
+                out.write("#include <cstdint>");
+                out.new_line();
+                out.write("#include <cstdlib>");
+                out.new_line();
+            }
+
         }
 
         for include in &self.config.sys_includes {
@@ -126,7 +129,7 @@ impl Bindings {
     pub fn write<F: Write>(&self, file: F) {
         let mut out = SourceWriter::new(file, &self.config);
 
-        if !self.config.no_includes {
+        if !self.config.no_includes || !self.config.includes.is_empty() || !self.config.sys_includes.is_empty() {
             self.write_headers(&mut out);
         }