diff --git a/clientscr/screensaver.cpp b/clientscr/screensaver.cpp
index 7a00be5229..d70edcf346 100644
--- a/clientscr/screensaver.cpp
+++ b/clientscr/screensaver.cpp
@@ -326,10 +326,11 @@ int CScreensaver::launch_screensaver(RESULT* rp, GFXAPP_ID& graphics_application
 //
 int CScreensaver::terminate_v6_screensaver(GFXAPP_ID& graphics_application, RESULT* rp) {
     int retval = 0;
-    pid_t thePID;
     int i;
 
 #ifdef __APPLE__
+    pid_t thePID;
+
     if (gUseLaunchAgent) {
         // As of OS 10.15 (Catalina) screensavers can no longer launch apps
         // that run setuid or setgid. So instead of killing graphics apps 
diff --git a/clientscr/screensaver_win.h b/clientscr/screensaver_win.h
index fa21603642..0ee948cd24 100644
--- a/clientscr/screensaver_win.h
+++ b/clientscr/screensaver_win.h
@@ -167,7 +167,7 @@ protected:
     DWORD WINAPI    DataManagementProc();
     static DWORD WINAPI DataManagementProcStub( LPVOID lpParam );
 
-    int             terminate_v6_screensaver(HANDLE& graphics_application);
+    int             terminate_v6_screensaver(HANDLE& graphics_application, RESULT* rp);
     int             terminate_screensaver(HANDLE& graphics_application, RESULT *worker_app);
     int             terminate_default_screensaver(HANDLE& graphics_application);
 	int             launch_screensaver(RESULT* rp, HANDLE& graphics_application);