diff --git a/src/kits/storage/LibBeAdapter.cpp b/src/kits/storage/LibBeAdapter.cpp
index cd49e607c5..b0ea344695 100644
--- a/src/kits/storage/LibBeAdapter.cpp
+++ b/src/kits/storage/LibBeAdapter.cpp
@@ -125,10 +125,8 @@ _kern_start_watching(dev_t device, ino_t node, uint32 flags,
 
 			
 status_t
-_kern_stop_watching(dev_t device, ino_t node, uint32 flags,
-	port_id port, uint32 token)
+_kern_stop_watching(dev_t device, ino_t node, port_id port, uint32 token)
 {
-	(void)flags;
 	return _kstop_watching_vnode_(device, node, port, token);
 }
 
diff --git a/src/kits/tracker/FSUtils.cpp b/src/kits/tracker/FSUtils.cpp
index 4468dd7413..3ef8244270 100644
--- a/src/kits/tracker/FSUtils.cpp
+++ b/src/kits/tracker/FSUtils.cpp
@@ -2891,7 +2891,7 @@ _TrackerLaunchAppWithDocuments(const entry_ref *appRef, const BMessage *refs, bo
 
 extern "C" char** environ;
 
-#ifdef __HAIKU__
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 extern "C" status_t _kern_load_image(int32 argCount, const char **args,
 	int32 envCount, const char **env, int32 priority, uint32 flags,
 	port_id errorPort, uint32 errorToken);
@@ -2917,7 +2917,7 @@ LoaderErrorDetails(const entry_ref *app, BString &details)
 
 	char *argv[2] = { const_cast<char *>(path.Path()), 0};
 
-#ifdef __HAIKU__
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 	port_id errorPort = create_port(1, "Tracker loader error");
 
 	// count environment variables
diff --git a/src/tests/servers/registrar/Jamfile b/src/tests/servers/registrar/Jamfile
index 054c9a0683..d7be1a3604 100644
--- a/src/tests/servers/registrar/Jamfile
+++ b/src/tests/servers/registrar/Jamfile
@@ -85,7 +85,6 @@ Server haiku_registrar
 	PriorityMessageQueue.cpp
 	RecentApps.cpp
 	RecentEntries.cpp
-	Referenceable.cpp
 	Registrar.cpp
 	RosterAppInfo.cpp
 	RosterSettingsCharStream.cpp