diff --git a/criu/arch/aarch64/parasite-head.S b/criu/arch/aarch64/parasite-head.S
index 7a359061c..7e82c43be 100644
--- a/criu/arch/aarch64/parasite-head.S
+++ b/criu/arch/aarch64/parasite-head.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
 #include "parasite.h"
 
 	.section .head.text, "ax"
diff --git a/criu/arch/aarch64/syscalls/syscall-common.S b/criu/arch/aarch64/syscalls/syscall-common.S
index 81ec20f55..aeb89ea88 100644
--- a/criu/arch/aarch64/syscalls/syscall-common.S
+++ b/criu/arch/aarch64/syscalls/syscall-common.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
 
 syscall_common:
 	svc	#0
diff --git a/criu/arch/arm/parasite-head.S b/criu/arch/arm/parasite-head.S
index 7b41f56dd..77eef32c0 100644
--- a/criu/arch/arm/parasite-head.S
+++ b/criu/arch/arm/parasite-head.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
 #include "parasite.h"
 
 	.section .head.text, "ax"
diff --git a/criu/arch/arm/syscalls/syscall-common.S b/criu/arch/arm/syscalls/syscall-common.S
index 0e4367069..9ac53bdd2 100644
--- a/criu/arch/arm/syscalls/syscall-common.S
+++ b/criu/arch/arm/syscalls/syscall-common.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
 
 @ We use the register R8 unlike libc that uses R12.
 @ This avoids corruption of the register by the stub
diff --git a/criu/arch/ppc64/memcmp_64.S b/criu/arch/ppc64/memcmp_64.S
index 16c2b0cd8..fd1bfb97e 100644
--- a/criu/arch/ppc64/memcmp_64.S
+++ b/criu/arch/ppc64/memcmp_64.S
@@ -10,7 +10,7 @@
  * --
  * Copied form the linux file arch/powerpc/lib/memcmp_64.S
  */
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
 
 #define off8	r6
 #define off16	r7
diff --git a/criu/arch/ppc64/memcpy_power7.S b/criu/arch/ppc64/memcpy_power7.S
index a29d0e8f2..e66572324 100644
--- a/criu/arch/ppc64/memcpy_power7.S
+++ b/criu/arch/ppc64/memcpy_power7.S
@@ -21,7 +21,7 @@
  * Copied from the kernel file arch/powerpc/lib/memcpy_power7.S
  * Altivec support has been removed so we don't taint restored process.
  */
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
 
 /*
  * When building the parasite code, the compiler may rely on the C library
diff --git a/criu/arch/ppc64/parasite-head.S b/criu/arch/ppc64/parasite-head.S
index a1c189fe9..e24c338a3 100644
--- a/criu/arch/ppc64/parasite-head.S
+++ b/criu/arch/ppc64/parasite-head.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
 #include "parasite.h"
 
 	.section .head.text
diff --git a/criu/arch/ppc64/syscalls/syscall-common-ppc64.S b/criu/arch/ppc64/syscalls/syscall-common-ppc64.S
index e18d6adf4..6d2a8d285 100644
--- a/criu/arch/ppc64/syscalls/syscall-common-ppc64.S
+++ b/criu/arch/ppc64/syscalls/syscall-common-ppc64.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
 #include <asm/unistd.h>		/* for __NR_ipc */
 
 #define SYSCALL(name, opcode)		\
diff --git a/criu/arch/ppc64/vdso-trampoline.S b/criu/arch/ppc64/vdso-trampoline.S
index e910e7ab9..116fc3abb 100644
--- a/criu/arch/ppc64/vdso-trampoline.S
+++ b/criu/arch/ppc64/vdso-trampoline.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
 
 	.section	.text
 
diff --git a/criu/arch/x86/memcpy.S b/criu/arch/x86/memcpy.S
index 3d6cb196b..c8f7555fc 100644
--- a/criu/arch/x86/memcpy.S
+++ b/criu/arch/x86/memcpy.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
 
 /* The following code is taken from Linux kernel (arch/x86/lib/memcpy_64.S).
  * There are 3 implementations in there, we use the one that relies on
diff --git a/criu/arch/x86/parasite-head.S b/criu/arch/x86/parasite-head.S
index 5fb00a5c8..e92e60d7f 100644
--- a/criu/arch/x86/parasite-head.S
+++ b/criu/arch/x86/parasite-head.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
 #include "parasite.h"
 
 	.section .head.text, "ax"
diff --git a/criu/arch/x86/syscalls/syscall-common-x86-32.S b/criu/arch/x86/syscalls/syscall-common-x86-32.S
index ae6d594dc..c1a726123 100644
--- a/criu/arch/x86/syscalls/syscall-common-x86-32.S
+++ b/criu/arch/x86/syscalls/syscall-common-x86-32.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
 
 #define SYSCALL(name, opcode)		\
 	ENTRY(name);			\
diff --git a/criu/arch/x86/syscalls/syscall-common-x86-64.S b/criu/arch/x86/syscalls/syscall-common-x86-64.S
index b93c31288..74465c302 100644
--- a/criu/arch/x86/syscalls/syscall-common-x86-64.S
+++ b/criu/arch/x86/syscalls/syscall-common-x86-64.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
 
 #define SYSCALL(name, opcode)		\
 	ENTRY(name);			\
diff --git a/criu/arch/aarch64/include/asm/linkage.h b/include/common/arch/aarch64/asm/linkage.h
similarity index 100%
rename from criu/arch/aarch64/include/asm/linkage.h
rename to include/common/arch/aarch64/asm/linkage.h
diff --git a/criu/arch/arm/include/asm/linkage.h b/include/common/arch/arm/asm/linkage.h
similarity index 100%
rename from criu/arch/arm/include/asm/linkage.h
rename to include/common/arch/arm/asm/linkage.h
diff --git a/criu/arch/ppc64/include/asm/linkage.h b/include/common/arch/ppc64/asm/linkage.h
similarity index 100%
rename from criu/arch/ppc64/include/asm/linkage.h
rename to include/common/arch/ppc64/asm/linkage.h
diff --git a/criu/arch/x86/include/asm/linkage.h b/include/common/arch/x86/asm/linkage.h
similarity index 100%
rename from criu/arch/x86/include/asm/linkage.h
rename to include/common/arch/x86/asm/linkage.h