diff --git a/arch/SConscript b/arch/SConscript
index b4b7a1ddb..380cda307 100644
--- a/arch/SConscript
+++ b/arch/SConscript
@@ -48,8 +48,6 @@ isa_switch_hdrs = Split('''
 	isa_traits.hh
 	tlb.hh
 	process.hh
-	aout_machdep.h
-	ecoff_machdep.h
 	arguments.hh
 	stacktrace.hh
 	vtophys.hh
diff --git a/base/loader/exec_aout.h b/base/loader/exec_aout.h
index 3863a92fb..eed44baee 100644
--- a/base/loader/exec_aout.h
+++ b/base/loader/exec_aout.h
@@ -55,6 +55,7 @@
         (N_GETMAGIC(ex) != NMAGIC && N_GETMAGIC(ex) != OMAGIC && \
         N_GETMAGIC(ex) != ZMAGIC)
 
-#include "arch/aout_machdep.h"
+//Only alpha will be able to load aout for now
+#include "arch/alpha/aout_machdep.h"
 
 #endif /* !_SYS_EXEC_AOUT_H_ */
diff --git a/base/loader/exec_ecoff.h b/base/loader/exec_ecoff.h
index 79cd22a6e..555589806 100644
--- a/base/loader/exec_ecoff.h
+++ b/base/loader/exec_ecoff.h
@@ -37,7 +37,8 @@
 #ifndef	_SYS_EXEC_ECOFF_H_
 #define	_SYS_EXEC_ECOFF_H_
 
-#include "arch/ecoff_machdep.h"
+//Only alpha will be able to load ecoff files for now
+#include "arch/alpha/ecoff_machdep.h"
 
 struct ecoff_filehdr {
         coff_ushort f_magic;	/* magic number */