diff --git a/prog/dump/isadump.c b/prog/dump/isadump.c index e0e6f000..ef3dd0ae 100644 --- a/prog/dump/isadump.c +++ b/prog/dump/isadump.c @@ -29,6 +29,7 @@ isadump -f 0xecf0 0x10 1 PC87366, temperature channel 2 */ +#include #include #include #include @@ -36,14 +37,6 @@ #include "util.h" #include "superio.h" - -/* To keep glibc2 happy */ -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 -#include -#else -#include -#endif - #ifdef __powerpc__ unsigned long isa_io_base = 0; /* XXX for now */ #endif /* __powerpc__ */ diff --git a/prog/dump/isaset.c b/prog/dump/isaset.c index e743755a..590f75c0 100644 --- a/prog/dump/isaset.c +++ b/prog/dump/isaset.c @@ -26,20 +26,13 @@ isaset -f 0x5010 0x12 Write 0x12 to location 0x5010 */ +#include #include #include #include #include #include "util.h" - -/* To keep glibc2 happy */ -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 -#include -#else -#include -#endif - #ifdef __powerpc__ unsigned long isa_io_base = 0; /* XXX for now */ #endif /* __powerpc__ */ diff --git a/prog/dump/superio.c b/prog/dump/superio.c index 64ef27bf..dbcde7bf 100644 --- a/prog/dump/superio.c +++ b/prog/dump/superio.c @@ -19,14 +19,8 @@ MA 02110-1301 USA. */ -#include - -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 #include -#else -#include -#endif - +#include #include "superio.h" int superio_parse_key(unsigned char *key, const char *s) diff --git a/prog/dump/util.c b/prog/dump/util.c index 874c1b9c..908b3733 100644 --- a/prog/dump/util.c +++ b/prog/dump/util.c @@ -8,16 +8,10 @@ (at your option) any later version. */ +#include #include #include "util.h" -/* To keep glibc2 happy */ -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 -#include -#else -#include -#endif - /* Return 1 if we should continue, 0 if we should abort */ int user_ack(int def) {