diff --git a/cpp/Makefile b/cpp/Makefile
index bcffd1cbe550055ad9bdc9b98855dafa23afd236..8ffa5bd74bcdec1dcdf1f8286bf75dada688fdfd 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -1,9 +1,14 @@
 #CXX=clang++
 
-INCLUDES += -I.
-
-CXXFLAGS += -std=c++14 -O3 -Wall -Wextra -Wfatal-errors -Werror -pedantic -Wno-deprecated-declarations $(INCLUDES)
-
+INCLUDES += -I. \
+			-I/usr/include/eigen3
+
+CXXFLAGS += -std=c++14 -O3
+CXXFLAGS += -Wall -Wextra -Wfatal-errors -Werror -pedantic -Wno-deprecated-declarations
+CXXFLAGS += $(INCLUDES)
+# Disable Eigen's debug info and disable a warning generated by Eigen
+CXXFLAGS += -DNDEBUG
+CXXFLAGS += -Wno-int-in-bool-context
 
 all: switchchain switchchain_exponent switchchain_initialtris switchchain_dsp