diff --git a/exe_win32.cpp b/exe_win32.cpp
index d5dbb9a2..ca0f832e 100644
--- a/exe_win32.cpp
+++ b/exe_win32.cpp
@@ -1,10 +1,32 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2010-2016 Danny Robson <danny@nerdcruft.net>
+ */
+
+#include "./exe.hpp"
 
 #include "except.hpp"
 
+#include <experimental/filesystem>
+#include <vector>
 #include <windows.h>
 
+
+///////////////////////////////////////////////////////////////////////////////
 std::experimental::filesystem::path
-util::image_path (void) {
+util::image_path (void)
+{
         std::vector<char> resolved (256);
 
 retry:
diff --git a/io.hpp b/io.hpp
index d05ec09a..26ac77a5 100644
--- a/io.hpp
+++ b/io.hpp
@@ -23,6 +23,8 @@
 #include <cstdio>
 #include <cstdint>
 #include <experimental/filesystem>
+#include <vector>
+#include <streambuf>
 
 #ifdef PLATFORM_WIN32
 #include <windows.h>