diff --git a/common/os_calls.c b/common/os_calls.c
index 32708ae1..566e9422 100644
--- a/common/os_calls.c
+++ b/common/os_calls.c
@@ -96,7 +96,7 @@ struct sockaddr_hvs
 #endif
 
 #include "os_calls.h"
-#include "limits.h"
+#include <limits.h>
 #include "string_calls.h"
 #include "log.h"
 #include "xrdp_constants.h"
diff --git a/libxrdp/xrdp_surface.c b/libxrdp/xrdp_surface.c
index b41379e6..e18d0c6e 100644
--- a/libxrdp/xrdp_surface.c
+++ b/libxrdp/xrdp_surface.c
@@ -22,7 +22,7 @@
 #endif
 
 #include "libxrdp.h"
-#include "freerdp/codec/rfx.h"
+#include <freerdp/codec/rfx.h>
 
 /*****************************************************************************/
 struct xrdp_surface *
diff --git a/scripts/run_cppcheck.sh b/scripts/run_cppcheck.sh
index 4080b6c6..94fe9369 100755
--- a/scripts/run_cppcheck.sh
+++ b/scripts/run_cppcheck.sh
@@ -84,7 +84,10 @@ fi
 # Supply default flags passed to cppcheck if necessary
 if [ -z "$CPPCHECK_FLAGS" ]; then
     CPPCHECK_FLAGS="--quiet --force --std=c11 --std=c++11 --inline-suppr \
-                    --enable=warning --error-exitcode=1 -i third_party \
+                    --enable=warning,missingInclude --error-exitcode=1 \
+                    -i third_party \
+                    -i vrplayer \
+                    --suppress=missingIncludeSystem \
                     --suppress=uninitMemberVar:ulalaca/ulalaca.cpp \
                     --suppress=dangerousTypeCast:ulalaca/XrdpStream.template.cpp \
                     --suppress=shiftTooManyBits:libxrdp/xrdp_mppc_enc.c"
@@ -103,7 +106,23 @@ if [ -z "$CPPCHECK_FLAGS" ]; then
         check_level="Default (option not supported)"
     fi
 
-    CPPCHECK_FLAGS="$CPPCHECK_FLAGS -I . -I common"
+    CPPCHECK_FLAGS="$CPPCHECK_FLAGS \
+                    -I . \
+                    -I common \
+                    -I libipm \
+                    -I libpainter/include \
+                    -I librfxcodec/include \
+                    -I librfxcodec/src \
+                    -I librfxcodec/src/neon \
+                    -I librfxcodec/src/sse2 \
+                    -I libxrdp \
+                    -I sesman/libsesman \
+                    -I sesman/sesexec \
+                    -I third_party \
+                    -I third_party/tomlc99 \
+                    -I xrdp \
+                    -I xrdpapi \
+                    -I xrdpvr"
 fi
 CPPCHECK_FLAGS="$CPPCHECK_FLAGS -D__cppcheck__"
 
diff --git a/tests/common/test_timers.c b/tests/common/test_timers.c
index 6189ff36..44c9b12c 100644
--- a/tests/common/test_timers.c
+++ b/tests/common/test_timers.c
@@ -3,7 +3,7 @@
 #include "config_ac.h"
 #endif
 
-#include "limits.h"
+#include <limits.h>
 #include "os_calls.h"
 #include "timers.h"