diff --git a/compel/plugins/include/uapi/plugin-shmem.h b/compel/plugins/include/uapi/shmem.h
similarity index 100%
rename from compel/plugins/include/uapi/plugin-shmem.h
rename to compel/plugins/include/uapi/shmem.h
diff --git a/compel/plugins/include/uapi/plugin-std.h b/compel/plugins/include/uapi/std.h
similarity index 100%
rename from compel/plugins/include/uapi/plugin-std.h
rename to compel/plugins/include/uapi/std.h
diff --git a/compel/plugins/shmem/shmem.c b/compel/plugins/shmem/shmem.c
index 1489df68e..c2d56c270 100644
--- a/compel/plugins/shmem/shmem.c
+++ b/compel/plugins/shmem/shmem.c
@@ -1,7 +1,7 @@
 #include <sys/mman.h>
 
 #include <compel/plugins.h>
-#include <compel/plugins/plugin-shmem.h>
+#include <compel/plugins/shmem.h>
 #include <compel/plugins/std/syscall.h>
 #include "shmem.h"
 #include "std-priv.h"
diff --git a/compel/plugins/std/fds.c b/compel/plugins/std/fds.c
index eaa12713f..499102788 100644
--- a/compel/plugins/std/fds.c
+++ b/compel/plugins/std/fds.c
@@ -1,7 +1,7 @@
 #include <errno.h>
 
 #include <compel/plugins.h>
-#include <compel/plugins/plugin-std.h>
+#include <compel/plugins/std.h>
 
 #include "std-priv.h"
 
diff --git a/compel/plugins/std/infect.c b/compel/plugins/std/infect.c
index 5f195f19c..2d3aa3df8 100644
--- a/compel/plugins/std/infect.c
+++ b/compel/plugins/std/infect.c
@@ -1,4 +1,4 @@
-#include <compel/plugins/plugin-std.h>
+#include <compel/plugins/std.h>
 
 #include "common/scm.h"
 #include "common/compiler.h"
diff --git a/compel/plugins/std/std.c b/compel/plugins/std/std.c
index ec04665a3..82f51eac4 100644
--- a/compel/plugins/std/std.c
+++ b/compel/plugins/std/std.c
@@ -1,7 +1,7 @@
 #include <sys/types.h>
 
 #include <compel/plugins.h>
-#include <compel/plugins/plugin-std.h>
+#include <compel/plugins/std.h>
 
 #include "asm/prologue.h"
 
diff --git a/compel/test/infect/parasite.c b/compel/test/infect/parasite.c
index 17bf3d621..bdbe72229 100644
--- a/compel/test/infect/parasite.c
+++ b/compel/test/infect/parasite.c
@@ -1,6 +1,6 @@
 #include <errno.h>
 
-#include <compel/plugins/plugin-std.h>
+#include <compel/plugins/std.h>
 
 /*
  * Stubs for std compel plugin.