diff --git a/src/Makefile b/src/Makefile
index 1f46e9e8659..3076186ba9c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -245,7 +245,7 @@ $(shell $(VECHO) 1>&2 Done reading dependencies)
 endif
 
 # Each directory in $(INCLUDES) is passed as a -I directory when compiling.
-INCLUDE := $(patsubst %,-I%, $(INCLUDES)) -I$(RTDIR)/../include
+INCLUDE := $(patsubst %,-I%, $(INCLUDES)) -I$(RTDIR)/include -I../include
 INCLUDE += $(PYTHON_CPPFLAGS)
 INCLUDE += $(LIBTIRPC_CFLAGS)
 
@@ -854,7 +854,7 @@ endif
 # that's what kbuild seems to require
 
 EXTRA_CFLAGS := $(filter-out -ffast-math,$(RTFLAGS)) -D__MODULE__ \
-	-I$(BASEPWD)/../include \
+	-I$(BASEPWD)/../include -I$(BASEPWD) \
 	-DSEQUENTIAL_SUPPORT -DHAL_SUPPORT -DDYNAMIC_PLCSIZE -DRT_SUPPORT -DOLD_TIMERS_MONOS_SUPPORT -DMODBUS_IO_MASTER \
 	-fno-fast-math $(call cc-option,-mieee-fp) -fno-unsafe-math-optimizations \
 	-Wno-declaration-after-statement \
diff --git a/src/configure.ac b/src/configure.ac
index 917c1f69d50..4f9394d149b 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -189,14 +189,14 @@ AC_ARG_ENABLE(toolnml,
 
 #at this point if RTS is empty, we need to find RT ourselves
 AC_MSG_CHECKING([for rtai-config])
-if test -z "$RTS"; then
+if test -z "$RTS" || test "$RTS" = uspace; then
   DIRS="/usr/realtime-`uname -r` /usr/realtime /usr/realtime* /usr /usr/src/rtai*"
 else
   DIRS="$RTS"
 fi
-  RTAI_CONFIG=none
-  for location in $DIRS; do
-    for subdir in . scripts bin; do
+RTAI_CONFIG=none
+for location in $DIRS; do
+  for subdir in . scripts bin; do
     for signature in rtai; do
       candidate=$location/$subdir/$signature-config
       if test "$RTAI_CONFIG" = "none" -a -x $candidate; then
diff --git a/src/emc/motion/motion.h b/src/emc/motion/motion.h
index 12164774271..31183a18356 100644
--- a/src/emc/motion/motion.h
+++ b/src/emc/motion/motion.h
@@ -60,7 +60,7 @@ to another.
 #ifndef MOTION_H
 #define MOTION_H
 
-#include <stdint.h>
+#include <rtapi_stdint.h>
 #include <stdarg.h>
 
 #include <rtapi_bool.h>
diff --git a/src/hal/components/mesa_pktgyro_test.comp b/src/hal/components/mesa_pktgyro_test.comp
index d43000f3f07..65fd450fbb2 100644
--- a/src/hal/components/mesa_pktgyro_test.comp
+++ b/src/hal/components/mesa_pktgyro_test.comp
@@ -47,7 +47,7 @@ Check linuxcnc.log for debug output.
 author "Boris Skegin";
 license "GPL";
 
-include "hal/drivers/mesa-hostmot2/hostmot2-serial.h";
+include <hostmot2-serial.h>;
 include "hal/drivers/mesa-hostmot2/hostmot2.h";
 
 
diff --git a/src/hal/drivers/pluto_common.h b/src/hal/drivers/pluto_common.h
index 52e355f62d0..9c6bad1eb17 100644
--- a/src/hal/drivers/pluto_common.h
+++ b/src/hal/drivers/pluto_common.h
@@ -21,7 +21,7 @@
 #include <asm/io.h>
 #endif
 
-#include "hal_parport.h"
+#include "hal/hal_parport.h"
 
 int ioaddr = 0x378;
 int ioaddr_hi = 0;
diff --git a/src/hal/drivers/pluto_step.comp b/src/hal/drivers/pluto_step.comp
index 545a3d2fea6..9d9d0152ec4 100644
--- a/src/hal/drivers/pluto_step.comp
+++ b/src/hal/drivers/pluto_step.comp
@@ -143,7 +143,7 @@ see_also """The \\fIpluto_step\\fR section in the HAL User Manual, which shows t
 
 license "GPL";
 include <rtapi_math.h>;
-include "pluto_common.h";
+include "hal/drivers/pluto_common.h";
 ;;
 
 static int speedrange=0;