diff --git a/headers/private/app/ServerProtocol.h b/headers/private/app/ServerProtocol.h
index e3c0eb13e1..da7cf66fa0 100644
--- a/headers/private/app/ServerProtocol.h
+++ b/headers/private/app/ServerProtocol.h
@@ -13,6 +13,7 @@ enum
 SERVER_TRUE='_srt',
 SERVER_FALSE,
 AS_SERVER_BMESSAGE,
+AS_SERVER_SESSION,
 
 // Application definitions
 AS_CREATE_APP,
@@ -27,8 +28,8 @@ AS_CREATE_BITMAP,
 AS_DELETE_BITMAP,
 
 // Cursor definitions
-AS_SET_CURSOR_DATA,	// offset 10
-AS_SET_CURSOR_BCURSOR,
+AS_SET_CURSOR_DATA,	
+AS_SET_CURSOR_BCURSOR, // offset 10
 AS_SET_CURSOR_BBITMAP,
 AS_SET_CURSOR_SYSTEM,
 
@@ -39,8 +40,8 @@ AS_SET_SYSCURSOR_DEFAULTS,
 AS_GET_SYSCURSOR,
 
 AS_SHOW_CURSOR,
-AS_HIDE_CURSOR, // offset 20
-AS_OBSCURE_CURSOR,
+AS_HIDE_CURSOR,
+AS_OBSCURE_CURSOR, // offset 20
 AS_QUERY_CURSOR_HIDDEN,
 
 AS_CREATE_BCURSOR,
@@ -53,8 +54,8 @@ AS_END_RECT_TRACKING,
 AS_SHOW_WINDOW,
 AS_HIDE_WINDOW,
 AS_QUIT_WINDOW,
-AS_SEND_BEHIND, // 30
-AS_SET_LOOK,
+AS_SEND_BEHIND,
+AS_SET_LOOK, // 30
 AS_SET_FEEL, 
 AS_SET_FLAGS,
 AS_DISABLE_UPDATES,
@@ -63,8 +64,8 @@ AS_BEGIN_UPDATE,
 AS_END_UPDATE,
 AS_NEEDS_UPDATE,
 AS_WINDOW_TITLE,
-AS_ADD_TO_SUBSET, // 40
-AS_REM_FROM_SUBSET,
+AS_ADD_TO_SUBSET,
+AS_REM_FROM_SUBSET, // 40
 AS_SET_ALIGNMENT,
 AS_GET_ALIGNMENT,
 AS_GET_WORKSPACES,
@@ -73,8 +74,8 @@ AS_WINDOW_RESIZE,
 AS_WINDOW_MOVE,
 AS_SET_SIZE_LIMITS,
 AS_ACTIVATE_WINDOW,
-AS_WINDOW_MINIMIZE, // 50
-AS_UPDATE_IF_NEEDED,
+AS_WINDOW_MINIMIZE,
+AS_UPDATE_IF_NEEDED, // 50
 _ALL_UPDATED_,	// this should be moved in place of _UPDATE_IF_NEEDED_ in AppDefs.h
 
 
@@ -88,8 +89,8 @@ AS_DOWNLOAD_PICTURE,
 AS_QUERY_FONTS_CHANGED,
 AS_UPDATED_CLIENT_FONTLIST,
 AS_GET_FAMILY_ID,
-AS_GET_STYLE_ID, // 60
-AS_GET_STYLE_FOR_FACE,
+AS_GET_STYLE_ID,
+AS_GET_STYLE_FOR_FACE, // 60
 
 // This will be modified. Currently a kludge for the input server until
 // BScreens are implemented by the IK Taeam
@@ -104,8 +105,8 @@ AS_R5_SET_DECORATOR,
 
 AS_COUNT_WORKSPACES,
 AS_SET_WORKSPACE_COUNT,
-AS_CURRENT_WORKSPACE, // 70
-AS_ACTIVATE_WORKSPACE,
+AS_CURRENT_WORKSPACE,
+AS_ACTIVATE_WORKSPACE, // 70
 AS_SET_SCREEN_MODE,
 AS_GET_SCROLLBAR_INFO,
 AS_SET_SCROLLBAR_INFO,
@@ -114,8 +115,8 @@ AS_SELECT_PRINTER_PANEL,
 AS_ADD_PRINTER_PANEL,
 AS_RUN_BE_ABOUT,
 AS_SET_FOCUS_FOLLOWS_MOUSE,
-AS_FOCUS_FOLLOWS_MOUSE, // 80
-AS_SET_MOUSE_MODE,
+AS_FOCUS_FOLLOWS_MOUSE,
+AS_SET_MOUSE_MODE, // 80
 AS_GET_MOUSE_MODE,
 
 // Hook function messages
@@ -129,8 +130,8 @@ AS_SCREENMODE_CHANGED,
 AS_BEGIN_TRANSACTION,
 AS_END_TRANSACTION,
 AS_SET_HIGH_COLOR,
-AS_SET_LOW_COLOR, // 90
-AS_SET_VIEW_COLOR,
+AS_SET_LOW_COLOR,
+AS_SET_VIEW_COLOR, // 90
 
 AS_STROKE_ARC,
 AS_STROKE_BEZIER,
@@ -140,8 +141,8 @@ AS_STROKE_LINEARRAY,
 AS_STROKE_POLYGON,
 AS_STROKE_RECT,
 AS_STROKE_ROUNDRECT,
-AS_STROKE_SHAPE, // 100
-AS_STROKE_TRIANGLE,
+AS_STROKE_SHAPE,
+AS_STROKE_TRIANGLE, // 100
 
 AS_FILL_ARC,
 AS_FILL_BEZIER,
@@ -151,9 +152,9 @@ AS_FILL_RECT,
 AS_FILL_REGION,
 AS_FILL_ROUNDRECT,
 AS_FILL_SHAPE,
-AS_FILL_TRIANGLE, // 110
+AS_FILL_TRIANGLE,
 
-AS_MOVEPENBY,
+AS_MOVEPENBY, // 110
 AS_MOVEPENTO,
 AS_SETPENSIZE,
 
@@ -165,8 +166,8 @@ AS_FLUSH,
 AS_SYNC,
 
 AS_LAYER_CREATE,
-AS_LAYER_DELETE, // 120
-AS_LAYER_CREATE_ROOT,
+AS_LAYER_DELETE,
+AS_LAYER_CREATE_ROOT, // 120
 AS_LAYER_DELETE_ROOT,
 AS_LAYER_ADD_CHILD, 
 AS_LAYER_REMOVE_CHILD,
@@ -175,8 +176,8 @@ AS_LAYER_SHOW,
 AS_LAYER_HIDE,
 AS_LAYER_MOVE,
 AS_LAYER_RESIZE,
-AS_LAYER_INVALIDATE, // 130
-AS_LAYER_DRAW,
+AS_LAYER_INVALIDATE,
+AS_LAYER_DRAW, // 130
 
 AS_LAYER_GET_TOKEN,
 AS_LAYER_ADD,
diff --git a/headers/private/app/Session.h b/headers/private/app/Session.h
index c43a766f20..ad0c4efa14 100644
--- a/headers/private/app/Session.h
+++ b/headers/private/app/Session.h
@@ -6,8 +6,7 @@
 #include <Region.h>
 #include <Rect.h>
 #include <Point.h>
-
-#define AS_SESSION_MSG		'assm'
+#include <ServerProtocol.h>
 
 class BSession {
 
diff --git a/src/kits/app/Session.cpp b/src/kits/app/Session.cpp
index d79d5fde72..080bb00637 100644
--- a/src/kits/app/Session.cpp
+++ b/src/kits/app/Session.cpp
@@ -1,4 +1,4 @@
-#include "Session.h"
+#include <Session.h>
 #include <malloc.h>
 #include <stdio.h>
 
@@ -10,7 +10,7 @@ BSession::BSession(port_id receivePort, port_id sendPort, bool isPortLink = fals
 	fSendPort		= sendPort;
 	fReceivePort	= receivePort;
 
-	fSendCode			= AS_SESSION_MSG;
+	fSendCode			= AS_SERVER_SESSION;
 	fSendBuffer			= NULL;
 	fSendPosition		= 4;
 
@@ -28,7 +28,7 @@ BSession::BSession( const BSession &ses){
 	fSendPort		= ses.fSendPort;
 	fReceivePort	= ses.fReceivePort;
 
-	fSendCode			= AS_SESSION_MSG;
+	fSendCode			= AS_SERVER_SESSION;
 	fSendBuffer			= NULL;
 	fSendPosition		= 4;
 
@@ -193,7 +193,7 @@ status_t BSession::ReadData( void *data, int32 size)
 			do{
 				while( (rv = read_port(fReceivePort, &fRecvCode, fReceiveBuffer, 1024)) ==
 					B_WOULD_BLOCK);
-			} while( fRecvCode != AS_SESSION_MSG && rv != B_BAD_PORT_ID );
+			} while( fRecvCode != AS_SERVER_SESSION && rv != B_BAD_PORT_ID );
 			
 			if ( rv == B_BAD_PORT_ID )
 				return B_BAD_PORT_ID;