Removed "TMW" and "TMWSERV" from header guards

7 files changed, 17 insertions, 17 deletions

diff --git a/src/account-server/account.hpp b/src/account-server/account.hpp
index 71575d78..a8e1ee21 100644
--- a/src/account-server/account.hpp
+++ b/src/account-server/account.hpp
@@ -18,8 +18,8 @@
  *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#ifndef _TMWSERV_ACCOUNT_H_
-#define _TMWSERV_ACCOUNT_H_
+#ifndef ACCOUNT_H
+#define ACCOUNT_H
 
 #include <string>
 #include <vector>
@@ -212,4 +212,4 @@ class Account
 
 typedef std::vector< Account * > Accounts;
 
-#endif // _TMWSERV_ACCOUNT_H_
+#endif // ACCOUNT_H
diff --git a/src/account-server/accountclient.hpp b/src/account-server/accountclient.hpp
index 303627a0..faf9458f 100644
--- a/src/account-server/accountclient.hpp
+++ b/src/account-server/accountclient.hpp
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMWSERV_ACCOUNTCLIENT_H_
-#define _TMWSERV_ACCOUNTCLIENT_H_
+#ifndef ACCOUNTCLIENT_H
+#define ACCOUNTCLIENT_H
 
 #include <enet/enet.h>
 
diff --git a/src/account-server/accounthandler.hpp b/src/account-server/accounthandler.hpp
index c5793b54..12cca012 100644
--- a/src/account-server/accounthandler.hpp
+++ b/src/account-server/accounthandler.hpp
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMWSERV_ACCOUNTHANDLER_H_
-#define _TMWSERV_ACCOUNTHANDLER_H_
+#ifndef ACCOUNTHANDLER_H
+#define ACCOUNTHANDLER_H
 
 #include <string>
 
diff --git a/src/account-server/character.hpp b/src/account-server/character.hpp
index a78d46a4..73554b0e 100644
--- a/src/account-server/character.hpp
+++ b/src/account-server/character.hpp
@@ -18,8 +18,8 @@
  *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#ifndef _TMWSERV_CHARACTERDATA
-#define _TMWSERV_CHARACTERDATA
+#ifndef CHARACTERDATA_HPP
+#define CHARACTERDATA_HPP
 
 #include <string>
 #include <vector>
diff --git a/src/account-server/dalstorage.hpp b/src/account-server/dalstorage.hpp
index 3054edc4..324a1bd7 100644
--- a/src/account-server/dalstorage.hpp
+++ b/src/account-server/dalstorage.hpp
@@ -18,8 +18,8 @@
  *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#ifndef _TMWSERV_DALSTORAGE_H_
-#define _TMWSERV_DALSTORAGE_H_
+#ifndef DALSTORAGE_H
+#define DALSTORAGE_H
 
 #include <list>
 #include <map>
@@ -416,4 +416,4 @@ class DALStorage
 
 extern DALStorage *storage;
 
-#endif // _TMWSERV_DALSTORAGE_H_
+#endif // DALSTORAGE_H
diff --git a/src/account-server/dalstoragesql.hpp b/src/account-server/dalstoragesql.hpp
index 4607cfc7..f0d9a69e 100644
--- a/src/account-server/dalstoragesql.hpp
+++ b/src/account-server/dalstoragesql.hpp
@@ -18,8 +18,8 @@
  *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#ifndef _MANASERV_DALSTORAGE_SQL_H_
-#define _MANASERV_DALSTORAGE_SQL_H_
+#ifndef _MANASERV_DALSTORAGE_SQL_H
+#define _MANASERV_DALSTORAGE_SQL_H
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -148,4 +148,4 @@ static const char *ONLINE_USERS_TBL_NAME = "mana_online_list";
  */
 static const char *TRANSACTION_TBL_NAME = "mana_transactions";
 
-#endif // _MANASERV_DALSTORAGE_SQL_H_
+#endif // _MANASERV_DALSTORAGE_SQL_H
diff --git a/src/account-server/serverhandler.hpp b/src/account-server/serverhandler.hpp
index dab3cf2e..100551b0 100644
--- a/src/account-server/serverhandler.hpp
+++ b/src/account-server/serverhandler.hpp
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMWSERV_SERVERHANDLER_H_
-#define _TMWSERV_SERVERHANDLER_H_
+#ifndef SERVERHANDLER_H
+#define SERVERHANDLER_H
 
 #include <iosfwd>
 #include <string>