diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bdad32518..c02d4d541 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -156,7 +156,7 @@ add_library(libavrdude
     avrftdi_tpi.c
     avrftdi_tpi.h
     avrintel.c
-    avrintel.h
+    libavrdude-avrintel.h
     avrpart.c
     bitbang.c
     bitbang.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 58bd116b7..8863291a9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -103,7 +103,7 @@ libavrdude_a_SOURCES = \
 	avrftdi_tpi.c \
 	avrftdi_tpi.h \
 	avrintel.c \
-	avrintel.h \
+	libavrdude-avrintel.h \
 	avrpart.c \
 	bitbang.c \
 	bitbang.h \
diff --git a/src/avrintel.c b/src/avrintel.c
index 39d04d586..2b73e0893 100644
--- a/src/avrintel.c
+++ b/src/avrintel.c
@@ -9,7 +9,7 @@
  * Meta-author Stefan Rueger <stefan.rueger@urclocks.com>
  *
  * v 1.3
- * 22.12.2023
+ * 14.02.2024
  *
  */
 
@@ -24,7 +24,7 @@
 #include <limits.h>
 #include <unistd.h>
 
-#include "avrintel.h"
+#include "libavrdude.h"
 
 // Given the MCU id return index in uP_table or -1 if not found
 int upidxmcuid(int mcuid) {
diff --git a/src/avrintel.h b/src/libavrdude-avrintel.h
similarity index 99%
rename from src/avrintel.h
rename to src/libavrdude-avrintel.h
index c82df5b8e..9e7197b0f 100644
--- a/src/avrintel.h
+++ b/src/libavrdude-avrintel.h
@@ -1,7 +1,7 @@
 /*
  * Do not edit: automatically generated by mkavrintel.pl
  *
- * avrintel.h
+ * libavrdude-avrintel.h
  *
  * Microchip AVR8L, AVR8, XMEGA and AVR8X family description of interrupts, configurations and more
  *
@@ -9,12 +9,16 @@
  * Meta-author Stefan Rueger <stefan.rueger@urclocks.com>
  *
  * v 1.3
- * 22.12.2023
+ * 14.02.2024
  *
  */
 
-#ifndef avrintel_h
-#define avrintel_h
+#ifndef libavrdude_avrintel_h
+#define libavrdude_avrintel_h
+
+#ifndef LIBAVRDUDE_INCLUDE_INTERNAL_HEADERS
+#error Do not directly #include <libavrdude-avrintel.h>. Do #include <libavrdude.h> instead.
+#endif
 
 typedef struct {
   int value;                    // Value (to be shifted into mask position)
diff --git a/src/libavrdude.h b/src/libavrdude.h
index e53ccc398..648fceba3 100644
--- a/src/libavrdude.h
+++ b/src/libavrdude.h
@@ -25,7 +25,9 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include "avrintel.h"
+#define LIBAVRDUDE_INCLUDE_INTERNAL_HEADERS
+#include "libavrdude-avrintel.h"
+#undef  LIBAVRDUDE_INCLUDE_INTERNAL_HEADERS
 
 typedef uint32_t pinmask_t;
 /*
diff --git a/src/urclock_private.h b/src/urclock_private.h
index 9f95a3323..6b70a48b2 100644
--- a/src/urclock_private.h
+++ b/src/urclock_private.h
@@ -21,8 +21,6 @@
 #ifndef urclock_private_h__
 #define urclock_private_h__
 
-#include "avrintel.h"
-
 // EEPROM or flash cache for bytewise access
 typedef struct {
   int base, size;