diff --git a/.gitlab-ci-unix.yml b/.gitlab-ci-unix.yml
index d57c5586838aff0408397bc2ac23d544f5cb738c..01c467dbc42c15005e9b2cf00ad54440a0ccdcc4 100644
--- a/.gitlab-ci-unix.yml
+++ b/.gitlab-ci-unix.yml
@@ -496,14 +496,17 @@ spec:
     - touch xpdev
     - touch xpdev-mt
     - touch smblib
+    - touch cl
     - gmake $[[ inputs.build_flags ]] $BUILD_ARGS
   artifacts:
     name: "gtkmonitor-$[[ inputs.os ]]-$[[ inputs.platform ]]"
     paths:
       - "src/sbbs3/gtkmonitor/*.exe.release/*"
   needs:
+    - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [cryptlib]"
     - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [xpdev]"
     - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [smblib]"
+    - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [sbbs]"
   rules:
     - if: '"$[[ inputs.has_gtk ]]" == "no"'
       when: never
@@ -518,14 +521,17 @@ spec:
     - touch xpdev
     - touch xpdev-mt
     - touch smblib
+    - touch cl
     - gmake $[[ inputs.build_flags ]] $BUILD_ARGS
   artifacts:
     name: "gtkuseredit-$[[ inputs.os ]]-$[[ inputs.platform ]]"
     paths:
       - "src/sbbs3/gtkuseredit/*.exe.release/*"
   needs:
+    - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [cryptlib]"
     - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [xpdev]"
     - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [smblib]"
+    - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [sbbs]"
   rules:
     - if: '"$[[ inputs.has_gtk ]]" == "no"'
       when: never
@@ -540,14 +546,17 @@ spec:
     - touch xpdev
     - touch xpdev-mt
     - touch smblib
+    - touch cl
     - gmake $[[ inputs.build_flags ]] $BUILD_ARGS
   artifacts:
     name: "gtkuserlist-$[[ inputs.os ]]-$[[ inputs.platform ]]"
     paths:
       - "src/sbbs3/gtkuserlist/*.exe.release/*"
   needs:
+    - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [cryptlib]"
     - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [xpdev]"
     - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [smblib]"
+    - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [sbbs]"
   rules:
     - if: '"$[[ inputs.has_gtk ]]" == "no"'
       when: never
diff --git a/src/sbbs3/gtkmonitor/gtkmonitor.h b/src/sbbs3/gtkmonitor/gtkmonitor.h
index 3d44d824a193a64958dc7a43d1c2a5f517b787dd..b9f32bf902b9e7ab5fbb86b2f4c55dc13b3cb0e7 100644
--- a/src/sbbs3/gtkmonitor/gtkmonitor.h
+++ b/src/sbbs3/gtkmonitor/gtkmonitor.h
@@ -3,11 +3,7 @@
 
 #include <gtk/gtk.h>
 
-#undef JAVASCRIPT
-// Disable it here since we don't need the sbbs_t bits
-#undef USE_CRYPTLIB
 #include "sbbs.h"
-#define USE_CRYPTLIB
 
 struct gtkmonitor_config {
 	char	view_stdout[MAX_PATH+1];	/* %f | xmessage -file - */
diff --git a/src/sbbs3/gtkuseredit/events.c b/src/sbbs3/gtkuseredit/events.c
index 066fdcf3d9ab37e01ffb45ce7bd7e071f6bfc062..2e33d5ae95f3847f7ad0ec016c45fac8eb7d4128 100644
--- a/src/sbbs3/gtkuseredit/events.c
+++ b/src/sbbs3/gtkuseredit/events.c
@@ -1,9 +1,6 @@
 #include <gtk/gtk.h>
 
-#undef JAVASCRIPT
-#undef USE_CRYPTLIB
 #include "sbbs.h"
-#define USE_CRYPTLIB
 #include "dirwrap.h"
 #include "xpbeep.h"
 #include "datewrap.h"
diff --git a/src/sbbs3/gtkuseredit/gtkuseredit.c b/src/sbbs3/gtkuseredit/gtkuseredit.c
index 12e9d3af1d975b1d52a485dfbdedcbff295946fd..9f743bf91c322c5dd3dd213122aa588d507eb9c7 100644
--- a/src/sbbs3/gtkuseredit/gtkuseredit.c
+++ b/src/sbbs3/gtkuseredit/gtkuseredit.c
@@ -1,9 +1,6 @@
 #include <gtk/gtk.h>
 
-#undef JAVASCRIPT
-#undef USE_CRYPTLIB
 #include "sbbs.h"
-#define USE_CRYPTLIB
 #include "dirwrap.h"
 
 #include "events.h"
diff --git a/src/sbbs3/gtkuserlist/gtkuserlist.h b/src/sbbs3/gtkuserlist/gtkuserlist.h
index fd307ac6af1860204a0e86a3718ea31ca013e8bd..245c43a1aa19cbe524a07f7f3e80ac6fad8b19a3 100644
--- a/src/sbbs3/gtkuserlist/gtkuserlist.h
+++ b/src/sbbs3/gtkuserlist/gtkuserlist.h
@@ -3,10 +3,7 @@
 
 #include <gtk/gtk.h>
 
-#undef JAVASCRIPT
-#undef USE_CRYPTLIB
 #include "sbbs.h"
-#define USE_CRYPTLIB
 
 extern GtkBuilder	*builder;
 extern scfg_t		cfg;