diff --git a/base/format.cpp b/base/format.cpp
index e06cc2e..53ba8be 100644
--- a/base/format.cpp
+++ b/base/format.cpp
@@ -1,4 +1,5 @@
 #include "base/format.h"
+#include <stdio.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/base/sigslot.h b/base/sigslot.h
index 4ef08f3..53a3586 100755
--- a/base/sigslot.h
+++ b/base/sigslot.h
@@ -107,6 +107,10 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdelete-non-virtual-dtor"
 
+#ifndef NULL
+#define NULL 0
+#endif
+
 namespace base {
 
 	class single_threaded
diff --git a/server/Makefile b/server/Makefile
index 58d514f..b680b1c 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -4,11 +4,11 @@
 UNAME := $(shell uname)
 ifeq ($(UNAME), Darwin)
 PRE_CC=g++ -m32
-CC=$(PRE_CC) -Wshorten-64-to-32
+CC=$(PRE_CC) -Wshorten-64-to-32 -DOSX
 endif
 ifeq ($(UNAME), Linux)
-PRE_CC=g++-4.2 -m32
-CC=$(PRE_CC) -Wconversion
+PRE_CC=g++
+CC=$(PRE_CC) -DLINUX
 endif
 
 LD=$(CC)
diff --git a/server/httppost.cpp b/server/httppost.cpp
index b4efc23..d5b3737 100644
--- a/server/httppost.cpp
+++ b/server/httppost.cpp
@@ -277,7 +277,7 @@ void HttpPost::OnMessage(base::Message *pmsg) {
             SetState(HS_CLOSED);
             CompleteParams *params = (CompleteParams *)pmsg->data;
             if (params->status_code != 200) {
-                RLOG() << "post: " << (dword)this << " status_code: "
+                RLOG() << "post: " << (pword)this << " status_code: "
                         << params->status_code << " error: " << params->error;
             }
             SignalOnComplete(this, params->status_code, params->error, result_);
diff --git a/server/logger.cpp b/server/logger.cpp
index 7b0a769..8fc9f37 100644
--- a/server/logger.cpp
+++ b/server/logger.cpp
@@ -3,7 +3,7 @@
 #include "server/server.h"
 #include <sys/stat.h>
 #include <errno.h>
-#include <linux/limits.h>
+#include <limits.h>
 
 namespace wi {
 
diff --git a/server/statsposter.cpp b/server/statsposter.cpp
index a729ce4..9aeec52 100644
--- a/server/statsposter.cpp
+++ b/server/statsposter.cpp
@@ -101,7 +101,7 @@ void StatsPoster::OnPostComplete(HttpPost *post, int status_code, int error,
             }
         }
     } else {
-        RLOG() << "ERROR: Post " << (dword)post << " not found in posting_!";
+        RLOG() << "ERROR: Post " << (pword)post << " not found in posting_!";
     }
 
     // Schedule more posts 
diff --git a/server/tokenauth.cpp b/server/tokenauth.cpp
index ae5ed82..ba1e88a 100644
--- a/server/tokenauth.cpp
+++ b/server/tokenauth.cpp
@@ -5,6 +5,7 @@
 #include "base/base64.h"
 #include "base/format.h"
 #include "base/md5.h"
+#include <string.h>
 #include <string>
 #include <string.h>
 
diff --git a/yajl/wrapper/jsonbuilder.cpp b/yajl/wrapper/jsonbuilder.cpp
index 4372150..ab9ea71 100644
--- a/yajl/wrapper/jsonbuilder.cpp
+++ b/yajl/wrapper/jsonbuilder.cpp
@@ -1,5 +1,6 @@
 #include <string.h>
 #include "yajl/wrapper/jsonbuilder.h"
+#include <string.h>
 
 namespace json {