diff --git a/src/plugins/task/affinity/Makefile.am b/src/plugins/task/affinity/Makefile.am
index 98ce705c6a6c8dbb70711714b0b231f41c55c62b..c3eb2f7fbc1f518bf5eafec74f46a4c05255ea84 100644
--- a/src/plugins/task/affinity/Makefile.am
+++ b/src/plugins/task/affinity/Makefile.am
@@ -10,7 +10,7 @@ if HAVE_SCHED_SETAFFINITY
 pkglib_LTLIBRARIES = task_affinity.la
 task_affinity_la_SOURCES = 	\
 	affinity.c affinity.h \
-	cpuset.c cpuset.h \
+	cpuset.c \
 	dist_tasks.c dist_tasks.h \
 	numa.c \
 	schedutils.c \
@@ -21,7 +21,7 @@ else
 pkglib_LTLIBRARIES =
 EXTRA_task_affinity_la_SOURCES = \
 	affinity.c affinity.h \
-	cpuset.c cpuset.h \
+	cpuset.c \
 	dist_tasks.c dist_tasks.h \
 	numa.c \
 	schedutils.c \
diff --git a/src/plugins/task/affinity/Makefile.in b/src/plugins/task/affinity/Makefile.in
index e21618aeb677cc86f20a416f51a2f33f501a64b3..6cb7f7c88c9f929356e0e1a816cf853013183b93 100644
--- a/src/plugins/task/affinity/Makefile.in
+++ b/src/plugins/task/affinity/Makefile.in
@@ -79,15 +79,14 @@ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 @HAVE_SCHED_SETAFFINITY_TRUE@task_affinity_la_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la
 am__task_affinity_la_SOURCES_DIST = affinity.c affinity.h cpuset.c \
-	cpuset.h dist_tasks.c dist_tasks.h numa.c schedutils.c \
-	task_affinity.c
+	dist_tasks.c dist_tasks.h numa.c schedutils.c task_affinity.c
 @HAVE_SCHED_SETAFFINITY_TRUE@am_task_affinity_la_OBJECTS =  \
 @HAVE_SCHED_SETAFFINITY_TRUE@	affinity.lo cpuset.lo \
 @HAVE_SCHED_SETAFFINITY_TRUE@	dist_tasks.lo numa.lo \
 @HAVE_SCHED_SETAFFINITY_TRUE@	schedutils.lo task_affinity.lo
 am__EXTRA_task_affinity_la_SOURCES_DIST = affinity.c affinity.h \
-	cpuset.c cpuset.h dist_tasks.c dist_tasks.h numa.c \
-	schedutils.c task_affinity.c
+	cpuset.c dist_tasks.c dist_tasks.h numa.c schedutils.c \
+	task_affinity.c
 task_affinity_la_OBJECTS = $(am_task_affinity_la_OBJECTS)
 @HAVE_SCHED_SETAFFINITY_TRUE@am_task_affinity_la_rpath = -rpath \
 @HAVE_SCHED_SETAFFINITY_TRUE@	$(pkglibdir)
@@ -299,7 +298,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
 @HAVE_SCHED_SETAFFINITY_TRUE@pkglib_LTLIBRARIES = task_affinity.la
 @HAVE_SCHED_SETAFFINITY_TRUE@task_affinity_la_SOURCES = \
 @HAVE_SCHED_SETAFFINITY_TRUE@	affinity.c affinity.h \
-@HAVE_SCHED_SETAFFINITY_TRUE@	cpuset.c cpuset.h \
+@HAVE_SCHED_SETAFFINITY_TRUE@	cpuset.c \
 @HAVE_SCHED_SETAFFINITY_TRUE@	dist_tasks.c dist_tasks.h \
 @HAVE_SCHED_SETAFFINITY_TRUE@	numa.c \
 @HAVE_SCHED_SETAFFINITY_TRUE@	schedutils.c \
@@ -309,7 +308,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
 @HAVE_SCHED_SETAFFINITY_TRUE@task_affinity_la_LIBADD = $(top_builddir)/src/common/libcommon.la
 @HAVE_SCHED_SETAFFINITY_FALSE@EXTRA_task_affinity_la_SOURCES = \
 @HAVE_SCHED_SETAFFINITY_FALSE@	affinity.c affinity.h \
-@HAVE_SCHED_SETAFFINITY_FALSE@	cpuset.c cpuset.h \
+@HAVE_SCHED_SETAFFINITY_FALSE@	cpuset.c \
 @HAVE_SCHED_SETAFFINITY_FALSE@	dist_tasks.c dist_tasks.h \
 @HAVE_SCHED_SETAFFINITY_FALSE@	numa.c \
 @HAVE_SCHED_SETAFFINITY_FALSE@	schedutils.c \