diff --git a/.gitignore b/.gitignore
index 4cfd8f9a..63cfbd40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
 *~
+getdns*.tar.gz
+*.o
+.*.swp
 .deps/
 .libs/
 Makefile
diff --git a/src/common/getdns_address.c b/src/common/getdns_address.c
index 4e814f52..d6e85a63 100644
--- a/src/common/getdns_address.c
+++ b/src/common/getdns_address.c
@@ -28,7 +28,7 @@
  * THE SOFTWARE.
  */
 
-#include <getdns_libevent.h>
+#include <getdns_core_only.h>
 
 /* stuff to make it compile pedantically */
 #define UNUSED_PARAM(x) ((void)(x))
diff --git a/src/common/getdns_context.c b/src/common/getdns_context.c
index 8c6f9889..d2294b99 100644
--- a/src/common/getdns_context.c
+++ b/src/common/getdns_context.c
@@ -28,7 +28,7 @@
  * THE SOFTWARE.
  */
 
-#include <getdns_libevent.h>
+#include <getdns_core_only.h>
 
 /* stuff to make it compile pedantically */
 #define UNUSED_PARAM(x) ((void)(x))
diff --git a/src/common/getdns_convert.c b/src/common/getdns_convert.c
index 7642ea0d..487fb515 100644
--- a/src/common/getdns_convert.c
+++ b/src/common/getdns_convert.c
@@ -28,7 +28,7 @@
  * THE SOFTWARE.
  */
 
-#include <getdns_libevent.h>
+#include <getdns_core_only.h>
 
 /* stuff to make it compile pedantically */
 #define UNUSED_PARAM(x) ((void)(x))
diff --git a/src/common/getdns_dict.c b/src/common/getdns_dict.c
index 518af737..33feb803 100644
--- a/src/common/getdns_dict.c
+++ b/src/common/getdns_dict.c
@@ -31,7 +31,7 @@
 
 #include <search.h>
 #include <string.h>
-#include <getdns_libevent.h>
+#include <getdns_core_only.h>
 
 /* TODO: change this to make the walk safe for reentrant/multi-thread calls */
 struct getdns_list *walkresultlist;
diff --git a/src/common/getdns_general.c b/src/common/getdns_general.c
index bf3df0fc..e525ec7b 100644
--- a/src/common/getdns_general.c
+++ b/src/common/getdns_general.c
@@ -28,7 +28,7 @@
  * THE SOFTWARE.
  */
 
-#include <getdns_libevent.h>
+#include <getdns_core_only.h>
 
 /* stuff to make it compile pedantically */
 #define UNUSED_PARAM(x) ((void)(x))
diff --git a/src/common/getdns_hostname.c b/src/common/getdns_hostname.c
index 6a750479..6d55c19b 100644
--- a/src/common/getdns_hostname.c
+++ b/src/common/getdns_hostname.c
@@ -28,7 +28,7 @@
  * THE SOFTWARE.
  */
 
-#include <getdns_libevent.h>
+#include <getdns_core_only.h>
 
 /* stuff to make it compile pedantically */
 #define UNUSED_PARAM(x) ((void)(x))
diff --git a/src/common/getdns_list.c b/src/common/getdns_list.c
index 4921303c..3037134b 100644
--- a/src/common/getdns_list.c
+++ b/src/common/getdns_list.c
@@ -29,8 +29,7 @@
  */
 
 #include <string.h>
-#include <getdns_libevent.h>
-#include "getdns_core_only.h"
+#include <getdns_core_only.h>
 
 /*---------------------------------------- getdns_list_get_length */
 getdns_return_t
diff --git a/src/common/getdns_service.c b/src/common/getdns_service.c
index c99d7d1f..3ea3077b 100644
--- a/src/common/getdns_service.c
+++ b/src/common/getdns_service.c
@@ -28,7 +28,7 @@
  * THE SOFTWARE.
  */
 
-#include <getdns_libevent.h>
+#include <getdns_core_only.h>
 
 /* stuff to make it compile pedantically */
 #define UNUSED_PARAM(x) ((void)(x))
diff --git a/src/common/getdns_sync.c b/src/common/getdns_sync.c
index 4bd31c96..0e4ab639 100644
--- a/src/common/getdns_sync.c
+++ b/src/common/getdns_sync.c
@@ -27,7 +27,7 @@
  * THE SOFTWARE.
  */
 
-#include <getdns_libevent.h>
+#include <getdns_core_only.h>
 
 /* stuff to make it compile pedantically */
 #define UNUSED_PARAM(x) ((void)(x))
diff --git a/src/common/getdns_validate_dnssec.c b/src/common/getdns_validate_dnssec.c
index 321da431..e0a5c027 100644
--- a/src/common/getdns_validate_dnssec.c
+++ b/src/common/getdns_validate_dnssec.c
@@ -28,7 +28,7 @@
  * THE SOFTWARE.
  */
 
-#include <getdns_libevent.h>
+#include <getdns_core_only.h>
 
 /* stuff to make it compile pedantically */
 #define UNUSED_PARAM(x) ((void)(x))
diff --git a/src/example/example_all_functions.c b/src/example/example_all_functions.c
index c4ad41c5..babfc90e 100644
--- a/src/example/example_all_functions.c
+++ b/src/example/example_all_functions.c
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
-#include <getdns_libevent.h>
+#include <getdns_core_only.h>
 
 #define UNUSED_PARAM(x) ((void)(x))