diff --git a/src/apps/expander/ExpanderRules.h b/src/apps/expander/ExpanderRules.h
index 046a7dcf78..a28d4cad43 100644
--- a/src/apps/expander/ExpanderRules.h
+++ b/src/apps/expander/ExpanderRules.h
@@ -1,30 +1,7 @@
-/*****************************************************************************/
-// Expander
-// Written by Jérôme Duval
-//
-// ExpanderRules.h
-//
-//
-// Copyright (c) 2004 OpenBeOS Project
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-// and/or sell copies of the Software, and to permit persons to whom the 
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included 
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-/*****************************************************************************/
+/*
+ * Copyright 2004-2006, Jérôme Duval. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
 
 #ifndef _ExpanderRules_h
 #define _ExpanderRules_h
@@ -32,7 +9,7 @@
 #include <List.h>
 #include <File.h>
 #include <String.h>
-#include <MimeType.h>
+#include <Mime.h>
 #include <FilePanel.h>
 
 class ExpanderRule {
diff --git a/src/apps/expander/ExpanderThread.cpp b/src/apps/expander/ExpanderThread.cpp
index b50d8bef1f..3c6b8bb810 100644
--- a/src/apps/expander/ExpanderThread.cpp
+++ b/src/apps/expander/ExpanderThread.cpp
@@ -1,31 +1,9 @@
-/*****************************************************************************/
-// Expander
-// Written by Jérôme Duval
-//
-// ExpanderThread.cpp
-//
-// Copyright (c) 2004 OpenBeOS Project
-//
-// Original code from ZipOMatic by jonas.sundstrom@kirilla.com
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-// and/or sell copies of the Software, and to permit persons to whom the 
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included 
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-/*****************************************************************************/
+/*
+ * Copyright 2004-2006, Jérôme Duval. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ * Original code from ZipOMatic by jonas.sundstrom@kirilla.com
+ */
+#include <Messenger.h>
 #include <Path.h>
 #include "ExpanderThread.h"
 #include <image.h>
diff --git a/src/apps/expander/Jamfile b/src/apps/expander/Jamfile
index 0245a98fe9..734c3c08b2 100644
--- a/src/apps/expander/Jamfile
+++ b/src/apps/expander/Jamfile
@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src apps expander ;
 
-AddResources Expander : Expander.rdef ;
+SetSubDirSupportedPlatformsBeOSCompatible ;
 
 Application Expander : 
 	ExpanderApp.cpp
@@ -10,7 +10,8 @@ Application Expander :
 	ExpanderSettings.cpp
 	ExpanderPreferences.cpp
 	DirectoryFilePanel.cpp
-	ExpanderRules.cpp ;
-
-LinkAgainst Expander : libbe.so libtracker.so ;
+	ExpanderRules.cpp
+	: be tracker	
+	: Expander.rdef
+;