diff --git a/Makefile.am b/Makefile.am
index d7d58ccbee..a0043c2e4a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -850,6 +850,8 @@ libbasic_la_SOURCES = \
 	src/basic/exit-status.h \
 	src/basic/virt.c \
 	src/basic/virt.h \
+	src/basic/architecture.c \
+	src/basic/architecture.h \
 	src/basic/smack-util.c \
 	src/basic/smack-util.h \
 	src/basic/device-nodes.c \
@@ -963,8 +965,6 @@ libshared_la_SOURCES = \
 	src/shared/initreq.h \
 	src/shared/dns-domain.c \
 	src/shared/dns-domain.h \
-	src/shared/architecture.c \
-	src/shared/architecture.h \
 	src/shared/efivars.c \
 	src/shared/efivars.h \
 	src/shared/fstab-util.c \
diff --git a/src/shared/architecture.c b/src/basic/architecture.c
similarity index 100%
rename from src/shared/architecture.c
rename to src/basic/architecture.c
diff --git a/src/shared/architecture.h b/src/basic/architecture.h
similarity index 100%
rename from src/shared/architecture.h
rename to src/basic/architecture.h