diff --git a/application/AppConstants.h b/application/AppConstants.h
index 70240f8..029ca96 100644
--- a/application/AppConstants.h
+++ b/application/AppConstants.h
@@ -22,17 +22,4 @@ const rgb_color APP_SELEND_COLOR = {230, 113, 9};
 #define APP_MENTION_BEEP "Chat-o-Matic mention"
 #define APP_MESSAGE_BEEP "Chat-o-Matic message"
 
-/**
- * Status codes.
- */
-enum UserStatus {
-	STATUS_ONLINE			= 1,
-	STATUS_AWAY				= 2,
-	STATUS_DO_NOT_DISTURB	= 3,
- 	STATUS_CUSTOM_STATUS	= 4,
- 	STATUS_INVISIBLE		= 5,
-	STATUS_OFFLINE			= 6,
-	STATUS_STATUSES			= 7
-};
-
 #endif	// _APP_CONSTANTS_H
diff --git a/application/StatusManager.h b/application/StatusManager.h
index 8fc0168..85cfb5c 100644
--- a/application/StatusManager.h
+++ b/application/StatusManager.h
@@ -7,8 +7,8 @@
 
 #include <Messenger.h>
 
-#include "AppConstants.h"
 #include "Notifier.h"
+#include "UserStatus.h"
 
 
 class StatusManager : public Notifier {
diff --git a/application/User.h b/application/User.h
index 967afd8..b28d39a 100644
--- a/application/User.h
+++ b/application/User.h
@@ -7,16 +7,17 @@
 #ifndef USER_H
 #define USER_H
 
-#include <String.h>
+#include <GraphicsDefs.h>
 #include <Message.h>
 #include <Messenger.h>
 #include <ObjectList.h>
 #include <Path.h>
+#include <String.h>
 
 #include <libsupport/KeyMap.h>
 
-#include "AppConstants.h"
 #include "Notifier.h"
+#include "UserStatus.h"
 
 class BBitmap;
 
diff --git a/application/UserStatus.h b/application/UserStatus.h
new file mode 100644
index 0000000..d6ab32f
--- /dev/null
+++ b/application/UserStatus.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2009-2011, Andrea Anzani. All rights reserved.
+ * Copyright 2009-2011, Pier Luigi Fiorini. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _USER_STATUS_H
+#define _USER_STATUS_H
+
+/**
+ * Status codes.
+ */
+enum UserStatus {
+	STATUS_ONLINE			= 1,
+	STATUS_AWAY				= 2,
+	STATUS_DO_NOT_DISTURB	= 3,
+ 	STATUS_CUSTOM_STATUS	= 4,
+ 	STATUS_INVISIBLE		= 5,
+	STATUS_OFFLINE			= 6,
+	STATUS_STATUSES			= 7
+};
+
+#endif	// _USER_STATUS_H
diff --git a/application/views/ReplicantMenuItem.h b/application/views/ReplicantMenuItem.h
index 03ed23e..79a42bc 100644
--- a/application/views/ReplicantMenuItem.h
+++ b/application/views/ReplicantMenuItem.h
@@ -10,7 +10,7 @@
 
 #include <libinterface/BitmapMenuItem.h>
 
-#include "AppConstants.h"
+#include "UserStatus.h"
 
 class BBitmap;
 
diff --git a/application/views/ReplicantStatusView.h b/application/views/ReplicantStatusView.h
index 2d2d9fe..ae26338 100644
--- a/application/views/ReplicantStatusView.h
+++ b/application/views/ReplicantStatusView.h
@@ -13,8 +13,8 @@
 #include <Resources.h>
 #include <View.h>
 
-#include "AppConstants.h"
 #include "AppResources.h"
+#include "UserStatus.h"
 
 
 class BPopUpMenu;
diff --git a/application/views/StatusMenuItem.h b/application/views/StatusMenuItem.h
index 75613bb..4c802ef 100644
--- a/application/views/StatusMenuItem.h
+++ b/application/views/StatusMenuItem.h
@@ -9,7 +9,7 @@
 
 #include <libinterface/BitmapMenuItem.h>
 
-#include "AppConstants.h"
+#include "UserStatus.h"
 
 class BBitmap;
 
diff --git a/application/views/StatusView.h b/application/views/StatusView.h
index 9f82ddd..5399494 100644
--- a/application/views/StatusView.h
+++ b/application/views/StatusView.h
@@ -8,7 +8,7 @@
 
 #include <View.h>
 
-#include "AppConstants.h"
+#include "UserStatus.h"
 #include "Observer.h"
 
 class BPopUpMenu;
diff --git a/application/windows/UserInfoWindow.h b/application/windows/UserInfoWindow.h
index 0a708be..eb6ade0 100644
--- a/application/windows/UserInfoWindow.h
+++ b/application/windows/UserInfoWindow.h
@@ -14,8 +14,8 @@
 #include <TextView.h>
 #include <StringView.h>
 
-#include "AppConstants.h"
 #include "Observer.h"
+#include "UserStatus.h"
 
 class BitmapView;
 class User;
diff --git a/protocols/irc/IrcProtocol.cpp b/protocols/irc/IrcProtocol.cpp
index 8ef2a26..8a1d62b 100644
--- a/protocols/irc/IrcProtocol.cpp
+++ b/protocols/irc/IrcProtocol.cpp
@@ -18,10 +18,10 @@
 
 #include <libinterface/BitmapUtils.h>
 
-#include <AppConstants.h>
 #include <ChatOMatic.h>
 #include <ChatProtocolMessages.h>
 #include <Flags.h>
+#include <UserStatus.h>
 #include <Utils.h>
 
 
diff --git a/protocols/purple/PurpleApp.h b/protocols/purple/PurpleApp.h
index 6fec2bb..df88069 100644
--- a/protocols/purple/PurpleApp.h
+++ b/protocols/purple/PurpleApp.h
@@ -29,7 +29,7 @@
 #include <StringList.h>
 
 #include <libsupport/KeyMap.h>
-#include <AppConstants.h>
+#include <UserStatus.h>
 
 
 typedef KeyMap<BString, BString> StringMap;
diff --git a/protocols/xmpp/JabberHandler.h b/protocols/xmpp/JabberHandler.h
index c575665..b766005 100644
--- a/protocols/xmpp/JabberHandler.h
+++ b/protocols/xmpp/JabberHandler.h
@@ -32,9 +32,9 @@
 #include <gloox/vcardhandler.h>
 #include <gloox/vcardmanager.h>
 
-#include <AppConstants.h>
-#include <ChatProtocol.h>
 #include <libsupport/KeyMap.h>
+#include <ChatProtocol.h>
+#include <UserStatus.h>
 
 class BList;
 class InviteHandler;