diff --git a/src/display/canvas.cc b/src/display/canvas.cc
index 4394b894..31db4ad4 100644
--- a/src/display/canvas.cc
+++ b/src/display/canvas.cc
@@ -38,7 +38,7 @@
 
 #include <unistd.h>
 #include <sys/ioctl.h>
-#include <sys/termios.h>
+#include <termios.h>
 #include <torrent/exceptions.h>
 
 #include "canvas.h"
diff --git a/src/input/path_input.cc b/src/input/path_input.cc
index 461d850f..fa8afdaa 100644
--- a/src/input/path_input.cc
+++ b/src/input/path_input.cc
@@ -41,16 +41,11 @@
 #include <rak/functional.h>
 #include <rak/path.h>
 
+#include <dirent.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <torrent/utils/log.h>
 
-#ifdef __sun__
-  #include <dirent.h>
-  #include <sys/stat.h>
-#else
-  #include <sys/dir.h>
-#endif
-
 #include "path_input.h"
 
 namespace input {
@@ -80,11 +75,7 @@ PathInput::pressed(int key) {
 
 struct _transform_filename {
   void operator () (utils::directory_entry& entry) {
-#ifdef __sun__
-    if (entry.d_type & S_IFDIR)
-#else
     if (entry.d_type == DT_DIR)
-#endif
       entry.d_name += '/';
   }
 };
diff --git a/src/signal_handler.h b/src/signal_handler.h
index a6aba468..f34c2810 100644
--- a/src/signal_handler.h
+++ b/src/signal_handler.h
@@ -37,7 +37,7 @@
 #ifndef RTORRENT_SIGNAL_HANDLER_H
 #define RTORRENT_SIGNAL_HANDLER_H
 
-#include <sys/signal.h>
+#include <signal.h>
 #include <tr1/functional>
 
 class SignalHandler {
diff --git a/src/utils/directory.cc b/src/utils/directory.cc
index f72d0f28..f934aeb8 100644
--- a/src/utils/directory.cc
+++ b/src/utils/directory.cc
@@ -38,14 +38,12 @@
 
 #include <algorithm>
 #include <functional>
+
 #include <dirent.h>
+#include <sys/stat.h>
 #include <rak/path.h>
 #include <torrent/exceptions.h>
 
-#ifdef __sun__
-#include <sys/stat.h>
-#endif
-
 #include "directory.h"
 
 namespace utils {