Index: code/qcommon/unzip.c
===================================================================
--- code/qcommon/unzip.c	(revision 1432)
+++ code/qcommon/unzip.c	(working copy)
@@ -7,7 +7,8 @@
  *
  *****************************************************************************/
 
-#include "../client/client.h"
+#include "../qcommon/q_shared.h"
+#include "../qcommon/qcommon.h"
 #include "unzip.h"
 
 /* unzip.h -- IO for uncompress .zip files using zlib 
Index: code/null/null_snddma.c
===================================================================
--- code/null/null_snddma.c	(revision 1432)
+++ code/null/null_snddma.c	(working copy)
@@ -23,7 +23,8 @@
 // snddma_null.c
 // all other sound mixing is portable
 
-#include "../client/client.h"
+#include "../qcommon/q_shared.h"
+#include "../qcommon/qcommon.h"
 
 qboolean SNDDMA_Init(void)
 {
Index: code/null/null_client.c
===================================================================
--- code/null/null_client.c	(revision 1432)
+++ code/null/null_client.c	(working copy)
@@ -20,7 +20,8 @@
 ===========================================================================
 */
 
-#include "../client/client.h"
+#include "../qcommon/q_shared.h"
+#include "../qcommon/qcommon.h"
 
 cvar_t *cl_shownet;
 
Index: code/null/null_input.c
===================================================================
--- code/null/null_input.c	(revision 1432)
+++ code/null/null_input.c	(working copy)
@@ -19,7 +19,6 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
-#include "../client/client.h"
 
 void IN_Init( void ) {
 }