diff --git a/main/Light.h b/main/Light.h
index 26cd0ec..280fe0e 100644
--- a/main/Light.h
+++ b/main/Light.h
@@ -31,5 +31,7 @@ class Light
         Color m_specular_color;
 };
 
+#include "PointLight.h"
+
 #endif
 
diff --git a/main/Scene-load.cc b/main/Scene-load.cc
index be07aa8..0eaa465 100644
--- a/main/Scene-load.cc
+++ b/main/Scene-load.cc
@@ -2,7 +2,6 @@
 #include <iostream>
 #include "Scene.h"
 #include "Light.h"
-#include "PointLight.h"
 #include "parser/parser.h"
 #include "parser/nodes.h"
 
diff --git a/main/Scene.cc b/main/Scene.cc
index 10059b2..f635bc0 100644
--- a/main/Scene.cc
+++ b/main/Scene.cc
@@ -12,12 +12,9 @@
 #include "BMP.h"
 #include "util/Color.h"
 #include "shapes/Shape.h"
-#include "PointLight.h"
+#include "Light.h"
 #include "Lighting.h"
 
-#include "parser/parser.h"
-#include "parser/nodes.h"
-
 using namespace std;
 
 Scene::Scene(const map<string, const char *> & options,
diff --git a/main/Scene.h b/main/Scene.h
index 6739a50..2666573 100644
--- a/main/Scene.h
+++ b/main/Scene.h
@@ -14,6 +14,7 @@
 #include "Light.h"
 
 #include "parser/parser.h"
+#include "parser/nodes.h"
 
 #define SCENE_MAX_TRANSPARENT_HITS 8
 #define SCENE_TRANSPARENCY_THRESHOLD 0.01