Inclusion hierarchy fixed

RayTracer/camera/Hit.h

 #pragma once
 
 #include "../material/Material.h"
-#include "../tools/Vec3.h"
 #include "Ray.h"
 
 namespace cam {

RayTracer/material/DiffuseMaterial.cpp

 #include "DiffuseMaterial.h"
 
-#include "../tools/Vec3.h"
 #include "texture/Constant.h"
 
 namespace material {

RayTracer/material/DiffuseMaterial.h

 #pragma once
 
-#include "../sampling/Sampler.h"
 #include "Material.h"
-#include "texture/Constant.h"
 
 namespace material {
 class DiffuseMaterial : public Material {

RayTracer/material/Material.h

@@ -3,7 +3,6 @@
 #include <random>
 
 #include "../sampling/Sampler.h"
-#include "../tools/Vec3.h"
 
 namespace material {
 

RayTracer/material/texture/Constant.h

 #pragma once
 
 #include "../../sampling/Sampler.h"
-#include "../../tools/Vec3.h"
 
 namespace material {
 class Constant : public util::Sampler {

RayTracer/sampling/Image.h

@@ -3,7 +3,6 @@
 #include <vector>
 
 #include "../camera/CamObs.h"
-#include "../tools/Vec3.h"
 #include "Sampler.h"
 
 namespace util {

RayTracer/sampling/Scene.h

 #pragma once
 
 #include "../camera/CamObs.h"
-#include "../camera/Ray.h"
-#include "../shape/Group.h"
-#include "../tools/Vec3.h"
+#include "../shape/Shape.h"
 #include "Sampler.h"
 
 class Scene : public util::Sampler {

RayTracer/shape/Group.h

@@ -2,8 +2,6 @@
 
 #include <vector>
 
-#include "../camera/Hit.h"
-#include "../camera/Ray.h"
 #include "../tools/Mat4.h"
 #include "../tools/Transformation.h"
 #include "Shape.h"

RayTracer/shape/Shape.h

@@ -2,6 +2,7 @@
 
 #include "../camera/Hit.h"
 #include "../camera/Ray.h"
+#include "../tools/AxisAlignedBoundingBox.h"
 
 namespace shapes {
 class Shape {

RayTracer/tools/Mat4.cpp

 #include "Mat4.h"
 
+#define _USE_MATH_DEFINES
+
+#include <math.h>
+
 namespace util {
 // Constructor
 Mat4::Mat4(std::array<float, 16> arr) : arr(arr){};

RayTracer/tools/Mat4.h

 #pragma once
 
-#define _USE_MATH_DEFINES
-
-#include <math.h>
-
 #include <array>
 
 #include "Vec3.h"

RayTracer/tools/Threadpool.cpp

 #include "Threadpool.h"
 
+#include <thread>
+
 namespace util {
 
 Threadpool::Threadpool(size_t n) : alive(true) {

RayTracer/tools/Threadpool.h

@@ -2,10 +2,8 @@
 
 #include <condition_variable>
 #include <functional>
-#include <iostream>
 #include <mutex>
 #include <queue>
-#include <thread>
 
 namespace util {
 

RayTracer/tools/Vec3.h

 #pragma once
 
 #include <array>
-#include <cassert>
 #include <iostream>
 
 namespace util {