diff --git a/headers/private/app/AppMisc.h b/headers/private/app/AppMisc.h
index 4eb2709671..3c91b09cca 100644
--- a/headers/private/app/AppMisc.h
+++ b/headers/private/app/AppMisc.h
@@ -27,6 +27,7 @@
 #ifndef _APP_MISC_H
 #define _APP_MISC_H
 
+#include <Handler.h>
 #include <OS.h>
 #include <SupportDefs.h>
 
@@ -42,4 +43,14 @@ thread_id main_thread_for(team_id team);
 
 } // namespace BPrivate
 
+// _get_object_token_
+/*!	Return the token of a BHandler.
+
+	\param handler The BHandler.
+	\return the token.
+
+*/
+inline int32 _get_object_token_(const BHandler* object)
+	{ return object->fToken; }
+
 #endif	// _APP_MISC_H
diff --git a/src/kits/app/Handler.cpp b/src/kits/app/Handler.cpp
index 1c12441a78..63a6f3c088 100644
--- a/src/kits/app/Handler.cpp
+++ b/src/kits/app/Handler.cpp
@@ -950,11 +950,6 @@ bool FilterDeleter(void* filter)
 }
 //------------------------------------------------------------------------------
 
-int32 _get_object_token_(const BHandler *handler)
-{
-	return handler->fToken;
-}
-
 /*
  * $Log $
  *
diff --git a/src/kits/app/Messenger.cpp b/src/kits/app/Messenger.cpp
index 9288e0d4c6..5d08f9312a 100644
--- a/src/kits/app/Messenger.cpp
+++ b/src/kits/app/Messenger.cpp
@@ -45,6 +45,8 @@
 #include <Roster.h>
 
 // Project Includes ------------------------------------------------------------
+#include <AppMisc.h>
+#include <MessageUtils.h>
 #include "TokenSpace.h"
 
 // Local Includes --------------------------------------------------------------
@@ -59,51 +61,6 @@ enum {
 	NOT_IMPLEMENTED	= B_ERROR,
 };
 
-// _get_object_token_
-/*!	Return the token of a BHandler.
-
-	\param handler The BHandler.
-	\return the token.
-
-	\todo Think about a better place for this function.
-*/
-inline
-int32
-_get_object_token_(const BHandler* handler)
-{
-	return handler->fToken;
-}
-
-// _set_message_target_
-/*!	\brief Sets the target of a message.
-
-	\param message The message.
-	\param token The target handler token.
-	\param preferred Indicates whether to use the looper's preferred handler.
-*/
-inline
-void
-_set_message_target_(BMessage *message, int32 token, bool preferred)
-{
-	message->fTarget = token;
-	message->fPreferred = preferred;
-}
-
-// _set_message_reply_
-/*!	\brief Sets a message's reply target.
-
-	\param message The message.
-	\param messenger The reply messenger.
-*/
-inline
-void
-_set_message_reply_(BMessage *message, BMessenger messenger)
-{
-	message->fReplyTo.port = messenger.fPort;
-	message->fReplyTo.target = messenger.fHandlerToken;
-	message->fReplyTo.team = messenger.fTeam;
-	message->fReplyTo.preferred = messenger.fPreferredTarget;
-}
 
 // constructor
 /*!	\brief Creates an unitialized BMessenger.
diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index e3f32723f7..764e5134db 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -31,6 +31,7 @@
 #include <BeBuild.h>
 
 // Project Includes ------------------------------------------------------------
+#include <AppMisc.h>
 #include <InterfaceDefs.h>
 #include <Application.h>
 #include <Looper.h>