diff --git a/source/lib/res/snd.h b/source/lib/res/snd.h
index cb70b8ce4e..1365a1a8bf 100755
--- a/source/lib/res/snd.h
+++ b/source/lib/res/snd.h
@@ -16,6 +16,9 @@
 //   Jan.Wassenberg@stud.uni-karlsruhe.de
 //   http://www.stud.uni-karlsruhe.de/~urkt/
 
+#ifndef SND_H__
+#define SND_H__
+
 #include "handle.h"
 
 /*
@@ -215,3 +218,5 @@ extern int snd_update(const float* pos, const float* dir, const float* up);
 // free all resources and shut down the sound system.
 // call before h_mgr_shutdown.
 extern void snd_shutdown();
+
+#endif	// #ifndef SND_H__
\ No newline at end of file
diff --git a/source/lib/sysdep/snd.h b/source/lib/sysdep/snd.h
index 5cda82f6df..ea8cbb4c6f 100644
--- a/source/lib/sysdep/snd.h
+++ b/source/lib/sysdep/snd.h
@@ -1,5 +1,5 @@
-#ifndef SND_H__
-#define SND_H__
+#ifndef SYSDEP_SND_H__
+#define SYSDEP_SND_H__
 
 const size_t SND_CARD_LEN = 128;
 extern char snd_card[SND_CARD_LEN];
@@ -10,4 +10,4 @@ extern char snd_drv_ver[SND_DRV_VER_LEN];
 
 extern void get_snd_info(void);
 
-#endif	// #ifndef SND_H__
+#endif	// #ifndef SYSDEP_SND_H__
diff --git a/source/lib/sysdep/win/wpthread.cpp b/source/lib/sysdep/win/wpthread.cpp
index 221556f831..894b415dd0 100644
--- a/source/lib/sysdep/win/wpthread.cpp
+++ b/source/lib/sysdep/win/wpthread.cpp
@@ -25,7 +25,7 @@
 #include "lib.h"
 #include "posix.h"
 #include "win_internal.h"
-#include "lockless.h"
+#include "lockfree.h"
 
 
 static HANDLE pthread_t_to_HANDLE(pthread_t p)