diff --git a/Makefile b/Makefile
index ff39ed0..1445944 100644
--- a/Makefile
+++ b/Makefile
@@ -136,7 +136,8 @@ PERF_TEST_SOURCES= $(wildcard perf_tests/*.cpp) $(wildcard perf_tests/*/*.cpp) $
 
 PERF_TEST_OBJECTS= $(addprefix $(BUILD_PERF_TEST_DIR)/,$(notdir $(PERF_TEST_SOURCES:.cpp=.o))) $(filter-out $(BUILD_DIR)/$(TARGET).o,$(OBJECTS))
 
-VPATH= $(dir $(wildcard src/*/ src/*/*/)) $(dir $(wildcard tests/*/ tests/*/*/)) $(dir $(wildcard perf_tests/*/ perf_tests/*/*/))
+# VPATH= $(dir $(wildcard src/*/ src/*/*/)) $(dir $(wildcard tests/*/ tests/*/*/)) $(dir $(wildcard perf_tests/*/ perf_tests/*/*/))
+VPATH := $(sort $(dir $(SOURCES) $(TEST_SOURCES) $(PERF_TEST_SOURCES)))
 
 ###############################################################################
 ##  MAIN TARGETS                                                             ##
diff --git a/src/Transformer/SpectrumCircleTransformer.cpp b/src/Transformer/SpectrumCircleTransformer.cpp
index d11630b..d5b041c 100644
--- a/src/Transformer/SpectrumCircleTransformer.cpp
+++ b/src/Transformer/SpectrumCircleTransformer.cpp
@@ -10,6 +10,8 @@
 #include "Utils/NcursesUtils.h"
 #include "Transformer/SpectrumCircleTransformer.h"
 
+#include <cmath>
+
 namespace
 {
 }