@@ -1,10 +1,11 @@
 /*
- * Copyright (c) 2010, 2011, 2012, Jonathan Schleifer <js@webkeks.org>
+ * Copyright (c) 2010, 2011, 2012, 2013, 2016
+ *   Jonathan Schleifer <js@heap.zone>
  * Copyright (c) 2011, 2012, Florian Zeitz <florob@babelmonkeys.de>
  *
- * 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.
  *
@@ -41,14 +42,11 @@
  */
 @protocol XMPPConnectionDelegate
 #ifndef XMPP_CONNECTION_M
     <OFObject>
 #endif
-#ifdef OF_HAVE_OPTIONAL_PROTOCOLS
 @optional
-#endif
-
 /**
  * \brief This callback is called when the connection received an element.
  *
  * \param connection The connection that received the element
  * \param element The element that was received
@@ -145,14 +143,12 @@
 @end
 
 /**
  * \brief A class which abstracts a connection to an XMPP service.
  */
-@interface XMPPConnection: OFObject
-#ifdef OF_HAVE_OPTONAL_PROTOCOLS
-    <OFXMLParserDelegate, OFXMLElementBuilderDelegate>
-#endif
+@interface XMPPConnection: OFObject <OFXMLParserDelegate,
+    OFXMLElementBuilderDelegate>
 {
 	id _socket;
 	OFXMLParser *_parser, *_oldParser;
 	OFXMLElementBuilder *_elementBuilder, *_oldElementBuilder;
 	OFString *_username, *_password, *_server, *_resource;
@@ -172,11 +168,10 @@
 	bool _supportsRosterVersioning;
 	bool _supportsStreamManagement;
 	unsigned int _lastID;
 }
 
-#ifdef OF_HAVE_PROPERTIES
 /// \brief The username to use for authentication
 @property (copy) OFString *username;
 /// \brief The password to use for authentication
 @property (copy) OFString *password;
 /**
@@ -209,11 +204,10 @@
 @property (readonly) bool encrypted;
 /// \brief Whether roster versioning is supported
 @property (readonly) bool supportsRosterVersioning;
 /// \brief Whether stream management is supported
 @property (readonly) bool supportsStreamManagement;
-#endif
 
 /**
  * \brief Creates a new autoreleased XMPPConnection.
  *
  * \return A new autoreleased XMPPConnection