diff --git a/src/prefs/screen/Jamfile b/src/prefs/screen/Jamfile
index 2eb0b1aaee..ae15801bd1 100644
--- a/src/prefs/screen/Jamfile
+++ b/src/prefs/screen/Jamfile
@@ -1,16 +1,16 @@
 SubDir OBOS_TOP src prefs screen ;
 
 Preference Screen : 
-	AlertView.cpp 
-	AlertWindow.cpp 
-	RefreshSlider.cpp 
-	RefreshView.cpp 
-	RefreshWindow.cpp 
-	Screen.cpp 
-	MonitorView.cpp 
-	ScreenSettings.cpp 
-	ScreenWindow.cpp 
-	Utility.cpp 
+	AlertView.cpp
+	AlertWindow.cpp
+	MonitorView.cpp
+	RefreshSlider.cpp
+	RefreshView.cpp
+	RefreshWindow.cpp
+	ScreenApplication.cpp
+	ScreenSettings.cpp
+	ScreenWindow.cpp
+	Utility.cpp
 	: libbe.so
 	: Screen.rdef
 	;
diff --git a/src/prefs/screen/Screen.cpp b/src/prefs/screen/ScreenApplication.cpp
similarity index 90%
rename from src/prefs/screen/Screen.cpp
rename to src/prefs/screen/ScreenApplication.cpp
index 00c0333a13..4cf7f739f2 100644
--- a/src/prefs/screen/Screen.cpp
+++ b/src/prefs/screen/ScreenApplication.cpp
@@ -10,21 +10,17 @@
  */
 
 
-#include <Application.h>
-#include <Alert.h>
-
-#include <cstdio>
-#include <cstring>
-
-#include "Constants.h"
 #include "ScreenApplication.h"
 #include "ScreenWindow.h"
 #include "ScreenSettings.h"
+#include "Constants.h"
+
+#include <Alert.h>
 
 
 ScreenApplication::ScreenApplication()
 	:	BApplication(kAppSignature),
-		fScreenWindow(new ScreenWindow(new ScreenSettings()))
+	fScreenWindow(new ScreenWindow(new ScreenSettings()))
 {
 	fScreenWindow->Show();
 }
diff --git a/src/prefs/screen/ScreenApplication.h b/src/prefs/screen/ScreenApplication.h
index 53daf05d0c..54b662dc17 100644
--- a/src/prefs/screen/ScreenApplication.h
+++ b/src/prefs/screen/ScreenApplication.h
@@ -1,15 +1,31 @@
-#ifndef __SCREENAPPLICATION_H
-#define __SCREENAPPLICATION_H
+/*
+ * Copyright 2001-2005, Haiku.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Rafael Romo
+ *		Stefano Ceccherini (burton666@libero.it)
+ *		Andrew Bachmann
+ *		Sergei Panteleev
+ */
+#ifndef SCREEN_APPLICATION_H
+#define SCREEN_APPLICATION_H
+
+
+#include <Application.h>
+
 
 class ScreenWindow;
-class ScreenApplication : public BApplication
-{
-public:
-	ScreenApplication();
-	virtual void MessageReceived(BMessage *message);
-	virtual void AboutRequested();
-private:
-	ScreenWindow *fScreenWindow;
+
+class ScreenApplication : public BApplication {
+	public:
+		ScreenApplication();
+
+		virtual void MessageReceived(BMessage *message);
+		virtual void AboutRequested();
+
+	private:
+		ScreenWindow *fScreenWindow;
 };
 
-#endif
+#endif	/* SCREEN_APPLICATION_H */