diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh
index 3e727e8314..a5795763c8 100644
--- a/src/sim/syscall_emul.hh
+++ b/src/sim/syscall_emul.hh
@@ -1568,9 +1568,7 @@ cloneFunc(SyscallDesc *desc, int callnum, ThreadContext *tc)
 
     cp->setSyscallReturn(ctc, 0);
 
-#if THE_ISA == ALPHA_ISA
-    ctc->setIntReg(TheISA::SyscallSuccessReg, 0);
-#elif THE_ISA == SPARC_ISA
+#if THE_ISA == SPARC_ISA
     tc->setIntReg(TheISA::SyscallPseudoReturnReg, 0);
     ctc->setIntReg(TheISA::SyscallPseudoReturnReg, 1);
 #endif
diff --git a/src/sim/vptr.hh b/src/sim/vptr.hh
index 07f00c3db7..87c9efcf8d 100644
--- a/src/sim/vptr.hh
+++ b/src/sim/vptr.hh
@@ -28,8 +28,8 @@
  * Authors: Nathan Binkert
  */
 
-#ifndef __ARCH_ALPHA_VPTR_HH__
-#define __ARCH_ALPHA_VPTR_HH__
+#ifndef __SIM_VPTR_HH__
+#define __SIM_VPTR_HH__
 
 #include "mem/fs_translating_port_proxy.hh"
 
@@ -132,4 +132,4 @@ class VPtr
     }
 };
 
-#endif // __ARCH_ALPHA_VPTR_HH__
+#endif // __SIM_VPTR_HH__