diff --git a/complete.cpp b/complete.cpp
index 2d139a0dc..40963eba2 100644
--- a/complete.cpp
+++ b/complete.cpp
@@ -594,7 +594,7 @@ int complete_is_valid_option( const wchar_t *str,
 			{
 
                 //PCA Rewrite this
-				wchar_t *str_pos = wcschr(i->short_opt_str.c_str(), *a);
+				wchar_t *str_pos = const_cast<wchar_t*>(wcschr(i->short_opt_str.c_str(), *a));
 
 				if  (str_pos )
 				{
diff --git a/event.h b/event.h
index f87bf4ec9..647e6553b 100644
--- a/event.h
+++ b/event.h
@@ -12,8 +12,9 @@
 #ifndef FISH_EVENT_H
 #define FISH_EVENT_H
 
+#include <memory>
+
 #include "common.h"
-#include "event.h"
 
 /**
    The signal number that is used to match any signal
diff --git a/exec.cpp b/exec.cpp
index 2d5021f54..2acd68fa2 100644
--- a/exec.cpp
+++ b/exec.cpp
@@ -25,6 +25,7 @@
 #include <time.h>
 #include <vector>
 #include <deque>
+#include <algorithm>
 
 #ifdef HAVE_SIGINFO_H
 #include <siginfo.h>
@@ -128,7 +129,7 @@ void exec_close( int fd )
 	}
 	
     /* Maybe remove this form our set of open fds */
-    open_fds.erase(remove(open_fds.begin(), open_fds.end(), fd), open_fds.end());
+    open_fds.erase(std::remove(open_fds.begin(), open_fds.end(), fd), open_fds.end());
 }
 
 int exec_pipe( int fd[2])