diff --git a/attributes/Makefile.am b/attributes/Makefile.am
index c5b08a0b73608bbfcf1f6d80a9745f3669fe5fa7..73bc1424972400c2d116049d4de017d05de19ae9 100644
--- a/attributes/Makefile.am
+++ b/attributes/Makefile.am
@@ -40,7 +40,8 @@ BUILT_SOURCES = maestro-core-yaml.h ecmwf-yaml.h
 libattributes_la_CPPFLAGS = \
 		-I$(top_srcdir) \
 		-I$(top_srcdir)/protocols \
-		-I$(top_srcdir)/deps/mamba \
+		-I$(top_srcdir)/deps/mamba/common \
+		-I$(top_srcdir)/deps/mamba/memory \
                 -I$(top_srcdir)/include \
 		-I$(top_srcdir)/deps/libyaml/include \
 		-I$(top_srcdir)/deps/libcyaml/include 
diff --git a/include/maestro/attributes.h b/include/maestro/attributes.h
index 3c4f4d1bb255b5c280e2d04012a58f2396afc852..c1d5cdff31d7aae08738277f4a81698205b57c58 100644
--- a/include/maestro/attributes.h
+++ b/include/maestro/attributes.h
@@ -45,7 +45,7 @@ extern "C" {
 #include <stdbool.h>
 
 #include "maestro/status.h"
-#include "deps/mamba/common/mmb_layout.h"
+#include "mamba.h"
 
 /**@addtogroup MSTRO_Core
  **@{