diff --git a/headers/private/interface/ViewAux.h b/headers/private/interface/ViewAux.h
index b44fa01fb7..957ac6fbb3 100644
--- a/headers/private/interface/ViewAux.h
+++ b/headers/private/interface/ViewAux.h
@@ -2,15 +2,14 @@
 #define _VIEWAUX_H_
 
 #include <BeBuild.h>
-#include <InterfaceDefs.h>
-#include <Rect.h>
-#include <Point.h>
-#include <Region.h>
 #include <Font.h>
-/*
-	URGENT: Move this structure in a private header.
-		This one is copied from Shape.cpp.
-*/
+#include <InterfaceDefs.h>
+#include <Point.h>
+#include <Rect.h>
+#include <Region.h>
+
+const static uint32 kDeleteDragger = 'JAHA';
+
 struct shape_data {
 	uint32	*opList;
 	int32	opCount;
@@ -43,6 +42,7 @@ enum {
 };
 
 
+// JB: Is there any reason why this can't be a struct ?
 //struct _view_attr_{
 class ViewAttr
 {
diff --git a/src/kits/interface/Dragger.cpp b/src/kits/interface/Dragger.cpp
index 0af85c36aa..a6bea7fbff 100644
--- a/src/kits/interface/Dragger.cpp
+++ b/src/kits/interface/Dragger.cpp
@@ -36,6 +36,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <ViewAux.h>
 
 bool BDragger::sVisible;
 bool BDragger::sInited;
@@ -277,7 +278,7 @@ BDragger::MessageReceived(BMessage *msg)
 {
 	if (msg->what == B_TRASH_TARGET) {
 		if (fShelf)
-			Window()->PostMessage('JAHA', fTarget, NULL); // TODO: 'JAHA' ? What's that ?
+			Window()->PostMessage(kDeleteDragger, fTarget, NULL);
 		else
 			(new BAlert("??",
 				"Can't delete this replicant from its original application. Life goes on.",
@@ -555,14 +556,14 @@ BDragger::BuildDefaultPopUp()
 
 	char about[B_OS_NAME_LENGTH];
 	snprintf(about, B_OS_NAME_LENGTH, "About %s", name);
-
+	
 	fPopUp->AddItem(new BMenuItem(about, msg));
 
 	// Separator
 	fPopUp->AddItem(new BSeparatorItem());
 
 	// Delete
-	fPopUp->AddItem(new BMenuItem("Delete", new BMessage('JAHA')));
+	fPopUp->AddItem(new BMenuItem("Delete", new BMessage(kDeleteDragger)));
 }