diff --git a/vm/os-macosx-ppc.h b/vm/os-macosx-ppc.h
index 2e9fcd0110..5eaee9c327 100644
--- a/vm/os-macosx-ppc.h
+++ b/vm/os-macosx-ppc.h
@@ -11,8 +11,12 @@
     #define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->__dar
     #define MACH_STACK_POINTER(thr_state) (thr_state)->__r1
     #define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->__srr0
+    #define UAP_PROGRAM_COUNTER(ucontext) \
+		MACH_PROGRAM_COUNTER(&(((ucontext_t *)(ucontext))->uc_mcontext->__ss))
 #else
     #define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->dar
     #define MACH_STACK_POINTER(thr_state) (thr_state)->r1
     #define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->srr0
+    #define UAP_PROGRAM_COUNTER(ucontext) \
+		MACH_PROGRAM_COUNTER(&(((ucontext_t *)(ucontext))->uc_mcontext->ss))
 #endif
diff --git a/vm/os-macosx-x86.32.h b/vm/os-macosx-x86.32.h
index 81ae617dfc..d335c4abd4 100644
--- a/vm/os-macosx-x86.32.h
+++ b/vm/os-macosx-x86.32.h
@@ -9,8 +9,12 @@
     #define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->__faultvaddr
     #define MACH_STACK_POINTER(thr_state) (thr_state)->__esp
     #define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->__eip
+	#define UAP_PROGRAM_COUNTER(ucontext) \
+		MACH_PROGRAM_COUNTER(&(((ucontext_t *)(ucontext))->uc_mcontext->__ss))
 #else
     #define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->faultvaddr
     #define MACH_STACK_POINTER(thr_state) (thr_state)->esp
     #define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->eip
+	#define UAP_PROGRAM_COUNTER(ucontext) \
+		MACH_PROGRAM_COUNTER(&(((ucontext_t *)(ucontext))->uc_mcontext->ss))	
 #endif
diff --git a/vm/os-macosx.h b/vm/os-macosx.h
index dfe53f9a19..e8e50714ff 100644
--- a/vm/os-macosx.h
+++ b/vm/os-macosx.h
@@ -10,7 +10,4 @@ void early_init(void);
 const char *vm_executable_path(void);
 const char *default_image_path(void);
 
-DLLEXPORT void c_to_factor_toplevel(CELL quot);
-
-#define UAP_PROGRAM_COUNTER(ucontext) \
-	MACH_PROGRAM_COUNTER(&(((ucontext_t *)(ucontext))->uc_mcontext->ss))
+DLLEXPORT void c_to_factor_toplevel(CELL quot);
\ No newline at end of file