diff --git a/src/preferences/screensaver/ScreenSaverPrefsApp.cpp b/src/preferences/screensaver/ScreenSaverPrefsApp.cpp
index 7ef1a138ca..c001c1c309 100644
--- a/src/preferences/screensaver/ScreenSaverPrefsApp.cpp
+++ b/src/preferences/screensaver/ScreenSaverPrefsApp.cpp
@@ -4,6 +4,7 @@
  */
 
 #include <Application.h>
+#include <Entry.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/preferences/screensaver/ScreenSaverWindow.cpp b/src/preferences/screensaver/ScreenSaverWindow.cpp
index 9c9911ded4..16c24a3dee 100644
--- a/src/preferences/screensaver/ScreenSaverWindow.cpp
+++ b/src/preferences/screensaver/ScreenSaverWindow.cpp
@@ -49,11 +49,6 @@ static const int32 kTimeInUnits[]={     30,    60,   90,
                                                                         7200,  9000, 10800,
                                                                         14400, 18000};
 
-const int32 PASSWORD_CHECKBOX = 'psCB';
-
-void drawPositionalMonitor(BView *view,BRect areaToDrawIn,int state);
-BView *drawSampleMonitor(BView *view, BRect area);
-
 int32
 UnitsToSlider(bigtime_t val) 
 {
@@ -267,7 +262,6 @@ ScreenSaverWin::SetupForm()
 	fPwWin->Run();
 
 	MoveTo(fPrefs.WindowFrame().left,fPrefs.WindowFrame().top);
-	//ResizeTo(fPrefs.WindowFrame().right-fPrefs.WindowFrame().left,fPrefs.WindowFrame().bottom-fPrefs.WindowFrame().top);
 	fTabView->Select(fPrefs.WindowTab());
 	fEnableCheckbox->SetValue(fPrefs.TimeFlags());
 	fRunSlider->SetValue(UnitsToSlider(fPrefs.BlankTime()));
diff --git a/src/preferences/screensaver/ScreenSaverWindow.h b/src/preferences/screensaver/ScreenSaverWindow.h
index 51a9408664..ed7d083b19 100644
--- a/src/preferences/screensaver/ScreenSaverWindow.h
+++ b/src/preferences/screensaver/ScreenSaverWindow.h
@@ -6,7 +6,6 @@
 #ifndef _ScreenSaverWindow_H
 #define _ScreenSaverWindow_H
 #include <FilePanel.h>
-#include <Picture.h>
 #include "PasswordWindow.h"
 #include "ScreenSaverPrefs.h"
 
@@ -62,7 +61,6 @@ private:
 	BStringView *fFadeNowString2;
 	BStringView *fDontFadeString;
 	BStringView *fDontFadeString2;
-	BPicture fSamplePicture;
 	MouseAreaView *fFadeNow,*fFadeNever;
 	PasswordWindow *fPwWin;
 	BMessenger *fPwMessenger;