diff --git a/src/add-ons/tracker/mark_as/Jamfile b/src/add-ons/tracker/mark_as/Jamfile
index 6a2e6aee52..e58f67c730 100644
--- a/src/add-ons/tracker/mark_as/Jamfile
+++ b/src/add-ons/tracker/mark_as/Jamfile
@@ -5,18 +5,6 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
 AddResources MarkAsNew-N : MarkAsNew.rdef ;
 AddResources MarkAsRead-R : MarkAsRead.rdef ;
 
-SearchAndReplace MarkAsNew.cpp :
-	MarkAs.cpp
-	: !!!STATUS_HERE!!!
-	: New
-	;
-
-SearchAndReplace MarkAsRead.cpp :
-	MarkAs.cpp
-	: !!!STATUS_HERE!!!
-	: Read
-	;
-
 Addon MarkAsNew-N : Tracker :
 	MarkAsNew.cpp
 
diff --git a/src/add-ons/tracker/mark_as/MarkAs.cpp b/src/add-ons/tracker/mark_as/MarkAs.cpp
index d068a2470e..7ddc2ef873 100644
--- a/src/add-ons/tracker/mark_as/MarkAs.cpp
+++ b/src/add-ons/tracker/mark_as/MarkAs.cpp
@@ -8,7 +8,7 @@
 #include <Message.h>
 #include <Node.h>
 #include <String.h>
-#include <TrackerAddon.h>
+#include <TrackerAddOn.h>
 
 
 extern "C" void
@@ -16,10 +16,10 @@ process_refs(entry_ref dir, BMessage* msg, void* /*reserved*/)
 {
 	int32 refs;
 	entry_ref ref;
-	BString status("!!!STATUS_HERE!!!");
+	BString status(STATUS_HERE);
 		// The above will be substituted with a real value (such as "New" or 
-		// "Read") by some magic in the Jamfile. This is done to avoid duplicate
-		// code.
+		// "Read") by a #define and #include in another file. This is done 
+		// to avoid duplicate code.                                                                
 	BString type;
 
 	for (refs = 0; msg->FindRef("refs", refs, &ref) == B_NO_ERROR; refs++) {
diff --git a/src/add-ons/tracker/mark_as/MarkAsNew.cpp b/src/add-ons/tracker/mark_as/MarkAsNew.cpp
new file mode 100644
index 0000000000..d19f7ce7fa
--- /dev/null
+++ b/src/add-ons/tracker/mark_as/MarkAsNew.cpp
@@ -0,0 +1,2 @@
+#define STATUS_HERE "New"
+#include "MarkAs.cpp"
diff --git a/src/add-ons/tracker/mark_as/MarkAsRead.cpp b/src/add-ons/tracker/mark_as/MarkAsRead.cpp
new file mode 100644
index 0000000000..604f05eae4
--- /dev/null
+++ b/src/add-ons/tracker/mark_as/MarkAsRead.cpp
@@ -0,0 +1,2 @@
+#define STATUS_HERE "Read"
+#include "MarkAs.cpp"