diff --git a/include/Makemodule.am b/include/Makemodule.am
index b5ab8df07..11a835523 100644
--- a/include/Makemodule.am
+++ b/include/Makemodule.am
@@ -69,7 +69,6 @@ EXTRA_DIST += \
 	include/r_text.h \
 	include/regex.h \
 	include/rua_internal.h \
-	include/sbar.h \
 	include/skin_stencil.h \
 	include/scn_internal.h \
 	include/snd_internal.h \
@@ -90,6 +89,7 @@ EXTRA_DIST += \
 	include/client/input.h \
 	include/client/locs.h \
 	include/client/particles.h \
+	include/client/sbar.h \
 	include/client/state.h \
 	include/client/temp_entities.h \
 	include/client/view.h \
diff --git a/include/sbar.h b/include/client/sbar.h
similarity index 96%
rename from include/sbar.h
rename to include/client/sbar.h
index 24f359f8a..60766c3b1 100644
--- a/include/sbar.h
+++ b/include/client/sbar.h
@@ -28,8 +28,8 @@
 // the status bar is redrawn only if something has changed, but if anything
 // does, the entire thing will be redrawn for the next vid.numpages frames.
 
-#ifndef _SBAR_H
-#define _SBAR_H
+#ifndef __client_sbar_h
+#define __client_sbar_h
 
 extern qboolean sbar_showscores;
 
@@ -59,4 +59,4 @@ void Sbar_CenterPrint (const char *str);
 
 void Sbar_LogFrags (double time);
 
-#endif
+#endif//__client_sbar_h
diff --git a/libs/client/cl_screen.c b/libs/client/cl_screen.c
index 8f5af2de5..cf8a37201 100644
--- a/libs/client/cl_screen.c
+++ b/libs/client/cl_screen.c
@@ -51,11 +51,10 @@
 #include "QF/scene/transform.h"
 #include "QF/ui/view.h"
 
-#include "sbar.h"
-
 #include "r_local.h"	//FIXME for r_cache_thrash
 
 #include "client/hud.h"
+#include "client/sbar.h"
 #include "client/screen.h"
 #include "client/view.h"
 #include "client/world.h"
diff --git a/libs/client/sbar.c b/libs/client/sbar.c
index b651ae027..000757b01 100644
--- a/libs/client/sbar.c
+++ b/libs/client/sbar.c
@@ -58,9 +58,9 @@
 #include "QF/ui/view.h"
 
 #include "compat.h"
-#include "sbar.h"
 
 #include "client/hud.h"
+#include "client/sbar.h"
 #include "client/screen.h"
 #include "client/state.h"
 #include "client/world.h"
diff --git a/libs/video/renderer/gl/gl_textures.c b/libs/video/renderer/gl/gl_textures.c
index c65760890..68af61db2 100644
--- a/libs/video/renderer/gl/gl_textures.c
+++ b/libs/video/renderer/gl/gl_textures.c
@@ -53,7 +53,6 @@
 #include "compat.h"
 #include "r_internal.h"
 #include "r_scrap.h"
-#include "sbar.h"
 #include "vid_internal.h"
 
 struct scrap_s {
diff --git a/libs/video/renderer/gl/vid_common_gl.c b/libs/video/renderer/gl/vid_common_gl.c
index f723e6247..296c36ae0 100644
--- a/libs/video/renderer/gl/vid_common_gl.c
+++ b/libs/video/renderer/gl/vid_common_gl.c
@@ -55,7 +55,6 @@
 #include "compat.h"
 #include "d_iface.h"
 #include "r_internal.h"
-#include "sbar.h"
 
 #define WARP_WIDTH              320
 #define WARP_HEIGHT             200
diff --git a/libs/video/renderer/r_screen.c b/libs/video/renderer/r_screen.c
index 3e93affdf..e69fb3fe3 100644
--- a/libs/video/renderer/r_screen.c
+++ b/libs/video/renderer/r_screen.c
@@ -55,7 +55,6 @@
 
 #include "compat.h"
 #include "r_internal.h"
-#include "sbar.h"
 
 // only the refresh window will be updated unless these variables are flagged
 int         scr_copytop;
diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c
index e51f0884b..e0709521c 100644
--- a/nq/source/cl_main.c
+++ b/nq/source/cl_main.c
@@ -55,10 +55,10 @@
 #include "QF/scene/scene.h"
 
 #include "compat.h"
-#include "sbar.h"
 
 #include "client/chase.h"
 #include "client/particles.h"
+#include "client/sbar.h"
 #include "client/screen.h"
 #include "client/temp_entities.h"
 #include "client/world.h"
diff --git a/nq/source/cl_parse.c b/nq/source/cl_parse.c
index 3c324ece4..f91a3b9c6 100644
--- a/nq/source/cl_parse.c
+++ b/nq/source/cl_parse.c
@@ -57,11 +57,11 @@
 #include "QF/scene/entity.h"
 
 #include "client/particles.h"
+#include "client/sbar.h"
 #include "client/temp_entities.h"
 #include "client/world.h"
 
 #include "compat.h"
-#include "sbar.h"
 
 #include "nq/include/client.h"
 #include "nq/include/host.h"
@@ -721,7 +721,7 @@ CL_ParseServerMessage (void)
 	static dstring_t *stuffbuf;
 	signon_t    so;
 
-	cl.viewstate.last_servermessage = realtime;
+	cl.viewstate.last_servermessage = cl.time;
 	TEntContext_t tentCtx = {
 		cl.viewstate.player_origin,
 		cl.viewentity
diff --git a/qw/source/cl_cam.c b/qw/source/cl_cam.c
index ba753a05a..02cc75b8d 100644
--- a/qw/source/cl_cam.c
+++ b/qw/source/cl_cam.c
@@ -46,7 +46,8 @@
 #include "QF/msg.h"
 
 #include "compat.h"
-#include "sbar.h"
+
+#include "client/sbar.h"
 
 #include "qw/include/cl_cam.h"
 #include "qw/include/cl_input.h"
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index 2e86d56db..921ae5061 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -95,9 +95,9 @@
 
 #include "buildnum.h"
 #include "compat.h"
-#include "sbar.h"
 
 #include "client/particles.h"
+#include "client/sbar.h"
 #include "client/screen.h"
 #include "client/temp_entities.h"
 #include "client/view.h"
diff --git a/qw/source/cl_ngraph.c b/qw/source/cl_ngraph.c
index f4ec199dc..9d1d562ff 100644
--- a/qw/source/cl_ngraph.c
+++ b/qw/source/cl_ngraph.c
@@ -49,7 +49,7 @@
 
 #include "qw/include/cl_parse.h"
 #include "qw/include/client.h"
-#include "sbar.h"
+#include "client/sbar.h"
 
 int cl_netgraph;
 static cvar_t cl_netgraph_cvar = {
diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index d6b939e59..9a1f0b334 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -64,10 +64,10 @@
 #include "QF/scene/scene.h"
 
 #include "compat.h"
-#include "sbar.h"
 
 #include "client/effects.h"
 #include "client/particles.h"
+#include "client/sbar.h"
 #include "client/screen.h"
 #include "client/temp_entities.h"
 #include "client/view.h"