diff --git a/src/emu/nanos6/breakdown.c b/src/emu/nanos6/breakdown.c
index f11093d..641fa7f 100644
--- a/src/emu/nanos6/breakdown.c
+++ b/src/emu/nanos6/breakdown.c
@@ -3,12 +3,32 @@
 
 //#define ENABLE_DEBUG
 
-#include "nanos6_priv.h"
-
+#include "breakdown.h"
+#include <stdint.h>
+#include <stdio.h>
+#include "bay.h"
+#include "chan.h"
+#include "common.h"
 #include "cpu.h"
+#include "emu.h"
+#include "emu_args.h"
 #include "emu_prv.h"
+#include "extend.h"
+#include "model_cpu.h"
+#include "mux.h"
+#include "nanos6_priv.h"
 #include "proc.h"
+#include "pv/pcf.h"
+#include "pv/prf.h"
+#include "pv/prv.h"
+#include "pv/pvt.h"
+#include "recorder.h"
+#include "sort.h"
+#include "system.h"
+#include "task.h"
 #include "track.h"
+#include "value.h"
+
 
 static int
 create_cpu(struct bay *bay, struct breakdown_cpu *bcpu, int64_t gindex)
diff --git a/src/emu/nanos6/breakdown.h b/src/emu/nanos6/breakdown.h
index 7458467..d54b92c 100644
--- a/src/emu/nanos6/breakdown.h
+++ b/src/emu/nanos6/breakdown.h
@@ -32,10 +32,10 @@
  *                 +------+       +-----+
  */
 
-#include "mux.h"
+#include <stdint.h>
 #include "chan.h"
+#include "mux.h"
 #include "sort.h"
-#include "pv/pvt.h"
 
 struct breakdown_cpu {
 	struct mux  mux0;
diff --git a/src/emu/nanos6/setup.c b/src/emu/nanos6/setup.c
index e58dcd0..0bc4d85 100644
--- a/src/emu/nanos6/setup.c
+++ b/src/emu/nanos6/setup.c
@@ -16,6 +16,7 @@
 #include "model_cpu.h"
 #include "model_pvt.h"
 #include "model_thread.h"
+#include "mux.h"
 #include "proc.h"
 #include "pv/pcf.h"
 #include "pv/prv.h"
diff --git a/src/emu/sort.c b/src/emu/sort.c
index 67e1498..92170d8 100644
--- a/src/emu/sort.c
+++ b/src/emu/sort.c
@@ -4,6 +4,9 @@
 //#define ENABLE_DEBUG
 
 #include "sort.h"
+#include <stdlib.h>
+#include <string.h>
+#include "bay.h"
 #include "chan.h"
 #include "value.h"
 
diff --git a/src/emu/sort.h b/src/emu/sort.h
index 0c3d44a..7860701 100644
--- a/src/emu/sort.h
+++ b/src/emu/sort.h
@@ -5,9 +5,9 @@
 #define SORT_H
 
 #include <stdint.h>
-#include "bay.h"
-
-struct sort;
+#include "common.h"
+struct bay;
+struct chan;
 
 struct sort_input {
 	int64_t index;
diff --git a/test/unit/sort.c b/test/unit/sort.c
index 6c3bb3b..17e3506 100644
--- a/test/unit/sort.c
+++ b/test/unit/sort.c
@@ -2,6 +2,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "emu/sort.h"
+#include "bay.h"
 #include "chan.h"
 #include "common.h"
 #include "unittest.h"
diff --git a/test/unit/sort_replace.c b/test/unit/sort_replace.c
index abf633e..5b9af30 100644
--- a/test/unit/sort_replace.c
+++ b/test/unit/sort_replace.c
@@ -1,9 +1,11 @@
 /* Copyright (c) 2021-2023 Barcelona Supercomputing Center (BSC)
  * SPDX-License-Identifier: GPL-3.0-or-later */
 
-#include "emu/sort.h"
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 #include "common.h"
-#include "unittest.h"
+#include "emu/sort.h"
 
 static int64_t
 randint(void)