@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2013, Florian Zeitz <florob@babelmonkeys.de>
+ * Copyright (c) 2013, 2016, Jonathan Schleifer <js@heap.zone>
  *
- * https://webkeks.org/git/?p=objxmpp.git
+ * https://heap.zone/git/?p=objxmpp.git
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice is present in all copies.
  *
@@ -33,13 +34,11 @@
 /**
  * \brief A protocol that should be (partially) implemented by delegates
  *	  of a XMPPContactManager
  */
 @protocol XMPPContactManagerDelegate <OFObject>
-#ifdef OF_HAVE_OPTIONAL_PROTOCOLS
 @optional
-#endif
 /**
  * \brief This callback is called whenever a new contact enters the users roster
  *
  * \param manager The contact manager that added the contact
  * \param contact The contact that was added
@@ -99,25 +98,21 @@
  * \brief A class tracking a XMPPContact instance for each contact in the roster
  *
  * This class delegates to a XMPPConnection and a XMPPRoster, thereby tracking
  * each contacts presences and the current XMPPRosterItem.
  */
-@interface XMPPContactManager: OFObject
-#ifdef OF_HAVE_OPTIONAL_PROTOCOLS
-    <XMPPConnectionDelegate, XMPPRosterDelegate>
-#endif
+@interface XMPPContactManager: OFObject <XMPPConnectionDelegate,
+    XMPPRosterDelegate>
 {
 	OFMutableDictionary *_contacts;
 	XMPPConnection *_connection;
 	XMPPRoster *_roster;
 	XMPPMulticastDelegate *_delegates;
 }
 
-#ifdef OF_HAVE_PROPERTIES
 /// \brief The tracked contacts, with their bare JID as key
 @property (readonly) OFDictionary *contacts;
-#endif
 
 /*!
  * @brief Initializes an already allocated XMPPContactManager.
  *
  * @param connection The connection to be used to track contacts