diff --git a/src/qvi-thread.cc b/src/qvi-thread.cc
index 9dffb44..e97b027 100644
--- a/src/qvi-thread.cc
+++ b/src/qvi-thread.cc
@@ -17,9 +17,9 @@
  * @file qvi-thread.cc
  */
 
-#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-thread.h"
 #include "qvi-group.h"
+#include "qvi-bbuff.h"
 #include "qvi-utils.h"
 #ifdef OPENMP_FOUND
 #include <omp.h>
@@ -76,6 +76,20 @@ struct qvi_thread_s {
     }
 };
 
+int
+qvi_thread_new(
+    qvi_thread_t **th
+) {
+    return qvi_new(th);
+}
+
+void
+qvi_thread_free(
+    qvi_thread_t **th
+) {
+    qvi_delete(th);
+}
+
 /**
  * Copies contents of internal structure from src to dst.
  */
@@ -99,36 +113,6 @@ next_group_tab_id(
     return qvi_group_t::next_id(gid);
 }
 
-/**
- *
- */
-int
-qvi_thread_new(
-    qvi_thread_t **th
-) {
-    return qvi_new(th);
-}
-
-/**
- *
- */
-void
-qvi_thread_free(
-    qvi_thread_t **th
-) {
-    qvi_delete(th);
-}
-
-/**
- *
- */
-int
-qvi_thread_finalize(
-    qvi_thread_t *
-) {
-    return QV_SUCCESS;
-}
-
 /**
  *
  */
diff --git a/src/qvi-thread.h b/src/qvi-thread.h
index e54ad0a..9ac2f91 100644
--- a/src/qvi-thread.h
+++ b/src/qvi-thread.h
@@ -17,11 +17,6 @@
 #define QVI_THREAD_H
 
 #include "qvi-common.h"
-#include "qvi-bbuff.h" // IWYU pragma: keep
-
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 // Forward declarations.
 
@@ -61,91 +56,49 @@ typedef struct qv_layout_s {
   int stride;
 } qv_layout_t;
 */
-/**
- *
- */
+
 int
 qvi_thread_new(
     qvi_thread_t **th
 );
 
-/**
- *
- */
 void
 qvi_thread_free(
     qvi_thread_t **th
 );
 
-/**
- *
- */
-int
-qvi_thread_finalize(
-    qvi_thread_t *th
-);
-
-/**
- *
- */
-int
-qvi_thread_node_barrier(
-    qvi_thread_t *th
-);
-
-/**
- *
- */
 int
 qvi_thread_group_size(
     const qvi_thread_group_t *group
 );
 
-/**
- *
- */
 int
 qvi_thread_group_new(
     qvi_thread_group_t **group
 );
 
-/**
- *
- */
 void
 qvi_thread_group_free(
     qvi_thread_group_t **group
 );
 
-/**
- *
- */
 int
 qvi_thread_group_id(
     const qvi_thread_group_t *group
 );
 
-/**
- *
- */
 int
 qvi_thread_group_create(
     qvi_thread_t *proc,
     qvi_thread_group_t **group
 );
 
-/**
- *
- */
 int
 qvi_thread_group_create_single(
     qvi_thread_t *proc,
     qvi_thread_group_t **group
 );
 
-/**
- *
- */
 int
 qvi_thread_group_create_from_split(
     qvi_thread_t *th,
@@ -155,9 +108,6 @@ qvi_thread_group_create_from_split(
     qvi_thread_group_t **child
 );
 
-/**
- *
- */
 int
 qvi_thread_group_gather_bbuffs(
     qvi_thread_group_t *group,
@@ -167,9 +117,6 @@ qvi_thread_group_gather_bbuffs(
     int *shared_alloc
 );
 
-/**
- *
- */
 int
 qvi_thread_group_scatter_bbuffs(
     qvi_thread_group_t *group,
@@ -178,10 +125,6 @@ qvi_thread_group_scatter_bbuffs(
     qvi_bbuff_t **rxbuff
 );
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
 
 /*