diff --git a/CMakeLists.txt b/CMakeLists.txt
index a975ef533..4e2f5f9e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,6 +126,7 @@ ENDIF(MSVC)
 IF(UNIX)
 	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 		ADD_DEFINITIONS(-DFREEBSD)
+		ADD_DEFINITIONS(-D_GLIBCXX_USE_C99)
 		SET(FREEBSD TRUE)
 	ENDIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 	IF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
diff --git a/common/unix.h b/common/unix.h
index c78d05cb2..d4155f946 100644
--- a/common/unix.h
+++ b/common/unix.h
@@ -18,9 +18,6 @@
 #ifndef _WINDOWS
 #ifndef __UNIX_H__
 #define __UNIX_H__
-	#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-		#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP {0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, __LOCK_INITIALIZER}
-	#endif
 #include <unistd.h>
 
 typedef int SOCKET;
diff --git a/luabind/luabind/detail/object_rep.hpp b/luabind/luabind/detail/object_rep.hpp
index dafa6532a..93b3e39d6 100644
--- a/luabind/luabind/detail/object_rep.hpp
+++ b/luabind/luabind/detail/object_rep.hpp
@@ -28,6 +28,7 @@
 #include <luabind/config.hpp>
 #include <luabind/detail/instance_holder.hpp>
 #include <luabind/detail/ref.hpp>
+#include <cstdlib>
 
 namespace luabind { namespace detail
 {
diff --git a/zone/raids.cpp b/zone/raids.cpp
index 0adbcdef1..c0879eca6 100644
--- a/zone/raids.cpp
+++ b/zone/raids.cpp
@@ -262,7 +262,6 @@ void Raid::SaveRaidLeaderAA()
 {
 	char *queryBuffer = new char[sizeof(RaidLeadershipAA_Struct) * 2 + 1];
 	database.DoEscapeString(queryBuffer, (char*)&raid_aa, sizeof(RaidLeadershipAA_Struct));
-	_hex(NET__ERROR, queryBuffer, sizeof(RaidLeadershipAA_Struct));
 
 	std::string query = "UPDATE raid_leaders SET leadershipaa = '";
 	query += queryBuffer;