diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index e815893e211..5e39b7256ef 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -47,12 +47,13 @@
 #include <unistd.h>
 
 #ifndef NONAT
-#ifdef __FreeBSD__
-#include <alias.h>
-#else
+#ifdef LOCALNAT
 #include "alias.h"
+#else
+#include <alias.h>
 #endif
 #endif
+
 #include "layer.h"
 #include "defs.h"
 #include "command.h"
diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c
index f95834dd1c8..6e3260b60df 100644
--- a/usr.sbin/ppp/ipcp.c
+++ b/usr.sbin/ppp/ipcp.c
@@ -42,12 +42,13 @@
 #include <unistd.h>
 
 #ifndef NONAT
-#ifdef __FreeBSD__
-#include <alias.h>
-#else
+#ifdef LOCALNAT
 #include "alias.h"
+#else
+#include <alias.h>
 #endif
 #endif
+
 #include "layer.h"
 #include "ua.h"
 #include "defs.h"
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index 126505f0da4..336ed3e2da7 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -43,12 +43,13 @@
 #include <sys/stat.h>
 
 #ifndef NONAT
-#ifdef __FreeBSD__
-#include <alias.h>
-#else
+#ifdef LOCALNAT
 #include "alias.h"
+#else
+#include <alias.h>
 #endif
 #endif
+
 #include "layer.h"
 #include "probe.h"
 #include "mbuf.h"
diff --git a/usr.sbin/ppp/nat_cmd.c b/usr.sbin/ppp/nat_cmd.c
index a2fb917b561..ed7876d5bac 100644
--- a/usr.sbin/ppp/nat_cmd.c
+++ b/usr.sbin/ppp/nat_cmd.c
@@ -19,11 +19,12 @@
 #include <string.h>
 #include <termios.h>
 
-#ifdef __FreeBSD__
-#include <alias.h>
-#else
+#ifdef LOCALNAT
 #include "alias.h"
+#else
+#include <alias.h>
 #endif
+
 #include "layer.h"
 #include "proto.h"
 #include "defs.h"
diff --git a/usr.sbin/ppp/radius.c b/usr.sbin/ppp/radius.c
index d3f51c870b8..cac6b6ebe22 100644
--- a/usr.sbin/ppp/radius.c
+++ b/usr.sbin/ppp/radius.c
@@ -36,8 +36,13 @@
 #include <sys/un.h>
 #include <net/route.h>
 
-#include <errno.h>
+#ifdef LOCALRAD
+#include "radlib.h"
+#else
 #include <radlib.h>
+#endif
+
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>