diff --git a/libc/include/DIR.h b/libc/include/DIR.h
index 26c83bb5..948b238a 100644
--- a/libc/include/DIR.h
+++ b/libc/include/DIR.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013, 2014.
+    Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013, 2014, 2015.
 
     This file is part of the Sortix C Library.
 
@@ -43,14 +43,14 @@ struct dirent;
 
 #ifndef __DIR_defined
 #define __DIR_defined
-typedef struct DIR DIR;
+typedef struct __DIR DIR;
 #endif
 
 #define _DIR_REGISTERED (1<<0)
 #define _DIR_ERROR (1<<1)
 #define _DIR_EOF (1<<2)
 
-struct DIR
+struct __DIR
 {
 	void* user;
 	int (*read_func)(void* user, struct dirent* dirent, size_t* size);
diff --git a/libc/include/dirent.h b/libc/include/dirent.h
index 6e4c23b5..e045e797 100644
--- a/libc/include/dirent.h
+++ b/libc/include/dirent.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013, 2014.
+    Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013, 2014, 2015.
 
     This file is part of the Sortix C Library.
 
@@ -55,7 +55,7 @@ typedef __ino_t ino_t;
 
 #ifndef __DIR_defined
 #define __DIR_defined
-typedef struct DIR DIR;
+typedef struct __DIR DIR;
 #endif
 
 #if __USE_SORTIX