diff --git a/CMakeLists.txt b/CMakeLists.txt
index 241d5c51..b091812f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,8 +30,6 @@
 cmake_minimum_required(VERSION 2.8.11)
 project(hpipm)
 
-set(CMAKE_VERBOSE_MAKEFILE ON)
-
 # Target architecture
 set(TARGET GENERIC)
 
@@ -160,10 +158,12 @@ file(GLOB TREE_OCP_QP_SRC
 	${PROJECT_SOURCE_DIR}/tree_ocp_qp/d_tree_ocp_qp_sol.c
 	${PROJECT_SOURCE_DIR}/tree_ocp_qp/d_tree_ocp_qp_kkt.c
 	${PROJECT_SOURCE_DIR}/tree_ocp_qp/d_tree_ocp_qp_ipm.c
+	${PROJECT_SOURCE_DIR}/tree_ocp_qp/d_tree_ocp_qp_res.c
 	${PROJECT_SOURCE_DIR}/tree_ocp_qp/s_tree_ocp_qp.c
 	${PROJECT_SOURCE_DIR}/tree_ocp_qp/s_tree_ocp_qp_sol.c
 	${PROJECT_SOURCE_DIR}/tree_ocp_qp/s_tree_ocp_qp_kkt.c
 	${PROJECT_SOURCE_DIR}/tree_ocp_qp/s_tree_ocp_qp_ipm.c
+	${PROJECT_SOURCE_DIR}/tree_ocp_qp/s_tree_ocp_qp_res.c
 	)
 
 set(HPIPM_SRC ${COND_SRC} ${DENSE_QP_SRC} ${IPM_CORE_SRC} ${OCP_QP_SRC} ${TREE_OCP_QP_SRC})
diff --git a/include/hpipm_d_cond.h b/include/hpipm_d_cond.h
index 60b833b5..978dc8a8 100644
--- a/include/hpipm_d_cond.h
+++ b/include/hpipm_d_cond.h
@@ -34,10 +34,10 @@
 
 
 
-#include <blasfeo_target.h>
-#include <blasfeo_common.h>
+#include "blasfeo_common.h"
 
 #include "hpipm_d_dense_qp.h"
+#include "hpipm_d_dense_qp_dim.h"
 #include "hpipm_d_dense_qp_sol.h"
 #include "hpipm_d_ocp_qp.h"
 #include "hpipm_d_ocp_qp_dim.h"
diff --git a/include/hpipm_d_cond_aux.h b/include/hpipm_d_cond_aux.h
index 8f901673..d907e22a 100644
--- a/include/hpipm_d_cond_aux.h
+++ b/include/hpipm_d_cond_aux.h
@@ -34,10 +34,9 @@
 
 
 
-#include <blasfeo_target.h>
-#include <blasfeo_common.h>
-
+#include "blasfeo_common.h"
 
+#include "hpipm_d_cond.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/hpipm_s_cond.h b/include/hpipm_s_cond.h
index 8a532882..cb7c344a 100644
--- a/include/hpipm_s_cond.h
+++ b/include/hpipm_s_cond.h
@@ -34,9 +34,14 @@
 
 
 
-#include <blasfeo_target.h>
-#include <blasfeo_common.h>
-
+#include "blasfeo_common.h"
+
+#include "hpipm_s_dense_qp.h"
+#include "hpipm_s_dense_qp_dim.h"
+#include "hpipm_s_dense_qp_sol.h"
+#include "hpipm_s_ocp_qp.h"
+#include "hpipm_s_ocp_qp_dim.h"
+#include "hpipm_s_ocp_qp_sol.h"
 
 
 #ifdef __cplusplus
diff --git a/include/hpipm_s_cond_aux.h b/include/hpipm_s_cond_aux.h
index 304dd784..bc51392f 100644
--- a/include/hpipm_s_cond_aux.h
+++ b/include/hpipm_s_cond_aux.h
@@ -34,8 +34,9 @@
 
 
 
-#include <blasfeo_target.h>
-#include <blasfeo_common.h>
+#include "blasfeo_common.h"
+
+#include "hpipm_s_cond.h"