diff --git a/src/globals.cc b/src/globals.cc
index 5d55d0b5..505f8f8f 100644
--- a/src/globals.cc
+++ b/src/globals.cc
@@ -2,6 +2,7 @@
 
 #include "globals.h"
 
+#include <cstdlib>
 #include <torrent/exceptions.h>
 
 rpc::ip_table_list ip_tables;
@@ -14,8 +15,8 @@ expand_path(const std::string& path) {
     return std::string();
 
   if (path[0] == '~') {
-    if (path.size() < 2 || path[1] != '/')
-      throw torrent::input_error("Could not expand ~ in session path, only ~/<path> is supported.");
+    if (path.size() >= 2 && path[1] != '/')
+      throw torrent::input_error("Could not expand ~ in session path, only '~' or '~/...' is supported.");
 
     const char* home = std::getenv("HOME");
 
diff --git a/src/utils/directory.cc b/src/utils/directory.cc
index 77d70448..db330f4f 100644
--- a/src/utils/directory.cc
+++ b/src/utils/directory.cc
@@ -3,6 +3,7 @@
 #include "utils/directory.h"
 
 #include <algorithm>
+#include <cstdlib>
 #include <dirent.h>
 #include <functional>
 #include <sys/stat.h>
diff --git a/src/utils/directory.h b/src/utils/directory.h
index 9f590d2c..17602ab3 100644
--- a/src/utils/directory.h
+++ b/src/utils/directory.h
@@ -1,37 +1,3 @@
-// rTorrent - BitTorrent client
-// Copyright (C) 2005-2011, Jari Sundell
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-// In addition, as a special exception, the copyright holders give
-// permission to link the code of portions of this program with the
-// OpenSSL library under certain conditions as described in each
-// individual source file, and distribute linked combinations
-// including the two.
-//
-// You must obey the GNU General Public License in all respects for
-// all of the code used other than OpenSSL.  If you modify file(s)
-// with this exception, you may extend this exception to your version
-// of the file(s), but you are not obligated to do so.  If you do not
-// wish to do so, delete this exception statement from your version.
-// If you delete this exception statement from all source files in the
-// program, then also delete it here.
-//
-// Contact:  Jari Sundell <sundell.software@gmail.com>
-
-
 #ifndef RTORRENT_UTILS_DIRECTORY_H
 #define RTORRENT_UTILS_DIRECTORY_H