diff --git a/headers/private/app/ServerProtocol.h b/headers/private/app/ServerProtocol.h
index 69d1eebc7e..4320dc1c89 100644
--- a/headers/private/app/ServerProtocol.h
+++ b/headers/private/app/ServerProtocol.h
@@ -7,114 +7,127 @@
 #define SERVER_PORT_NAME "OBappserver"
 #define SERVER_INPUT_PORT "OBinputport"
 
-#define CREATE_APP 'drca'
-#define DELETE_APP 'drda'
-#define QUIT_APP 'srqa'
-
-#define SET_SERVER_PORT 'srsp'
-
-#define CREATE_WINDOW 'drcw'
-#define DELETE_WINDOW 'drdw'
-#define SHOW_WINDOW 'drsw'
-#define HIDE_WINDOW 'drhw'
-#define QUIT_WINDOW 'srqw'
-
+enum
+{
 // Used for quick replies from the app_server
-#define SERVER_TRUE 'svtr'
-#define SERVER_FALSE 'svfl'
+SERVER_TRUE='_srt',
+SERVER_FALSE,
+
+// Application definitions
+AS_CREATE_APP,
+AS_DELETE_APP,
+AS_QUIT_APP,
+
+AS_SET_SERVER_PORT,
+
+AS_CREATE_WINDOW,
+AS_DELETE_WINDOW,
+
+AS_SET_CURSOR_DATA,
+AS_SET_CURSOR_BCURSOR,
+AS_SET_CURSOR_BBITMAP,
+AS_SHOW_CURSOR,
+AS_HIDE_CURSOR,
+AS_OBSCURE_CURSOR,
+AS_QUERY_CURSOR_HIDDEN,
+
+AS_BEGIN_RECT_TRACKING,
+AS_END_RECT_TRACKING,
+
+// Window definitions
+AS_SHOW_WINDOW,
+AS_HIDE_WINDOW,
+AS_QUIT_WINDOW,
+AS_SEND_BEHIND,
+AS_SET_LOOK,
+AS_SET_FEEL,
+AS_SET_FLAGS,
 
 // Font-related server communications
-#define QUERY_FONTS_CHANGED 'qfch'
-#define UPDATED_CLIENT_FONTLIST 'ucfl'
-#define GET_FAMILY_ID 'fmid'
-#define GET_STYLE_ID 'stid'
-#define GET_STYLE_FOR_FACE 'stff'
+AS_QUERY_FONTS_CHANGED,
+AS_UPDATED_CLIENT_FONTLIST,
+AS_GET_FAMILY_ID,
+AS_GET_STYLE_ID,
+AS_GET_STYLE_FOR_FACE,
 
 // This will be modified. Currently a kludge for the input server until
 // BScreens are implemented by the IK Taeam
-#define GET_SCREEN_MODE 'gsmd'
+AS_GET_SCREEN_MODE,
 
-#define SET_UI_COLORS 'suic'
-#define GET_UI_COLOR 'guic'
-#define SET_DECORATOR 'sdec'
-#define GET_DECORATOR 'gdec'
+// Global function call defs
+AS_SET_UI_COLORS,
+AS_GET_UI_COLOR,
+AS_SET_DECORATOR,
+AS_GET_DECORATOR,
 
-// Cursor-related communications
-#define SET_CURSOR_DATA 'sscd'
-#define SET_CURSOR_BCURSOR 'sscb'
-#define SET_CURSOR_BBITMAP 'sscB'
-#define SHOW_CURSOR 'srsc'
-#define HIDE_CURSOR 'srhc'
-#define OBSCURE_CURSOR 'sroc'
-#define QUERY_CURSOR_HIDDEN 'sqch'
+AS_COUNT_WORKSPACES,
+AS_SET_WORKSPACE_COUNT,
+AS_CURRENT_WORKSPACE,
+AS_ACTIVATE_WORKSPACE,
+AS_SET_SCREEN_MODE,
+AS_GET_SCROLLBAR_INFO,
+AS_SET_SCROLLBAR_INFO,
+AS_IDLE_TIME,
+AS_SELECT_PRINTER_PANEL,
+AS_ADD_PRINTER_PANEL,
+AS_RUN_BE_ABOUT,
+AS_SET_FOCUS_FOLLOWS_MOUSE,
+AS_FOCUS_FOLLOWS_MOUSE,
 
-#define BEGIN_RECT_TRACKING 'sbrt'
-#define END_RECT_TRACKING 'sert'
+// Graphics calls
+AS_BEGIN_TRANSACTION,
+AS_END_TRANSACTION,
+AS_SET_HIGH_COLOR,
+AS_SET_LOW_COLOR,
+AS_SET_VIEW_COLOR,
 
-#define GFX_COUNT_WORKSPACES 'gcws'
-#define GFX_SET_WORKSPACE_COUNT 'ggwc'
-#define GFX_CURRENT_WORKSPACE 'ggcw'
-#define GFX_ACTIVATE_WORKSPACE 'gaws'
-#define GFX_GET_SYSTEM_COLORS 'gsyc'
-#define GFX_SET_SYSTEM_COLORS 'gsyc'
-#define GFX_SET_SCREEN_MODE 'gssm'
-#define GFX_GET_SCROLLBAR_INFO 'ggsi'
-#define GFX_SET_SCROLLBAR_INFO 'gssi'
-#define GFX_IDLE_TIME 'gidt'
-#define GFX_SELECT_PRINTER_PANEL 'gspp'
-#define GFX_ADD_PRINTER_PANEL 'gapp'
-#define GFX_RUN_BE_ABOUT 'grba'
-#define GFX_SET_FOCUS_FOLLOWS_MOUSE 'gsfm'
-#define GFX_FOCUS_FOLLOWS_MOUSE 'gffm'
+AS_STROKE_ARC,
+AS_STROKE_BEZIER,
+AS_STROKE_ELLIPSE,
+AS_STROKE_LINE,
+AS_STROKE_LINEARRAY,
+AS_STROKE_POLYGON,
+AS_STROKE_RECT,
+AS_STROKE_ROUNDRECT,
+AS_STROKE_SHAPE,
+AS_STROKE_TRIANGLE,
 
-#define GFX_SET_HIGH_COLOR 'gshc'
-#define GFX_SET_LOW_COLOR 'gslc'
-#define GFX_SET_VIEW_COLOR 'gsvc'
+AS_FILL_ARC,
+AS_FILL_BEZIER,
+AS_FILL_ELLIPSE,
+AS_FILL_POLYGON,
+AS_FILL_RECT,
+AS_FILL_REGION,
+AS_FILL_ROUNDRECT,
+AS_FILL_SHAPE,
+AS_FILL_TRIANGLE,
 
-#define GFX_STROKE_ARC 'gsar'
-#define GFX_STROKE_BEZIER 'gsbz'
-#define GFX_STROKE_ELLIPSE 'gsel'
-#define GFX_STROKE_LINE 'gsln'
-#define GFX_STROKE_POLYGON 'gspy'
-#define GFX_STROKE_RECT 'gsrc'
-#define GFX_STROKE_ROUNDRECT 'gsrr'
-#define GFX_STROKE_SHAPE 'gssh'
-#define GFX_STROKE_TRIANGLE 'gstr'
+AS_MOVEPENBY,
+AS_MOVEPENTO,
+AS_SETPENSIZE,
 
-#define GFX_FILL_ARC 'gfar'
-#define GFX_FILL_BEZIER 'gfbz'
-#define GFX_FILL_ELLIPSE 'gfel'
-#define GFX_FILL_POLYGON 'gfpy'
-#define GFX_FILL_RECT 'gfrc'
-#define GFX_FILL_REGION 'gfrg'
-#define GFX_FILL_ROUNDRECT 'gfrr'
-#define GFX_FILL_SHAPE 'gfsh'
-#define GFX_FILL_TRIANGLE 'gftr'
+AS_DRAW_STRING,
+AS_SET_FONT,
+AS_SET_FONT_SIZE,
 
-#define GFX_MOVEPENBY 'gmpb'
-#define GFX_MOVEPENTO 'gmpt'
-#define GFX_SETPENSIZE 'gsps'
+AS_FLUSH,
+AS_SYNC,
 
-#define GFX_DRAW_STRING 'gdst'
-#define GFX_SET_FONT 'gsft'
-#define GFX_SET_FONT_SIZE 'gsfs'
+AS_LAYER_CREATE,
+AS_LAYER_DELETE,
+AS_LAYER_ADD_CHILD,
+AS_LAYER_REMOVE_CHILD,
+AS_LAYER_REMOVE_SELF,
+AS_LAYER_SHOW,
+AS_LAYER_HIDE,
+AS_LAYER_MOVE,
+AS_LAYER_RESIZE,
+AS_LAYER_INVALIDATE,
+AS_LAYER_DRAW,
 
-#define GFX_FLUSH 'gfsh'
-#define GFX_SYNC 'gsyn'
+AS_LAYER_GET_TOKEN,
+AS_LAYER_ADD,
+AS_LAYER_REMOVE
+};
 
-#define LAYER_CREATE 'lycr'
-#define LAYER_DELETE 'lydl'
-#define LAYER_ADD_CHILD 'lyac'
-#define LAYER_REMOVE_CHILD 'lyrc'
-#define LAYER_REMOVE_SELF 'lyrs'
-#define LAYER_SHOW 'lysh'
-#define LAYER_HIDE 'lyhd'
-#define LAYER_MOVE 'lymv'
-#define LAYER_RESIZE 'lyre'
-#define LAYER_INVALIDATE 'lyin'
-#define LAYER_DRAW 'lydr'
-
-#define VIEW_GET_TOKEN 'vgtk'
-#define VIEW_ADD 'vadd'
-#define VIEW_REMOVE 'vrem'
 #endif