diff --git a/src/Snap.CoreRun.Pal/src/include/pal/pal.hpp b/src/Snap.CoreRun.Pal/src/include/pal/pal.hpp
index c50ce5a8..1fe4a73a 100644
--- a/src/Snap.CoreRun.Pal/src/include/pal/pal.hpp
+++ b/src/Snap.CoreRun.Pal/src/include/pal/pal.hpp
@@ -35,10 +35,10 @@
 #define PAL_API __declspec( dllexport )
 #define PAL_CALLING_CONVENTION __cdecl
 #elif PAL_PLATFORM_LINUX
-#include <limits.h>
+#include <climits>
 #include <cstdio>
-#include <wait.h>
 #include <cstdint>
+#include <sys/wait.h>
 #include <sys/stat.h> // mode_t
 #define PAL_MAX_PATH PATH_MAX
 #define PAL_DIRECTORY_SEPARATOR_STR "/"
diff --git a/src/Snap.CoreRun.Pal/src/pal.cpp b/src/Snap.CoreRun.Pal/src/pal.cpp
index ff056c94..6fe6e822 100644
--- a/src/Snap.CoreRun.Pal/src/pal.cpp
+++ b/src/Snap.CoreRun.Pal/src/pal.cpp
@@ -11,15 +11,14 @@
 #include "vendor/rcedit/rcedit.hpp"
 #include <system_error>
 #elif defined(PAL_PLATFORM_LINUX)
-#include <sys/types.h> // O_RDONLY
 #include <sys/wait.h> // wait
 #include <unistd.h> // getcwd
 #include <fcntl.h> // open
 #include <dirent.h> // opendir
 #include <libgen.h> // dirname
 #include <dlfcn.h> // dlopen
-#include <signal.h> // kill
-#include <time.h> // nanosleep
+#include <csignal> // kill
+#include <ctime> // nanosleep
 static const char* symlink_entrypoint_executable = "/proc/self/exe";
 #endif