diff --git a/include/wine/exception.h b/include/wine/exception.h
index 650ce7f46d2..a159c558e54 100644
--- a/include/wine/exception.h
+++ b/include/wine/exception.h
@@ -145,7 +145,7 @@ static inline EXCEPTION_FRAME *EXC_push_frame( EXCEPTION_FRAME *frame )
                          : "=&r" (prev) : "r" (frame) : "memory" );
     return prev;
 #else
-    TEB * teb = CURRENT();
+    TEB *teb = NtCurrentTeb();
     frame->Prev = teb->except;
     teb->except = frame;
     return frame->Prev;
@@ -160,7 +160,7 @@ static inline EXCEPTION_FRAME *EXC_pop_frame( EXCEPTION_FRAME *frame )
     return frame->Prev;
 
 #else
-    CURRENT()->except = frame->Prev;
+    NtCurrentTeb()->except = frame->Prev;
     return frame->Prev;
 #endif
 }
diff --git a/relay32/relay386.c b/relay32/relay386.c
index 6f6fdcdb84d..16641c1467e 100644
--- a/relay32/relay386.c
+++ b/relay32/relay386.c
@@ -305,6 +305,6 @@ void WINAPI REGS_FUNC(RELAY_CallFrom32Regs)( CONTEXT *context )
 
 #else  /* __i386__ */
 
-REGS_ENTRYPOINT(RELAY_CallFrom32Regs) { }
+void WINAPI REGS_FUNC(RELAY_CallFrom32Regs)( CONTEXT *context ) { }
 
 #endif  /* __i386__ */
diff --git a/relay32/snoop.c b/relay32/snoop.c
index 687900921c4..2b7699ed171 100644
--- a/relay32/snoop.c
+++ b/relay32/snoop.c
@@ -373,7 +373,12 @@ FARPROC SNOOP_GetProcAddress(HMODULE hmod,LPCSTR name,DWORD ordinal,FARPROC orig
 	return origfun;
 }
 
-REGS_ENTRYPOINT(SNOOP_Entry) { }
-REGS_ENTRYPOINT(SNOOP_Return) { }
+void WINAPI REGS_FUNC(SNOOP_Entry)( CONTEXT *context )
+{
+}
+
+void WINAPI REGS_FUNC(SNOOP_Return)( CONTEXT *context )
+{
+}
 
 #endif	/* !__i386__ */