4 files changed, 7 insertions, 19 deletions
diff --git a/src/alloc/alloc_mmap/mmap_mem.cpp b/src/alloc/alloc_mmap/mmap_mem.cpp
index e9ea17a53..db9aff296 100644
--- a/src/alloc/alloc_mmap/mmap_mem.cpp
+++ b/src/alloc/alloc_mmap/mmap_mem.cpp
@@ -6,14 +6,6 @@
 #include <botan/mmap_mem.h>
 #include <cstring>
 
-#ifndef _XOPEN_SOURCE
-  #define _XOPEN_SOURCE 500
-#endif
-
-#ifndef _XOPEN_SOURCE_EXTENDED
-  #define _XOPEN_SOURCE_EXTENDED 1
-#endif
-
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/src/entropy/dev_random/es_dev.cpp b/src/entropy/dev_random/es_dev.cpp
index c7a9f6d0e..7b936dbaa 100644
--- a/src/entropy/dev_random/es_dev.cpp
+++ b/src/entropy/dev_random/es_dev.cpp
@@ -4,11 +4,12 @@
 *************************************************/
 
 #include <botan/es_dev.h>
+
+#include <sys/types.h>
 #include <sys/select.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/fcntl.h>
 #include <unistd.h>
+#include <fcntl.h>
 
 namespace Botan {
 
diff --git a/src/entropy/egd/es_egd.cpp b/src/entropy/egd/es_egd.cpp
index 736d49a6f..84773c215 100644
--- a/src/entropy/egd/es_egd.cpp
+++ b/src/entropy/egd/es_egd.cpp
@@ -10,9 +10,12 @@
 #include <cstring>
 
 #include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <unistd.h>
 
 #ifndef PF_LOCAL
   #define PF_LOCAL PF_UNIX
diff --git a/src/entropy/unix_procs/unix_cmd.cpp b/src/entropy/unix_procs/unix_cmd.cpp
index 79cce7da4..4c7f674db 100644
--- a/src/entropy/unix_procs/unix_cmd.cpp
+++ b/src/entropy/unix_procs/unix_cmd.cpp
@@ -3,14 +3,6 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef _XOPEN_SOURCE
-  #define _XOPEN_SOURCE 500
-#endif
-
-#ifndef _XOPEN_SOURCE_EXTENDED
-  #define _XOPEN_SOURCE_EXTENDED 1
-#endif
-
 #include <botan/unix_cmd.h>
 #include <botan/parsing.h>
 #include <botan/exceptn.h>