diff --git a/src/avrintel.c b/src/avrintel.c
index c31b01eb..edf7d114 100644
--- a/src/avrintel.c
+++ b/src/avrintel.c
@@ -13,6 +13,17 @@
  *
  */
 
+#include "ac_cfg.h"
+
+#include <ctype.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <limits.h>
+#include <unistd.h>
+
 #include "avrintel.h"
 
 const uPcore_t uP_table[] = {   // Value of -1 typically means unknown
diff --git a/src/avrintel.h b/src/avrintel.h
index b4f40a44..69f4862c 100644
--- a/src/avrintel.h
+++ b/src/avrintel.h
@@ -16,7 +16,7 @@
 #ifndef AVRINTEL_H
 #define AVRINTEL_H
 
-#include "config.h"
+#include "libavrdude.h"
 
 typedef struct {                // Value of -1 typically means unknown
   const char *name;             // Name of part