diff --git a/Filelist.txt b/Filelist.txt
index d3e6da78..0543ac8f 100644
--- a/Filelist.txt
+++ b/Filelist.txt
@@ -257,9 +257,9 @@ poly1305.cpp
 poly1305.h
 polynomi.cpp
 polynomi.h
-ppc_power7.cpp
-ppc_power8.cpp
-ppc_power9.cpp
+power7_ppc.cpp
+power8_ppc.cpp
+power9_ppc.cpp
 ppc_simd.cpp
 ppc_simd.h
 pssr.cpp
diff --git a/GNUmakefile b/GNUmakefile
index 0298fa69..4252d226 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1207,11 +1207,12 @@ endif
 
 # Remove unneeded arch specific files to speed build time.
 ifeq ($(IS_PPC32)$(IS_PPC64),00)
-  SRCS := $(filter-out ppc_%,$(SRCS))
+  SRCS := $(filter-out %_ppc.cpp,$(SRCS))
 endif
 ifeq ($(IS_ARM32)$(IS_ARMV8),00)
   SRCS := $(filter-out arm_%,$(SRCS))
   SRCS := $(filter-out neon_%,$(SRCS))
+  SRCS := $(filter-out %_armv4.S,$(SRCS))
 endif
 ifeq ($(IS_X86)$(IS_X64),00)
   SRCS := $(filter-out sse_%,$(SRCS))
@@ -1227,7 +1228,9 @@ ifneq ($(findstring -DCRYPTOPP_DISABLE_ASM,$(CRYPTOPP_CPPFLAGS)$(CPPFLAGS)$(CXXF
   SRCS := $(filter-out sse_%,$(SRCS))
   SRCS := $(filter-out %_sse.cpp,$(SRCS))
   SRCS := $(filter-out %_avx.cpp,$(SRCS))
+  SRCS := $(filter-out %_ppc.cpp,$(SRCS))
   SRCS := $(filter-out %_simd.cpp,$(SRCS))
+  SRCS := $(filter-out %_armv4.S,$(SRCS))
 endif
 
 # List cryptlib.cpp first, then cpu.cpp, then integer.cpp to tame C++ static initialization problems.
diff --git a/GNUmakefile-cross b/GNUmakefile-cross
index babe6adc..14171aa5 100644
--- a/GNUmakefile-cross
+++ b/GNUmakefile-cross
@@ -722,11 +722,12 @@ endif
 
 # Remove unneeded arch specific files to speed build time.
 ifeq ($(IS_PPC32)$(IS_PPC64),00)
-  SRCS := $(filter-out ppc_%,$(SRCS))
+  SRCS := $(filter-out %_ppc.cpp,$(SRCS))
 endif
 ifeq ($(IS_ARM32)$(IS_ARMV8),00)
   SRCS := $(filter-out arm_%,$(SRCS))
   SRCS := $(filter-out neon_%,$(SRCS))
+  SRCS := $(filter-out %_armv4.S,$(SRCS))
 endif
 ifeq ($(IS_X86)$(IS_X64),00)
   SRCS := $(filter-out sse_%,$(SRCS))
@@ -742,7 +743,9 @@ ifneq ($(findstring -DCRYPTOPP_DISABLE_ASM,$(CRYPTOPP_CPPFLAGS)$(CPPFLAGS)$(CXXF
   SRCS := $(filter-out sse_%,$(SRCS))
   SRCS := $(filter-out %_sse.cpp,$(SRCS))
   SRCS := $(filter-out %_avx.cpp,$(SRCS))
+  SRCS := $(filter-out %_ppc.cpp,$(SRCS))
   SRCS := $(filter-out %_simd.cpp,$(SRCS))
+  SRCS := $(filter-out %_armv4.S,$(SRCS))
 endif
 
 # List cryptlib.cpp first, then cpu.cpp, then integer.cpp to tame C++ static initialization problems.
@@ -993,10 +996,6 @@ chacha_avx.o : chacha_avx.cpp
 cham_simd.o : cham_simd.cpp
 	$(CXX) $(strip $(CPPFLAGS) $(CXXFLAGS) $(CHAM_FLAG) -c) $<
 
-# Power9 available
-darn.o : darn.cpp
-	$(CXX) $(strip $(CPPFLAGS) $(CXXFLAGS) $(DARN_FLAG) -c) $<
-
 # SSE2 on i686
 donna_sse.o : donna_sse.cpp
 	$(CXX) $(strip $(CPPFLAGS) $(CXXFLAGS) $(SSE2_FLAG) -c) $<
diff --git a/ppc_power7.cpp b/power7_ppc.cpp
similarity index 100%
rename from ppc_power7.cpp
rename to power7_ppc.cpp
diff --git a/ppc_power8.cpp b/power8_ppc.cpp
similarity index 100%
rename from ppc_power8.cpp
rename to power8_ppc.cpp
diff --git a/ppc_power9.cpp b/power9_ppc.cpp
similarity index 100%
rename from ppc_power9.cpp
rename to power9_ppc.cpp