diff --git a/sys/amiga/amidos.p b/sys/amiga/amidos.p
index 86c355dbf..ee91b3a81 100644
--- a/sys/amiga/amidos.p
+++ b/sys/amiga/amidos.p
@@ -37,6 +37,6 @@ int FDECL(chdir, (char *));
 #ifndef	strcmpi
 int FDECL(strcmpi, (char * , char *));
 #endif
-#if !defined(memcmp) && !defined(AZTEC_C) && !defined(_DCC)
+#if !defined(memcmp) && !defined(AZTEC_C) && !defined(_DCC) && !defined(__GNUC__)
 int FDECL(memcmp, (unsigned char * , unsigned char * , int ));
 #endif
diff --git a/sys/amiga/amiwind.c b/sys/amiga/amiwind.c
index fab7f722e..860bc3c28 100644
--- a/sys/amiga/amiwind.c
+++ b/sys/amiga/amiwind.c
@@ -21,11 +21,7 @@ static void ProcessMessage( register struct IntuiMessage *message );
 
 #define BufferQueueChar(ch) (KbdBuffer[KbdBuffered++] = (ch))
 
-#ifdef __GNUC__ /* Conflicting includefiles ... */
-struct Device *ConsoleDevice;
-#else
 struct Library *ConsoleDevice;
-#endif
 
 #include "NH:sys/amiga/amimenu.c"