diff --git a/cpp.mk b/cpp.mk
index da30ace0..06a633f5 100644
--- a/cpp.mk
+++ b/cpp.mk
@@ -9,7 +9,7 @@ COMMON_C_FLAGS=-masm=intel -I../../tstl/include/ -I../printf/include/ -I../tstl/
 
 # Activate Stack Smashing Protection
 COMMON_C_FLAGS += -fstack-protector
-COMMON_C_FLAGS += -Iacpica/source/include
+COMMON_C_FLAGS += -isystem acpica/source/include
 
 # Add more flags for C++
 COMMON_CPP_FLAGS=$(COMMON_C_FLAGS) -std=c++11 -fno-rtti
diff --git a/kernel/include/acpica.hpp b/kernel/include/acpica.hpp
index 273495c1..15798752 100644
--- a/kernel/include/acpica.hpp
+++ b/kernel/include/acpica.hpp
@@ -17,8 +17,8 @@ extern "C" {
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-function" //TODO Does not work
-#include "acpi.h"
-#include "accommon.h"
+#include <acpi.h>
+#include <accommon.h>
 #pragma GCC diagnostic pop
 
 } //end of extern "C"