diff --git a/ImageStreams/basics.hpp b/ImageStreams/basics.hpp
index eeb8eb0..1a2ead6 100644
--- a/ImageStreams/basics.hpp
+++ b/ImageStreams/basics.hpp
@@ -28,6 +28,9 @@
  number of bits per color (TODO: what to do with encodings like 565 ?)
  */
 
+#include <cstdint>
+#include <algorithm>
+
 namespace pixel_formats {
 	inline uint8_t clamp(int n){
 		return std::min(255, std::max(0, n));
diff --git a/ImageStreams/bmp.hpp b/ImageStreams/bmp.hpp
index 1f49a54..1e008cd 100644
--- a/ImageStreams/bmp.hpp
+++ b/ImageStreams/bmp.hpp
@@ -12,7 +12,7 @@
 #include <ostream>
 #include <fstream>
 #include <stdexcept>
-#include <algorithm>
+#include <type_traits>
 #include "basics.hpp"
 
 /*
diff --git a/ImageStreams/jpg.hpp b/ImageStreams/jpg.hpp
index 07d3fea..a121aad 100644
--- a/ImageStreams/jpg.hpp
+++ b/ImageStreams/jpg.hpp
@@ -9,7 +9,7 @@
 #ifndef ImageStreams_jpg_hpp
 #define ImageStreams_jpg_hpp
 
-#include <stdio.h>
+#include <cstdio>
 #include <stdexcept>
 #include <vector>
 #include <jpeglib.h>
diff --git a/ImageStreams/main.cpp b/ImageStreams/main.cpp
index 1acd3da..e113a35 100644
--- a/ImageStreams/main.cpp
+++ b/ImageStreams/main.cpp
@@ -7,16 +7,12 @@
 //
 
 #include <iostream>
+#include <cstdlib>
+#include <array>
 
 #include "png.hpp"
 #include "bmp.hpp"
 #include "jpg.hpp"
-#include "basics.hpp"
-
-#include <cmath>
-#include <vector>
-#include <array>
-#include <algorithm>
 
 template <typename ImageType>
 void basic_colors(std::string filename) {
diff --git a/ImageStreams/png.hpp b/ImageStreams/png.hpp
index bb5f904..d37a861 100644
--- a/ImageStreams/png.hpp
+++ b/ImageStreams/png.hpp
@@ -9,7 +9,7 @@
 #ifndef ImageStreams_png_hpp
 #define ImageStreams_png_hpp
 
-#include <stdio.h>
+#include <cstdio>
 #include <stdexcept>
 #include <vector>
 #include <png.h>