diff --git a/lib/base/heimbase.c b/lib/base/heimbase.c
index b1bbf7cad..56ed0dbd8 100644
--- a/lib/base/heimbase.c
+++ b/lib/base/heimbase.c
@@ -34,6 +34,7 @@
  */
 
 #include "baselocl.h"
+#include "heimbase-atomics.h"
 #include <syslog.h>
 
 static heim_base_atomic_integer_type tidglobal = HEIM_TID_USER;
diff --git a/lib/base/heimbase.h b/lib/base/heimbase.h
index 5d5c4e3b7..c54c2d873 100644
--- a/lib/base/heimbase.h
+++ b/lib/base/heimbase.h
@@ -36,8 +36,6 @@
 #ifndef HEIM_BASE_H
 #define HEIM_BASE_H 1
 
-#include "config.h"
-
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/socket.h>
@@ -537,7 +535,6 @@ void *heim_w32_getspecific(unsigned long);
 void heim_w32_service_thread_detach(void *);
 
 #include <heim_threads.h>
-#include "heimbase-atomics.h"
 #include <com_err.h>
 
 /*
diff --git a/lib/base/log.c b/lib/base/log.c
index b90a8b78a..80965f5bb 100644
--- a/lib/base/log.c
+++ b/lib/base/log.c
@@ -35,6 +35,7 @@
 
 #include "baselocl.h"
 #include "heim_threads.h"
+#include "heimbase-atomics.h"
 #include "heimbase.h"
 #include "heimbase-svc.h"
 #include <assert.h>
diff --git a/lib/gssapi/mech/mech_locl.h b/lib/gssapi/mech/mech_locl.h
index d451b87c4..f0cfcb5e6 100644
--- a/lib/gssapi/mech/mech_locl.h
+++ b/lib/gssapi/mech/mech_locl.h
@@ -42,6 +42,7 @@
 #include <ctype.h>
 
 #include <heimbase.h>
+#include "heimbase-atomics.h"
 
 #include <gssapi_asn1.h>
 #include <der.h>
diff --git a/lib/krb5/krb5_locl.h b/lib/krb5/krb5_locl.h
index 666e6549b..75ca24b66 100644
--- a/lib/krb5/krb5_locl.h
+++ b/lib/krb5/krb5_locl.h
@@ -82,6 +82,7 @@ struct mbuf;
 #include <com_err.h>
 
 #include <heimbase.h>
+#include "heimbase-atomics.h"
 
 #define HEIMDAL_TEXTDOMAIN "heimdal_krb5"