2 files changed, 20 insertions, 11 deletions
diff --git a/src/include/errno.h b/src/include/errno.h
index 68966bd96..43e207636 100644
--- a/src/include/errno.h
+++ b/src/include/errno.h
@@ -170,17 +170,6 @@
 #define ETIMEDOUT	0xf6	/**< Connection timed out */
 #define EWOULDBLOCK	EAGAIN	/**< Resource temporarily unavailable */
 
-/* Data structures and declarations */
-
-#include <gpxe/tables.h>
-
 extern int errno;
 
-struct errortab {
-	int errno;
-	const char *text;
-};
-
-#define __errortab __table(errortab,01)
-
 #endif /* ERRNO_H */
diff --git a/src/include/gpxe/errortab.h b/src/include/gpxe/errortab.h
new file mode 100644
index 000000000..1ca7fe551
--- /dev/null
+++ b/src/include/gpxe/errortab.h
@@ -0,0 +1,20 @@
+#ifndef _GPXE_ERRORTAB_H
+#define _GPXE_ERRORTAB_H
+
+/** @file
+ *
+ * Error message tables
+ *
+ */
+
+#include <errno.h>
+#include <gpxe/tables.h>
+
+struct errortab {
+	int errno;
+	const char *text;
+};
+
+#define __errortab __table ( errortab, 01 )
+
+#endif /* _GPXE_ERRORTAB_H */