diff --git a/mop.c b/mop.c
index 46e105bd2..f32fd559d 100644
--- a/mop.c
+++ b/mop.c
@@ -10,7 +10,7 @@ mop_call_xs (pTHX_ XSPROTO(subaddr), CV *cv, SV **mark)
     PUTBACK;
 }
 
-#if PERL_VERSION >= 10
+#if PERL_VERSION_GE(5,10,0)
 UV
 mop_check_package_cache_flag (pTHX_ HV *stash)
 {
@@ -252,11 +252,8 @@ mop_prehash_keys ()
 
 XS_EXTERNAL(mop_xs_simple_reader)
 {
-#ifdef dVAR
-    dVAR; dXSARGS;
-#else
+    dVAR;
     dXSARGS;
-#endif
     register HE *he;
     mop_prehashed_key_t key = (mop_prehashed_key_t)CvXSUBANY(cv).any_i32;
     SV *self;
diff --git a/mop.h b/mop.h
index 81993228f..e2f41423d 100644
--- a/mop.h
+++ b/mop.h
@@ -18,10 +18,6 @@
 
 #define MOP_CALL_BOOT(name)  mop_call_xs(aTHX_ name, cv, mark);
 
-#ifndef XSPROTO
-#define XSPROTO(name) XS_EXTERNAL(name)
-#endif
-
 #ifndef CvISXSUB
 #define CvISXSUB(cv)  (CvXSUB(cv) ? TRUE : FALSE)
 #endif