diff --git a/xrdpapi/Makefile.am b/xrdpapi/Makefile.am
index bb5e49c9..55014bc5 100644
--- a/xrdpapi/Makefile.am
+++ b/xrdpapi/Makefile.am
@@ -16,3 +16,14 @@ libxrdpapi_la_SOURCES = \
 
 libxrdpapi_la_LIBADD = \
   $(top_builddir)/common/libcommon.la
+
+# Build the 'simple' example program, so it's added to the CI
+noinst_PROGRAMS = xrdp-xrdpapi-simple
+
+xrdp_xrdpapi_simple_SOURCES = \
+  simple.c
+
+# If you change this, update the standalone build instructions in simple.c
+xrdp_xrdpapi_simple_LDADD = \
+  libxrdpapi.la \
+  $(top_builddir)/common/libcommon.la
diff --git a/xrdpapi/simple.c b/xrdpapi/simple.c
index 0599b350..6b5cee2b 100644
--- a/xrdpapi/simple.c
+++ b/xrdpapi/simple.c
@@ -102,18 +102,18 @@ run_echo_test(void)
     int     rv;
     int     count;
     int     pkt_count;
-    int     i;
-    int     bytes_written;
-    int     bytes_read;
+    unsigned int i;
+    unsigned int bytes_written;
+    unsigned int bytes_read;
 
     unsigned char c;
-    unsigned char *rd_ptr;
-    unsigned char *wr_ptr;
+    char *rd_ptr;
+    char *wr_ptr;
 
     /* fill out_buf[] with incremental values */
     for (i = 0, c = 0; i < 8192; i++, c++)
     {
-        out_buf[i] = c;
+        out_buf[i] = (char)c;
     }
 
     /* open a virtual channel named ECHO */