diff --git a/headers/os/add-ons/screen_saver/ScreenSaverPrefs.h b/headers/os/add-ons/screen_saver/ScreenSaverPrefs.h
index 9f7d9a7027..f81629a83c 100755
--- a/headers/os/add-ons/screen_saver/ScreenSaverPrefs.h
+++ b/headers/os/add-ons/screen_saver/ScreenSaverPrefs.h
@@ -1,8 +1,9 @@
 #ifndef SCREEN_SAVER_PREFS_H
 #define SCREEN_SAVER_PREFS_H
 #include "Message.h"
+#include <string.h>
 
-enum arrowDirection {UPLEFT,UPRIGHT,DOWNLEFT,DOWNRIGHT,NONE};
+enum arrowDirection {NONE=-1,UPLEFT,UPRIGHT,DOWNRIGHT,DOWNLEFT};
 
 class ScreenSaverPrefs 
 {
@@ -29,17 +30,17 @@ public:
 	void SetWindowFrame(const BRect &fr) {windowFrame=fr;}
 	void SetWindowTab(int tab) {windowTab=tab;}
 	void SetTimeFlags(int tf) {timeFlags=tf;}
-	void SetBlankTime(int );
+	void SetBlankTime(int bt) {blankTime=bt;}
 	void SetStandbyTime(int time) {standbyTime=time;}
 	void SetSuspendTime(int time) {suspendTime=time;}
 	void SetOffTime(int intime) {offTime=intime;}
 	void SetBlankCorner(arrowDirection in) {blank=in;}
 	void SetNeverBlankCorner(arrowDirection in){neverBlank=in;}
 	void SetLockEnable(bool en) {lockenable=en;}
-	void SetPasswordTime(int );
-	void SetPassword(char *);
+	void SetPasswordTime(int pt) {passwordTime=pt;}
+	void SetPassword(char *pw){strncpy(password,pw,B_PATH_NAME_LENGTH-1);}
 	void SetNetworkPassword(bool np) {isNetworkPWD=np;}
-	void SetModuleName(const char *);
+	void SetModuleName(const char *mn) {strncpy(moduleName,mn,B_PATH_NAME_LENGTH-1);}
 	void SetState(BMessage *);
 	void SaveSettings (void);
 private:
diff --git a/headers/os/add-ons/screen_saver/ScreenSaverThread.h b/headers/os/add-ons/screen_saver/ScreenSaverThread.h
index c4f4e0cc67..e17a2defd1 100644
--- a/headers/os/add-ons/screen_saver/ScreenSaverThread.h
+++ b/headers/os/add-ons/screen_saver/ScreenSaverThread.h
@@ -1,7 +1,7 @@
 #ifndef SCREEN_SAVER_THREAD_H
 #define SCREEN_SAVER_THREAD_H
-#include "SupportDefs.h"
-#include "DirectWindow.h"
+#include <SupportDefs.h>
+#include <DirectWindow.h>
 
 class BScreenSaver;
 class BView;
@@ -12,17 +12,20 @@ int32 threadFunc(void *data);
 class ScreenSaverThread 
 {
 public:
-	ScreenSaverThread(BScreenSaver *svr, BDirectWindow *wnd, BView *vw, ScreenSaverPrefs *p);
+	ScreenSaverThread(BWindow *wnd, BView *vw, ScreenSaverPrefs *p);
 	void thread(void);
+	BScreenSaver *LoadAddOn(void) ;
 	void quit(void);
 private:
 	BScreenSaver *saver;
-	BDirectWindow *win;
+	BWindow *win;
+	BDirectWindow *dwin;
 	BView *view;
 	ScreenSaverPrefs *pref;
 
 	long frame;
 	int snoozeCount;
+	image_id addon_image;
 };
 
 #endif //SCREEN_SAVER_THREAD_H