diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..63fd57be
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*.kdev4
+*.o
+*.a
+amath
+amath-test
+catalog/flexcat
diff --git a/app/lib/numb.h b/app/lib/numb.h
index fbc3f0a8..e4adb522 100644
--- a/app/lib/numb.h
+++ b/app/lib/numb.h
@@ -27,7 +27,7 @@
 #ifndef _NUMBER_H
 #define _NUMBER_H
 
-#if defined(__GNUC__) && !defined(AOS3)
+#if __GNUC__ > 2
 #pragma GCC diagnostic ignored "-Wshadow"
 #endif
 
diff --git a/app/main/token.cpp b/app/main/token.cpp
index 69a1913e..292cb07c 100644
--- a/app/main/token.cpp
+++ b/app/main/token.cpp
@@ -27,7 +27,7 @@
 #include "clib.h"
 #include "main/token.h"
 
-#if defined(__GNUC__) && !defined(AOS3)
+#if __GNUC__ > 2
 #pragma GCC diagnostic ignored "-Wshadow"
 #endif
 
diff --git a/lib/clib/memcpy.c b/lib/clib/memcpy.c
index 154a5074..ba23deb7 100644
--- a/lib/clib/memcpy.c
+++ b/lib/clib/memcpy.c
@@ -32,7 +32,7 @@
 
 #include "clib.h"
 
-#if defined(__GNUC__)  && !defined(AOS3)
+#if __GNUC__ > 2
 #pragma GCC diagnostic ignored "-Wcast-align"
 #endif
 
diff --git a/lib/clib/memset.c b/lib/clib/memset.c
index 0ec1ecc2..388af3a1 100644
--- a/lib/clib/memset.c
+++ b/lib/clib/memset.c
@@ -35,7 +35,7 @@
 
 #include "clib.h"
 
-#if defined(__GNUC__)  && !defined(AOS3)
+#if __GNUC__ > 2
 #pragma GCC diagnostic ignored "-Wcast-align"
 #endif
 
diff --git a/lib/platform.h b/lib/platform.h
index 08d477a6..5cc7d01e 100644
--- a/lib/platform.h
+++ b/lib/platform.h
@@ -82,16 +82,6 @@
 # include <stdlib.h>
 #endif
 
-/* GCC 2.95 */
-#if (__GNUC__ == 2 && __GNUC_MINOR__ == 95)
-# include <sys/types.h>
-typedef u_int8_t    uint8_t;
-typedef u_int16_t   uint16_t;
-typedef u_int32_t   uint32_t;
-typedef u_int64_t   uint64_t;
-# define IPTR LONG
-#endif
-
 /* GCC 4.x & AROS API */
 #ifdef AROS
 # include <stdint.h>
@@ -107,4 +97,14 @@ typedef u_int64_t   uint64_t;
 # error Includedes must be defined for Amiga OS 4+
 #endif
 
+/* GCC 2.95 */
+#if (__GNUC__ == 2 && __GNUC_MINOR__ == 95)
+# include <sys/types.h>
+typedef u_int8_t    uint8_t;
+typedef u_int16_t   uint16_t;
+typedef u_int32_t   uint32_t;
+typedef u_int64_t   uint64_t;
+# define IPTR LONG
+#endif
+
 #endif
diff --git a/lib/real/pow.c b/lib/real/pow.c
index 6c339c46..06a8349d 100644
--- a/lib/real/pow.c
+++ b/lib/real/pow.c
@@ -42,7 +42,7 @@
 #include "prim.h"
 #include "math.h"
 
-#if defined(__GNUC__) && !defined(AOS3)
+#if __GNUC__ > 2
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #endif
diff --git a/lib/real/sinh.c b/lib/real/sinh.c
index d2d6f295..5405133b 100644
--- a/lib/real/sinh.c
+++ b/lib/real/sinh.c
@@ -44,7 +44,7 @@
 #include "prim.h"
 #include "math.h"
 
-#if defined(__GNUC__) && !defined(AOS3)
+#if __GNUC__ > 2
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #endif