diff --git a/include/fmpi.h b/include/fmpi.h
index 682ff2da86a9b5dad2961ff15cf065704bd2fb48..41260c196adfac3855134314175e34ec47c555e7 100644
--- a/include/fmpi.h
+++ b/include/fmpi.h
@@ -4,6 +4,8 @@
  * @license{
  * BSD Zero Clause License
  *
+ * Copyright (c) 2022 by Raphael Bach
+ *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted.
  *
@@ -25,13 +27,10 @@
     INCLUDE
 ==============================================================================*/
 // Internal
-#include "fmpi_ctx.h"
-#include "fmpi_futhark.h"
-#include "fmpi_mpi.h"
+#include "fmpi_core.h"
+#include "fmpi_data.h"
 #include "fmpi_reduce.h"
-/*==============================================================================
-    PUBLIC FUNCTION
-==============================================================================*/
+#include "fmpi_task.h"
 /*==============================================================================
     GUARD
 ==============================================================================*/