diff --git a/Makefile b/Makefile
index 73b5e408..106e7678 100644
--- a/Makefile
+++ b/Makefile
@@ -403,6 +403,7 @@ CLIENT_OBJS_ := \
 	src/common/crc.o \
 	src/common/cvar.o \
 	src/common/filesystem.o \
+	src/common/glob.o \
 	src/common/md4.o \
 	src/common/misc.o \
 	src/common/netchan.o \
@@ -438,7 +439,6 @@ CLIENT_OBJS_ := \
 	src/server/sv_send.o \
 	src/server/sv_user.o \
 	src/server/sv_world.o \
-	src/unix/glob.o \
 	src/unix/hunk.o \
 	src/unix/main.o \
  	src/unix/network.o \
@@ -454,6 +454,7 @@ SERVER_OBJS_ := \
 	src/common/crc.o \
 	src/common/cvar.o \
 	src/common/filesystem.o \
+	src/common/glob.o \
 	src/common/md4.o \
 	src/common/misc.o \
 	src/common/netchan.o \
@@ -495,7 +496,6 @@ SERVER_OBJS_ += \
 	src/windows/system.o	
 else
 SERVER_OBJS_ += \
-	src/unix/glob.o \
 	src/unix/hunk.o \
 	src/unix/main.o \
  	src/unix/network.o \
@@ -526,8 +526,8 @@ OPENGL_OBJS_ = \
 	src/refresh/files/wal.o \
 	src/sdl/input.o \
 	src/sdl/refresh.o \
+    src/common/glob.o \
     src/common/shared/shared.o \
-    src/unix/glob.o \
 	src/unix/hunk.o \
 	src/unix/qgl.o
 
diff --git a/src/common/filesystem.c b/src/common/filesystem.c
index fc3b0f2e..1a982dc2 100644
--- a/src/common/filesystem.c
+++ b/src/common/filesystem.c
@@ -26,7 +26,7 @@
  */
 
 #include "header/common.h"
-#include "../unix/header/glob.h"
+#include "../common/header/glob.h"
 
 #ifdef ZIP
 #include "unzip/unzip.h"
diff --git a/src/unix/glob.c b/src/common/glob.c
similarity index 100%
rename from src/unix/glob.c
rename to src/common/glob.c
diff --git a/src/unix/header/glob.h b/src/common/header/glob.h
similarity index 100%
rename from src/unix/header/glob.h
rename to src/common/header/glob.h
diff --git a/src/unix/system.c b/src/unix/system.c
index b4b91e51..880c8d70 100644
--- a/src/unix/system.c
+++ b/src/unix/system.c
@@ -45,8 +45,8 @@
 #include <dlfcn.h>
 #include <dirent.h>
 
-#include "header/glob.h"
 #include "../common/header/common.h"
+#include "../common/header/glob.h"
 #include "header/unix.h"
 
 unsigned sys_frame_time;