Index: .gitignore
==================================================================
--- .gitignore
+++ .gitignore
@@ -1,9 +1,10 @@
 *.dll
 *.dylib
 *.o
 *.so
+*.so.*
 *~
 .deps
 aclocal.m4
 autom4te.cache
 buildsys.mk

Index: autogen.sh
==================================================================
--- autogen.sh
+++ autogen.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 set -e
 
 # Set a version for OpenBSD
 : ${AUTOCONF_VERSION:=2.69}
-: ${AUTOMAKE_VERSION:=1.15}
+: ${AUTOMAKE_VERSION:=1.16}
 export AUTOCONF_VERSION AUTOMAKE_VERSION
 
 aclocal -I build-aux/m4
 autoconf
 autoheader

Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -35,9 +35,9 @@
 	   ObjXMPP.h		\
 	   XMPPStorage.h
 
 include ../buildsys.mk
 
-CPPFLAGS += -I.. -DHAVE_CONFIG_H
+CPPFLAGS += -I..
 LD = ${OBJC}
 FRAMEWORK_LIBS := ${OBJOPENSSL_FRAMEWORK_LIBS} ${OBJFW_FRAMEWORK_LIBS} ${LIBS}
 LIBS := ${OBJOPENSSL_LIBS} ${OBJFW_LIBS} ${LIBS}

Index: src/XMPPAuthenticator.m
==================================================================
--- src/XMPPAuthenticator.m
+++ src/XMPPAuthenticator.m
@@ -19,13 +19,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #import "XMPPAuthenticator.h"
 
 @implementation XMPPAuthenticator
 @synthesize authzid = _authzid, authcid = _authcid, password = _password;

Index: src/XMPPCallback.m
==================================================================
--- src/XMPPCallback.m
+++ src/XMPPCallback.m
@@ -18,13 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #import "XMPPCallback.h"
 
 @implementation XMPPCallback
 #ifdef OF_HAVE_BLOCKS

Index: src/XMPPConnection.m
==================================================================
--- src/XMPPConnection.m
+++ src/XMPPConnection.m
@@ -20,13 +20,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #define XMPP_CONNECTION_M
 
 #include <assert.h>
 

Index: src/XMPPEXTERNALAuth.m
==================================================================
--- src/XMPPEXTERNALAuth.m
+++ src/XMPPEXTERNALAuth.m
@@ -18,13 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #import "XMPPEXTERNALAuth.h"
 
 @implementation XMPPEXTERNALAuth: XMPPAuthenticator
 + (instancetype)EXTERNALAuth

Index: src/XMPPExceptions.m
==================================================================
--- src/XMPPExceptions.m
+++ src/XMPPExceptions.m
@@ -19,13 +19,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdlib.h>
 
 #import "XMPPExceptions.h"
 #import "XMPPConnection.h"

Index: src/XMPPFileStorage.m
==================================================================
--- src/XMPPFileStorage.m
+++ src/XMPPFileStorage.m
@@ -18,13 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdlib.h>
 
 #import <ObjFW/OFString.h>
 #import <ObjFW/OFArray.h>

Index: src/XMPPIQ.m
==================================================================
--- src/XMPPIQ.m
+++ src/XMPPIQ.m
@@ -19,13 +19,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #import "namespaces.h"
 #import "XMPPIQ.h"
 
 @implementation XMPPIQ

Index: src/XMPPJID.m
==================================================================
--- src/XMPPJID.m
+++ src/XMPPJID.m
@@ -19,13 +19,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <string.h>
 
 #include <stringprep.h>
 

Index: src/XMPPMessage.m
==================================================================
--- src/XMPPMessage.m
+++ src/XMPPMessage.m
@@ -19,13 +19,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #import "XMPPMessage.h"
 #import "namespaces.h"
 
 @implementation XMPPMessage

Index: src/XMPPMulticastDelegate.m
==================================================================
--- src/XMPPMulticastDelegate.m
+++ src/XMPPMulticastDelegate.m
@@ -18,13 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #import <ObjFW/ObjFW.h>
 #import <ObjFW/OFData.h>
 
 #import "XMPPMulticastDelegate.h"

Index: src/XMPPPLAINAuth.m
==================================================================
--- src/XMPPPLAINAuth.m
+++ src/XMPPPLAINAuth.m
@@ -18,13 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #import "XMPPPLAINAuth.h"
 #import "XMPPExceptions.h"
 
 @implementation XMPPPLAINAuth

Index: src/XMPPPresence.m
==================================================================
--- src/XMPPPresence.m
+++ src/XMPPPresence.m
@@ -19,13 +19,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <inttypes.h>
 
 #import "XMPPPresence.h"
 #import "namespaces.h"

Index: src/XMPPRoster.m
==================================================================
--- src/XMPPRoster.m
+++ src/XMPPRoster.m
@@ -19,13 +19,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #define XMPP_ROSTER_M
 
 #include <assert.h>
 

Index: src/XMPPRosterItem.m
==================================================================
--- src/XMPPRosterItem.m
+++ src/XMPPRosterItem.m
@@ -19,13 +19,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #import "XMPPRosterItem.h"
 #import "XMPPJID.h"
 
 #import <ObjFW/macros.h>

Index: src/XMPPSCRAMAuth.m
==================================================================
--- src/XMPPSCRAMAuth.m
+++ src/XMPPSCRAMAuth.m
@@ -19,13 +19,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <string.h>
 #include <assert.h>
 #include <openssl/rand.h>
 

Index: src/XMPPStanza.m
==================================================================
--- src/XMPPStanza.m
+++ src/XMPPStanza.m
@@ -19,13 +19,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #import "XMPPStanza.h"
 #import "XMPPJID.h"
 #import "namespaces.h"
 

Index: src/XMPPXMLElementBuilder.m
==================================================================
--- src/XMPPXMLElementBuilder.m
+++ src/XMPPXMLElementBuilder.m
@@ -18,13 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #import "XMPPXMLElementBuilder.h"
 
 #import <ObjFW/OFMalformedXMLException.h>