diff --git a/demos/audio_sine.cc b/demos/audio_sine.cc
index 142b8ed..e87d350 100644
--- a/demos/audio_sine.cc
+++ b/demos/audio_sine.cc
@@ -23,7 +23,9 @@
 
 #include <SDL2/SDL.h>
 
-#include <SDL2pp/SDL2pp.hh>
+#include <SDL2pp/SDL.hh>
+#include <SDL2pp/Audio.hh>
+#include <SDL2pp/Exception.hh>
 
 using namespace SDL2pp;
 
diff --git a/demos/audio_wav.cc b/demos/audio_wav.cc
index 303aac9..86a5be4 100644
--- a/demos/audio_wav.cc
+++ b/demos/audio_wav.cc
@@ -24,7 +24,10 @@
 
 #include <SDL2/SDL.h>
 
-#include <SDL2pp/SDL2pp.hh>
+#include <SDL2pp/SDL.hh>
+#include <SDL2pp/Audio.hh>
+#include <SDL2pp/Wav.hh>
+#include <SDL2pp/Exception.hh>
 
 using namespace SDL2pp;
 
diff --git a/demos/image.cc b/demos/image.cc
index 1eae378..a2a733b 100644
--- a/demos/image.cc
+++ b/demos/image.cc
@@ -23,7 +23,11 @@
 
 #include <SDL2/SDL.h>
 
-#include <SDL2pp/SDL2pp.hh>
+#include <SDL2pp/SDL.hh>
+#include <SDL2pp/Window.hh>
+#include <SDL2pp/Renderer.hh>
+#include <SDL2pp/Texture.hh>
+#include <SDL2pp/Exception.hh>
 
 using namespace SDL2pp;
 
diff --git a/demos/lines.cc b/demos/lines.cc
index 67a010e..90c2307 100644
--- a/demos/lines.cc
+++ b/demos/lines.cc
@@ -23,7 +23,10 @@
 
 #include <SDL2/SDL.h>
 
-#include <SDL2pp/SDL2pp.hh>
+#include <SDL2pp/SDL.hh>
+#include <SDL2pp/Window.hh>
+#include <SDL2pp/Renderer.hh>
+#include <SDL2pp/Exception.hh>
 
 using namespace SDL2pp;
 
diff --git a/demos/rendertarget.cc b/demos/rendertarget.cc
index 9b1d964..5f6747d 100644
--- a/demos/rendertarget.cc
+++ b/demos/rendertarget.cc
@@ -23,7 +23,11 @@
 
 #include <SDL2/SDL.h>
 
-#include <SDL2pp/SDL2pp.hh>
+#include <SDL2pp/SDL.hh>
+#include <SDL2pp/Window.hh>
+#include <SDL2pp/Renderer.hh>
+#include <SDL2pp/Texture.hh>
+#include <SDL2pp/Exception.hh>
 
 using namespace SDL2pp;
 
diff --git a/demos/sprites.cc b/demos/sprites.cc
index ef59297..1ecee9b 100644
--- a/demos/sprites.cc
+++ b/demos/sprites.cc
@@ -23,7 +23,11 @@
 
 #include <SDL2/SDL.h>
 
-#include <SDL2pp/SDL2pp.hh>
+#include <SDL2pp/SDL.hh>
+#include <SDL2pp/Window.hh>
+#include <SDL2pp/Renderer.hh>
+#include <SDL2pp/Texture.hh>
+#include <SDL2pp/Exception.hh>
 
 using namespace SDL2pp;