diff --git a/f32x/Makefile b/f32x/Makefile
index f19bb4e..2bf2c79 100644
--- a/f32x/Makefile
+++ b/f32x/Makefile
@@ -23,7 +23,7 @@ CFLAGS_om = -O -DDRIVER=c2_om
 
 LDFLAGS_om =
 
-OBJS_om = c2-om.o gpio.o rt.o
+OBJS_om = c2-om.o gpio-s3c24xx.o rt.o
 
 NAME = f32x
 CC = $(CC_$(TARGET))
diff --git a/f32x/c2-om.c b/f32x/c2-om.c
index 3ff3f4f..0b359b4 100644
--- a/f32x/c2-om.c
+++ b/f32x/c2-om.c
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include <unistd.h>
 
-#include "gpio.h"
+#include "gpio-s3c24xx.h"
 #include "c2-drv.h"
 
 
diff --git a/f32x/gpio.c b/f32x/gpio-s3c24xx.c
similarity index 90%
rename from f32x/gpio.c
rename to f32x/gpio-s3c24xx.c
index 1648d84..d4b25b9 100644
--- a/f32x/gpio.c
+++ b/f32x/gpio-s3c24xx.c
@@ -1,5 +1,5 @@
 /*
- * f32x/gpio.c - Really primitive S3C244x GPIO access. Ports B-H only.
+ * f32x/gpio-s3c24xx.c - Really primitive S3C244x GPIO access. Ports B-H only.
  *
  * Written 2008 by Werner Almesberger
  * Copyright 2008 Werner Almesberger
diff --git a/f32x/gpio.h b/f32x/gpio-s3c24xx.h
similarity index 88%
rename from f32x/gpio.h
rename to f32x/gpio-s3c24xx.h
index a1465a7..d537352 100644
--- a/f32x/gpio.h
+++ b/f32x/gpio-s3c24xx.h
@@ -1,5 +1,5 @@
 /* 
- * f32x/gpio.h - Really primitive S3C244x GPIO access. Ports B-H only.
+ * f32x/gpio-s3c24xx.h - Really primitive S3C244x GPIO access. Ports B-H only.
  *
  * Written 2008 by Werner Almesberger
  * Copyright 2008 Werner Almesberger
@@ -15,8 +15,8 @@
  */
 
 
-#ifndef GPIO_H
-#define GPIO_H
+#ifndef GPIO_S3C24XX_H
+#define GPIO_S3C24XX_H
 
 
 #include <stdint.h>
@@ -71,4 +71,4 @@ static inline void gpio_input(unsigned port, unsigned bit)
 void gpio_init(void);
 
 
-#endif /* !GPIO_H */
+#endif /* !GPIO_S3C24XX_H */