diff --git a/src/preferences/locale/FormatSettingsView.cpp b/src/preferences/locale/FormatSettingsView.cpp
index a7df328130..dc85bbef91 100644
--- a/src/preferences/locale/FormatSettingsView.cpp
+++ b/src/preferences/locale/FormatSettingsView.cpp
@@ -5,7 +5,9 @@
 
 
 #include "FormatSettingsView.h"
-#include "Locale.h"
+
+#include <stdio.h>
+#include <stdlib.h>
 
 #include <Alert.h>
 #include <Application.h>
@@ -32,8 +34,7 @@
 #include <TextControl.h>
 #include <Window.h>
 
-#include <stdio.h>
-#include <stdlib.h>
+#include "LocalePreflet.h"
 
 
 using BPrivate::gMutableLocaleRoster;
diff --git a/src/preferences/locale/Jamfile b/src/preferences/locale/Jamfile
index b131105c80..7ee3830744 100644
--- a/src/preferences/locale/Jamfile
+++ b/src/preferences/locale/Jamfile
@@ -5,7 +5,7 @@ UsePrivateHeaders shared ;
 
 local sources =
 	LanguageListView.cpp
-	Locale.cpp
+	LocalePreflet.cpp
 	LocaleSettings.cpp
 	LocaleWindow.cpp
 	FormatSettingsView.cpp
@@ -18,9 +18,7 @@ Preference Locale
 	: Locale.rdef
 ;
 
-DoCatalogs Locale : x-vnd.Haiku-Locale :
-	LanguageListView.cpp
-	Locale.cpp
-	LocaleWindow.cpp
-	FormatSettingsView.cpp
-;
+ECHO $(SYSHDRS) ;
+ECHO $(SUBDIRSYSHDRS) ;
+
+DoCatalogs Locale : x-vnd.Haiku-Locale : $(sources) ;
diff --git a/src/preferences/locale/LanguageListView.cpp b/src/preferences/locale/LanguageListView.cpp
index 2e9c69da17..6ec32484ea 100644
--- a/src/preferences/locale/LanguageListView.cpp
+++ b/src/preferences/locale/LanguageListView.cpp
@@ -19,7 +19,6 @@
 #include <Bitmap.h>
 #include <Catalog.h>
 #include <Country.h>
-#include <Locale.h>
 #include <Window.h>
 
 
@@ -104,7 +103,7 @@ LanguageListItem::DrawItem(BView* owner, BRect frame, bool complete)
 		+ (frame.Height() - (finfo.ascent + finfo.descent + finfo.leading)) / 2
 		+ (finfo.ascent + finfo.descent) - 1);
 	owner->DrawString(text.String());
-	
+
 	// Draw the icon
 	frame.left = frame.right - 17;
 	BRect iconFrame(frame);
diff --git a/src/preferences/locale/Locale.cpp b/src/preferences/locale/LocalePreflet.cpp
similarity index 98%
rename from src/preferences/locale/Locale.cpp
rename to src/preferences/locale/LocalePreflet.cpp
index 25046562c3..253a61837c 100644
--- a/src/preferences/locale/Locale.cpp
+++ b/src/preferences/locale/LocalePreflet.cpp
@@ -5,9 +5,8 @@
  */
 
 
-#include "Locale.h"
-#include "LocaleSettings.h"
-#include "LocaleWindow.h"
+#include <stdio.h>
+#include <string.h>
 
 #include <AboutWindow.h>
 #include <Application.h>
@@ -16,8 +15,9 @@
 #include <TextView.h>
 #include <Locale.h>
 
-#include <stdio.h>
-#include <string.h>
+#include "LocalePreflet.h"
+#include "LocaleSettings.h"
+#include "LocaleWindow.h"
 
 
 #undef B_TRANSLATE_CONTEXT
diff --git a/src/preferences/locale/Locale.h b/src/preferences/locale/LocalePreflet.h
similarity index 76%
rename from src/preferences/locale/Locale.h
rename to src/preferences/locale/LocalePreflet.h
index c90a9b352e..db7c5cc900 100644
--- a/src/preferences/locale/Locale.h
+++ b/src/preferences/locale/LocalePreflet.h
@@ -2,8 +2,8 @@
  * Copyright 2005-2010, Axel Dörfler, axeld@pinc-software.de.
  * All rights reserved. Distributed under the terms of the MIT License.
  */
-#ifndef LOCALE_H
-#define LOCALE_H
+#ifndef LOCALE_PREFLET_H
+#define LOCALE_PREFLET_H
 
 
 #include <SupportDefs.h>
@@ -14,5 +14,5 @@ extern const char* kSignature;
 static const uint32 kMsgSettingsChanged = 'SeCh';
 
 
-#endif	/* LOCALE_H */
+#endif	/* LOCALE_PREFLET_H */
 
diff --git a/src/preferences/locale/LocaleWindow.cpp b/src/preferences/locale/LocaleWindow.cpp
index fa5e08c47d..6e9085167d 100644
--- a/src/preferences/locale/LocaleWindow.cpp
+++ b/src/preferences/locale/LocaleWindow.cpp
@@ -5,9 +5,7 @@
  */
 
 
-#include "Locale.h"
 #include "LocaleWindow.h"
-#include "LanguageListView.h"
 
 #include <iostream>
 
@@ -27,6 +25,8 @@
 #include <UnicodeChar.h>
 
 #include "FormatSettingsView.h"
+#include "LocalePreflet.h"
+#include "LanguageListView.h"
 
 
 #undef B_TRANSLATE_CONTEXT