diff --git a/src/libcglue/fdman.h b/src/libcglue/fdman.h
index f2de1156..7160ace4 100644
--- a/src/libcglue/fdman.h
+++ b/src/libcglue/fdman.h
@@ -31,11 +31,11 @@ typedef enum {
 } __fdman_fd_types;
 
 typedef struct {
-	u_int32_t descriptor;
-	u_int32_t flags;
-	u_int32_t ref_count;
+	uint32_t descriptor;
+	uint32_t flags;
+	uint32_t ref_count;
 	char *filename;
-	u_int8_t type;
+	uint8_t type;
 } __descriptormap_type;
 	
 extern __descriptormap_type *__descriptormap[__FILENO_MAX];
diff --git a/tools/types.h b/tools/types.h
index 297694c9..eeee3833 100644
--- a/tools/types.h
+++ b/tools/types.h
@@ -20,10 +20,6 @@
 #include <inttypes.h>
 #else
 #include <sys/types.h>
-#define uint8_t u_int8_t
-#define uint16_t u_int16_t
-#define uint32_t u_int32_t
-#define uint64_t u_int64_t
 #endif
 #endif