diff --git a/src/CrCmap.c b/src/CrCmap.c
index 1725fec38797bac67d8c2fb0891a9e7611400797..4ed67adc569c87d9cd2acb8fe090bcab6300f2b6 100644
--- a/src/CrCmap.c
+++ b/src/CrCmap.c
@@ -53,7 +53,9 @@ Colormap XCreateColormap(
     UnlockDisplay(dpy);
     SyncHandle();
 
+#ifdef XCMS
     _XcmsAddCmapRec(dpy, mid, w, visual);
+#endif
 
     return(mid);
 }
diff --git a/src/FreeCmap.c b/src/FreeCmap.c
index c399c1f2711fa1ed8c5547812be296482c728d1b..651aa14a5a4a58a530217aaed0e478ccdcf40e32 100644
--- a/src/FreeCmap.c
+++ b/src/FreeCmap.c
@@ -46,6 +46,9 @@ XFreeColormap(
     UnlockDisplay(dpy);
     SyncHandle();
 
+#ifdef XCMS
     _XcmsDeleteCmapRec(dpy, cmap);
+#endif
+
     return 1;
 }
diff --git a/src/GetColor.c b/src/GetColor.c
index 530f479dbef48c0872b02efcfcf84781cc4f84a2..1166be5f7c4bf3e0e621c8e48dc7117ed25a3dcf 100644
--- a/src/GetColor.c
+++ b/src/GetColor.c
@@ -51,6 +51,7 @@ XColor *exact_def) /* RETURN */
     XcmsColor cmsColor_exact;
     Status ret;
 
+#ifdef XCMS
     /*
      * Let's Attempt to use Xcms and i18n approach to Parse Color
      */
@@ -76,6 +77,7 @@ XColor *exact_def) /* RETURN */
 	    break;
 	}
     }
+#endif
 
     /*
      * Xcms and i18n approach failed.
diff --git a/src/LookupCol.c b/src/LookupCol.c
index 02f831a6ce62f084709fcacb67cddf1ea9549047..1473138e18dc0aac8a39669cf9cbd225186df577 100644
--- a/src/LookupCol.c
+++ b/src/LookupCol.c
@@ -49,6 +49,7 @@ XLookupColor (
 	XcmsCCC ccc;
 	XcmsColor cmsColor_exact;
 
+#ifdef XCMS
 	/*
 	 * Let's Attempt to use Xcms and i18n approach to Parse Color
 	 */
@@ -73,6 +74,7 @@ XLookupColor (
 		break;
 	    }
 	}
+#endif
 
 	/*
 	 * Xcms and i18n methods failed, so lets pass it to the server
diff --git a/src/ParseCol.c b/src/ParseCol.c
index 3736fada255991bd1a6c4e7bd64108839b0dd8cb..e500ec6c162fb4df58c9c402464f169cf3ae92be 100644
--- a/src/ParseCol.c
+++ b/src/ParseCol.c
@@ -86,6 +86,7 @@ XParseColor (
 	}
 
 
+#ifdef XCMS
 	/*
 	 * Let's Attempt to use Xcms and i18n approach to Parse Color
 	 */
@@ -109,6 +110,7 @@ XParseColor (
 		break;
 	    }
 	}
+#endif
 
 	/*
 	 * Xcms and i18n methods failed, so lets pass it to the server
diff --git a/src/SetStCmap.c b/src/SetStCmap.c
index aeae6cd77791a23a9a05d407d0755e5838de95a8..7978f1dd8ceaf54dd07423a21abf48667a8b10e1 100644
--- a/src/SetStCmap.c
+++ b/src/SetStCmap.c
@@ -88,6 +88,9 @@ void XSetStandardColormap(
     stdcmap.visualid	= sp->root_visual->visualid;
     stdcmap.killid	= None;		/* don't know how to kill this one */
 
+#ifdef XCMS
     XSetRGBColormaps (dpy, w, &stdcmap, 1, property);
+#endif
+
     return;
 }
diff --git a/src/StNColor.c b/src/StNColor.c
index f7dbcb0651c30798dceef8bf1168a25c5298733b..3e3c3691251abf74e7fa0271fd5bd1ae5d7fe46b 100644
--- a/src/StNColor.c
+++ b/src/StNColor.c
@@ -48,6 +48,7 @@ int flags)  /* DoRed, DoGreen, DoBlue */
     XcmsColor cmsColor_exact;
     XColor scr_def;
 
+#ifdef XCMS
     /*
      * Let's Attempt to use Xcms approach to Parse Color
      */
@@ -64,6 +65,7 @@ int flags)  /* DoRed, DoGreen, DoBlue */
 	 * name.  Thus pass name to the X Server.
 	 */
     }
+#endif
 
     /*
      * The Xcms and i18n methods failed, so lets pass it to the server