diff --git a/Makefile b/Makefile
index 75728a47..c2d6dccf 100644
--- a/Makefile
+++ b/Makefile
@@ -523,7 +523,7 @@ $(INSTALLDIR)/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG)
 $(INSTALLDIR)/q3map2.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) $(CPPFLAGS_JPEG) -Itools/quake3/common -Ilibs -Iinclude -Ilibs/assimp/include
 $(INSTALLDIR)/q3map2.$(EXE): \
 	tools/quake3/common/cmdlib.o \
-	tools/quake3/common/imagelib.o \
+	tools/quake3/common/qimagelib.o \
 	tools/quake3/common/inout.o \
 	tools/quake3/common/jpeg.o \
 	tools/quake3/common/md4.o \
@@ -902,7 +902,7 @@ $(INSTALLDIR)/radiant.$(EXE): \
 	radiant/windowobservers.o \
 	radiant/xmlstuff.o \
 	radiant/xywindow.o \
-	libcmdlib.$(A) \
+	libcommandlib.$(A) \
 	libgtkutil.$(A) \
 	libl_net.$(A) \
 	libprofile.$(A) \
@@ -914,9 +914,9 @@ libfilematch.$(A): CPPFLAGS_EXTRA := -Ilibs
 libfilematch.$(A): \
 	libs/filematch.o \
 
-libcmdlib.$(A): CPPFLAGS_EXTRA := -Ilibs
-libcmdlib.$(A): \
-	libs/cmdlib/cmdlib.o \
+libcommandlib.$(A): CPPFLAGS_EXTRA := -Ilibs
+libcommandlib.$(A): \
+	libs/commandlib.o \
 
 libprofile.$(A): CPPFLAGS_EXTRA := -Ilibs -Iinclude
 libprofile.$(A): \
@@ -1099,7 +1099,7 @@ $(INSTALLDIR)/plugins/bobtoolz.$(DLL): \
 	contrib/bobtoolz/ScriptParser.o \
 	contrib/bobtoolz/shapes.o \
 	contrib/bobtoolz/visfind.o \
-	libcmdlib.$(A) \
+	libcommandlib.$(A) \
 	libmathlib.$(A) \
 	libprofile.$(A) \
 
diff --git a/contrib/bobtoolz/bobToolz-GTK.cpp b/contrib/bobtoolz/bobToolz-GTK.cpp
index a3d6b3a0..e906608c 100644
--- a/contrib/bobtoolz/bobToolz-GTK.cpp
+++ b/contrib/bobtoolz/bobToolz-GTK.cpp
@@ -32,7 +32,7 @@
 #include "DTreePlanter.h"
 
 #include "dialogs/dialogs-gtk.h"
-#include "../../libs/cmdlib.h"
+#include "commandlib.h"
 
 #include "bobToolz-GTK.h"
 
diff --git a/contrib/bobtoolz/bsploader.cpp b/contrib/bobtoolz/bsploader.cpp
index a1e6f678..295e709a 100644
--- a/contrib/bobtoolz/bsploader.cpp
+++ b/contrib/bobtoolz/bsploader.cpp
@@ -1,6 +1,6 @@
 #include "bsploader.h"
 #include "dialogs/dialogs-gtk.h"
-#include "cmdlib.h"
+#include "commandlib.h"
 
 int numnodes;
 int numplanes;
diff --git a/contrib/bobtoolz/misc.cpp b/contrib/bobtoolz/misc.cpp
index 0cd8d940..4904f987 100644
--- a/contrib/bobtoolz/misc.cpp
+++ b/contrib/bobtoolz/misc.cpp
@@ -182,7 +182,7 @@ extern char* PLUGIN_NAME;
     return buffer;
    }*/
 
-#include "cmdlib.h"
+#include "commandlib.h"
 
 void StartBSP(){
 	char exename[256];
diff --git a/libs/cmdlib/.cvswrappers b/libs/cmdlib/.cvswrappers
deleted file mode 100644
index ed97d402..00000000
--- a/libs/cmdlib/.cvswrappers
+++ /dev/null
@@ -1,3 +0,0 @@
-*.dsp	-m 'COPY' -k 'b'
-*.dsw	-m 'COPY' -k 'b'
-*.scc	-m 'COPY' -k 'b'
diff --git a/libs/cmdlib/cmdlib.cpp b/libs/commandlib.cpp
similarity index 98%
rename from libs/cmdlib/cmdlib.cpp
rename to libs/commandlib.cpp
index ecf24abd..24defa59 100644
--- a/libs/cmdlib/cmdlib.cpp
+++ b/libs/commandlib.cpp
@@ -23,14 +23,13 @@
 // start of shared cmdlib stuff
 //
 
-#include "cmdlib.h"
+#include "commandlib.h"
 
 #include <cstring>
 #include <cstdio>
 
 #include "string/string.h"
 #include "os/path.h"
-#include "container/array.h"
 
 
 #if defined ( POSIX )
diff --git a/libs/cmdlib.h b/libs/commandlib.h
similarity index 68%
rename from libs/cmdlib.h
rename to libs/commandlib.h
index 0df55e98..1c910502 100644
--- a/libs/cmdlib.h
+++ b/libs/commandlib.h
@@ -44,36 +44,6 @@
 
 bool Q_Exec( const char *cmd, char *cmdline, const char *execdir, bool bCreateConsole, bool waitfor );
 
-// some easy portability crap
-
-
-#define access_owner_read 0400
-#define access_owner_write 0200
-#define access_owner_execute 0100
-#define access_owner_rw_ 0600
-#define access_owner_r_x 0500
-#define access_owner__wx 0300
-#define access_owner_rwx 0700
-
-#define access_group_read 0040
-#define access_group_write 0020
-#define access_group_execute 0010
-#define access_group_rw_ 0060
-#define access_group_r_x 0050
-#define access_group__wx 0030
-#define access_group_rwx 0070
-
-#define access_others_read 0004
-#define access_others_write 0002
-#define access_others_execute 0001
-#define access_others_rw_ 0006
-#define access_others_r_x 0005
-#define access_others__wx 0003
-#define access_others_rwx 0007
-
-
-#define access_rwxrwxr_x ( access_owner_rwx | access_group_rwx | access_others_r_x )
-#define access_rwxrwxrwx ( access_owner_rwx | access_group_rwx | access_others_rwx )
 
 // Q_mkdir
 // returns true if succeeded in creating directory
@@ -85,7 +55,7 @@ inline bool Q_mkdir( const char* name ){
 #else
 #include <sys/stat.h>
 inline bool Q_mkdir( const char* name ){
-	return mkdir( name, access_rwxrwxr_x ) != -1;
+	return mkdir( name, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH ) != -1; // rwxrwxr-x
 }
 #endif
 
diff --git a/plugins/archivepak/archive.cpp b/plugins/archivepak/archive.cpp
index d560e7d1..34bba434 100644
--- a/plugins/archivepak/archive.cpp
+++ b/plugins/archivepak/archive.cpp
@@ -22,7 +22,7 @@
 #include "archive.h"
 
 #include "idatastream.h"
-#include "cmdlib.h"
+#include "commandlib.h"
 #include "bytestreamutils.h"
 #include <algorithm>
 #include "stream/filestream.h"
diff --git a/plugins/archivewad/archive.cpp b/plugins/archivewad/archive.cpp
index 80e6beb2..33cb9bc6 100644
--- a/plugins/archivewad/archive.cpp
+++ b/plugins/archivewad/archive.cpp
@@ -22,7 +22,7 @@
 #include "archive.h"
 
 #include "idatastream.h"
-#include "cmdlib.h"
+#include "commandlib.h"
 #include "bytestreamutils.h"
 #include <algorithm>
 #include "stream/filestream.h"
diff --git a/plugins/archivezip/archive.cpp b/plugins/archivezip/archive.cpp
index 4dfd7e02..e1bd593f 100644
--- a/plugins/archivezip/archive.cpp
+++ b/plugins/archivezip/archive.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "idatastream.h"
-#include "cmdlib.h"
+#include "commandlib.h"
 #include "bytestreamutils.h"
 
 #include "modulesystem.h"
diff --git a/plugins/shaders/shaders.cpp b/plugins/shaders/shaders.cpp
index f735aeae..1f94adb4 100644
--- a/plugins/shaders/shaders.cpp
+++ b/plugins/shaders/shaders.cpp
@@ -64,7 +64,7 @@
 #include "stringio.h"
 #include "shaderlib.h"
 #include "texturelib.h"
-#include "cmdlib.h"
+#include "commandlib.h"
 #include "moduleobservers.h"
 #include "archivelib.h"
 #include "imagelib.h"
diff --git a/radiant/autosave.cpp b/radiant/autosave.cpp
index 358c0eaf..20699a62 100644
--- a/radiant/autosave.cpp
+++ b/radiant/autosave.cpp
@@ -23,7 +23,7 @@
 
 #include "os/file.h"
 #include "os/path.h"
-#include "cmdlib.h"
+#include "commandlib.h"
 #include "stream/stringstream.h"
 #include "gtkutil/messagebox.h"
 #include "scenelib.h"
diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp
index aa2345eb..6051a5ab 100644
--- a/radiant/camwindow.cpp
+++ b/radiant/camwindow.cpp
@@ -41,7 +41,7 @@
 #include "container/array.h"
 #include "scenelib.h"
 #include "render.h"
-#include "cmdlib.h"
+#include "commandlib.h"
 #include "math/frustum.h"
 
 #include "gtkutil/widget.h"
diff --git a/radiant/eclass.cpp b/radiant/eclass.cpp
index 11312438..5eadbff7 100644
--- a/radiant/eclass.cpp
+++ b/radiant/eclass.cpp
@@ -34,7 +34,7 @@
 #include "stream/stringstream.h"
 #include "moduleobservers.h"
 
-#include "cmdlib.h"
+#include "commandlib.h"
 
 #include "preferences.h"
 #include "mainframe.h"
diff --git a/radiant/environment.cpp b/radiant/environment.cpp
index 192689e6..66e449a4 100644
--- a/radiant/environment.cpp
+++ b/radiant/environment.cpp
@@ -27,7 +27,7 @@
 #include "debugging/debugging.h"
 #include "os/path.h"
 #include "os/file.h"
-#include "cmdlib.h"
+#include "commandlib.h"
 
 int g_argc;
 const char** g_argv;
diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp
index ca1787b7..2579d0c7 100644
--- a/radiant/gtkdlgs.cpp
+++ b/radiant/gtkdlgs.cpp
@@ -65,7 +65,7 @@
 #include "mainframe.h"
 #include "preferences.h"
 #include "url.h"
-#include "cmdlib.h"
+#include "commandlib.h"
 
 #include "qerplugin.h"
 #include "os/file.h"
diff --git a/radiant/main.cpp b/radiant/main.cpp
index 6bd1f844..73f7e2dd 100644
--- a/radiant/main.cpp
+++ b/radiant/main.cpp
@@ -71,7 +71,7 @@
 
 #include <gtk/gtk.h>
 
-#include "cmdlib.h"
+#include "commandlib.h"
 #include "os/file.h"
 #include "os/path.h"
 #include "stream/stringstream.h"
diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 1310e92e..f161c64a 100644
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -45,7 +45,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "cmdlib.h"
+#include "commandlib.h"
 #include "scenelib.h"
 #include "stream/stringstream.h"
 #include "signal/isignal.h"
diff --git a/radiant/map.cpp b/radiant/map.cpp
index e39401ce..eb015881 100644
--- a/radiant/map.cpp
+++ b/radiant/map.cpp
@@ -49,7 +49,7 @@
 #include "traverselib.h"
 #include "maplib.h"
 #include "eclasslib.h"
-#include "cmdlib.h"
+#include "commandlib.h"
 #include "stream/textfilestream.h"
 #include "os/path.h"
 #include "uniquenames.h"
diff --git a/radiant/points.cpp b/radiant/points.cpp
index 053e145b..623613a1 100644
--- a/radiant/points.cpp
+++ b/radiant/points.cpp
@@ -37,7 +37,7 @@
 #include "stream/stringstream.h"
 #include "os/path.h"
 #include "os/file.h"
-#include "cmdlib.h"
+#include "commandlib.h"
 
 #include "map.h"
 #include "qe3.h"
diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index bd43b19f..b78c2377 100644
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -41,7 +41,7 @@
 #include "os/dir.h"
 #include "gtkutil/filechooser.h"
 #include "gtkutil/messagebox.h"
-#include "cmdlib.h"
+#include "commandlib.h"
 
 #include "error.h"
 #include "console.h"
diff --git a/radiant/qe3.cpp b/radiant/qe3.cpp
index 5759c04a..5c927331 100644
--- a/radiant/qe3.cpp
+++ b/radiant/qe3.cpp
@@ -44,7 +44,7 @@
 #include <gtk/gtk.h>
 
 #include "stream/textfilestream.h"
-#include "cmdlib.h"
+#include "commandlib.h"
 #include "stream/stringstream.h"
 #include "os/path.h"
 #include "scenelib.h"
diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index 03a3ad6d..335db2a9 100644
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -52,7 +52,7 @@
 #include "stream/memstream.h"
 #include "stream/textfilestream.h"
 #include "stream/stringstream.h"
-#include "cmdlib.h"
+#include "commandlib.h"
 #include "texmanip.h"
 #include "textures.h"
 #include "convert.h"
diff --git a/radiant/watchbsp.cpp b/radiant/watchbsp.cpp
index bb4b8cc3..a7acc021 100644
--- a/radiant/watchbsp.cpp
+++ b/radiant/watchbsp.cpp
@@ -38,7 +38,7 @@
 #include <algorithm>
 #include <gtk/gtk.h>
 
-#include "cmdlib.h"
+#include "commandlib.h"
 #include "convert.h"
 #include "string/string.h"
 #include "stream/stringstream.h"
diff --git a/tools/quake3/common/cmdlib.h b/tools/quake3/common/cmdlib.h
index ad36e83d..082f5640 100644
--- a/tools/quake3/common/cmdlib.h
+++ b/tools/quake3/common/cmdlib.h
@@ -19,8 +19,6 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-// cmdlib.h
-
 #pragma once
 
 #include "bytebool.h"
diff --git a/tools/quake3/common/imagelib.cpp b/tools/quake3/common/qimagelib.cpp
similarity index 99%
rename from tools/quake3/common/imagelib.cpp
rename to tools/quake3/common/qimagelib.cpp
index 85d12165..a3819748 100644
--- a/tools/quake3/common/imagelib.cpp
+++ b/tools/quake3/common/qimagelib.cpp
@@ -19,14 +19,12 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-// imagelib.c
-
 #include "inout.h"
 #include "cmdlib.h"
 #include "qstringops.h"
 #include "qpathops.h"
 #include "etclib.h"
-#include "imagelib.h"
+#include "qimagelib.h"
 #include "vfs.h"
 
 int fgetLittleShort( FILE *f ){
diff --git a/tools/quake3/common/imagelib.h b/tools/quake3/common/qimagelib.h
similarity index 100%
rename from tools/quake3/common/imagelib.h
rename to tools/quake3/common/qimagelib.h
diff --git a/tools/quake3/common/qpathops.h b/tools/quake3/common/qpathops.h
index 735f6226..d045ddeb 100644
--- a/tools/quake3/common/qpathops.h
+++ b/tools/quake3/common/qpathops.h
@@ -19,8 +19,6 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-// cmdlib.h
-
 #pragma once
 
 #include "os/path.h"
diff --git a/tools/quake3/q3map2/lightmaps_ydnar.cpp b/tools/quake3/q3map2/lightmaps_ydnar.cpp
index 2e3f847a..7f8a3632 100644
--- a/tools/quake3/q3map2/lightmaps_ydnar.cpp
+++ b/tools/quake3/q3map2/lightmaps_ydnar.cpp
@@ -53,7 +53,7 @@
 
 /*
    WriteTGA24()
-   based on WriteTGA() from imagelib.c
+   based on WriteTGA() from qimagelib.cpp
  */
 
 static void WriteTGA24( char *filename, byte *data, int width, int height, bool flip ){
diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index 17f380db..26d4b44a 100644
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -55,7 +55,7 @@
 
 #include "scriplib.h"
 #include "polylib.h"
-#include "imagelib.h"
+#include "qimagelib.h"
 #include "qthreads.h"
 #include "inout.h"
 #include "inout_xml.h"