1 files changed, 11 insertions, 5 deletions

diff --git a/libopie2/opiepim/ocontactfields.h b/libopie2/opiepim/ocontactfields.h
index 993ce3b..9e89532 100644
--- a/libopie2/opiepim/ocontactfields.h
+++ b/libopie2/opiepim/ocontactfields.h
@@ -27,18 +27,24 @@
                              Boston, MA 02111-1307, USA.
 */
-#ifndef OPIE_CONTACTS_FIELDS
-#define OPIE_CONTACTS_FIELDS
+
+#ifndef OCONTACTFIELDS_H
+#define OCONTACTFIELDS_H
 
 class QStringList;
 
+/* OPIE */
+#include <opie2/ocontact.h>
+
+/* QT */
 #include <qmap.h>
 #include <qstring.h>
-#include <opie2/ocontact.h>
 
 #define CONTACT_FIELD_ORDER_NAME "opie-contactfield-order"
 #define DEFAULT_FIELD_ORDER "__________"
  
-namespace Opie {
-class OContactFields{
+namespace Opie
+{
+class OContactFields
+{
 
  public: