diff --git a/src/preferences/screensaver/Jamfile b/src/preferences/screensaver/Jamfile
index fcd49d6d5b..92f875d0ae 100644
--- a/src/preferences/screensaver/Jamfile
+++ b/src/preferences/screensaver/Jamfile
@@ -12,7 +12,7 @@ Preference ScreenSaver :
 	PreviewView.cpp
 	MouseAreaView.cpp
 	ScreenSaver.cpp
-	: libtracker.so libscreensaver.so be $(TARGET_LIBSTDC++)
+	: tracker libscreensaver.so be $(TARGET_LIBSTDC++)
 	: ScreenSaver.rdef 
 	;
 
diff --git a/src/preferences/screensaver/PasswordWindow.cpp b/src/preferences/screensaver/PasswordWindow.cpp
index b101ff497a..d870a96622 100644
--- a/src/preferences/screensaver/PasswordWindow.cpp
+++ b/src/preferences/screensaver/PasswordWindow.cpp
@@ -4,11 +4,12 @@
  *
  * Authors:
  *              Michael Phipps
- *              Jérôme Duval, jerome.duval@free.fr
+ *              Jérôme Duval, jerome.duval@free.fr
  */
 
 #include "PasswordWindow.h"
 #include <stdio.h>
+#include <unistd.h>
 #include <Alert.h>
 #include <Box.h>
 #include <RadioButton.h>
diff --git a/src/preferences/screensaver/PasswordWindow.h b/src/preferences/screensaver/PasswordWindow.h
index 01ceedaa9f..720f0b431a 100644
--- a/src/preferences/screensaver/PasswordWindow.h
+++ b/src/preferences/screensaver/PasswordWindow.h
@@ -9,11 +9,12 @@
 #ifndef PASSWORDWINDOW_H
 #define PASSWORDWINDOW_H
 
-#include <Window.h>
-#include <String.h>
-#include <TextControl.h>
 #include <Button.h>
 #include <Constants.h>
+#include <RadioButton.h>
+#include <String.h>
+#include <TextControl.h>
+#include <Window.h>
 #include "ScreenSaverPrefs.h"
 
 class PasswordWindow : public BWindow
diff --git a/src/preferences/screensaver/ScreenSaverItem.h b/src/preferences/screensaver/ScreenSaverItem.h
index 0e5240963c..04c68bfa03 100644
--- a/src/preferences/screensaver/ScreenSaverItem.h
+++ b/src/preferences/screensaver/ScreenSaverItem.h
@@ -9,7 +9,7 @@
 #ifndef __SCREENSAVERITEM_H__
 #define __SCREENSAVERITEM_H__
 
-#include <StringItem.h>
+#include <ListItem.h>
 #include <String.h>
 #include <Entry.h>
 
diff --git a/src/preferences/screensaver/ScreenSaverWindow.h b/src/preferences/screensaver/ScreenSaverWindow.h
index 223667977b..045502f68f 100644
--- a/src/preferences/screensaver/ScreenSaverWindow.h
+++ b/src/preferences/screensaver/ScreenSaverWindow.h
@@ -4,13 +4,17 @@
  *
  * Authors:
  *              Michael Phipps
- *              Jérôme Duval, jerome.duval@free.fr
+ *              Jérôme Duval, jerome.duval@free.fr
  */
 
 #ifndef _ScreenSaverWindow_H
 #define _ScreenSaverWindow_H
+#include <Box.h>
 #include <CheckBox.h>
 #include <FilePanel.h>
+#include <Slider.h>
+#include <ListView.h>
+#include <StringView.h>
 #include "PasswordWindow.h"
 #include "ScreenSaverPrefs.h"