diff --git a/build.rs b/build.rs
index 867e1702..7137d3e3 100644
--- a/build.rs
+++ b/build.rs
@@ -1,4 +1,3 @@
-#![feature(path)]
 extern crate gl_generator;
 extern crate khronos_api;
 
diff --git a/src/lib.rs b/src/lib.rs
index 916b699a..17765410 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -211,7 +211,9 @@ pub struct PixelFormat {
 }
 
 /// Attributes
-struct BuilderAttribs<'a> {
+// FIXME: remove `pub` (https://github.com/rust-lang/rust/issues/23585)
+#[doc(hidden)]
+pub struct BuilderAttribs<'a> {
     #[allow(dead_code)]
     headless: bool,
     strict: bool,
diff --git a/src/win32/callback.rs b/src/win32/callback.rs
index 5423fc38..f9ec6537 100644
--- a/src/win32/callback.rs
+++ b/src/win32/callback.rs
@@ -36,8 +36,9 @@ fn send_event(input_window: winapi::HWND, event: Event) {
 /// This is the callback that is called by `DispatchMessage` in the events loop.
 /// 
 /// Returning 0 tells the Win32 API that the message has been processed.
-pub extern "system" fn callback(window: winapi::HWND, msg: winapi::UINT,
-    wparam: winapi::WPARAM, lparam: winapi::LPARAM) -> winapi::LRESULT
+pub unsafe extern "system" fn callback(window: winapi::HWND, msg: winapi::UINT,
+                                       wparam: winapi::WPARAM, lparam: winapi::LPARAM)
+                                       -> winapi::LRESULT
 {
     match msg {
         winapi::WM_DESTROY => {
diff --git a/src/win32/mod.rs b/src/win32/mod.rs
index 8ba5ed5f..07f76e88 100644
--- a/src/win32/mod.rs
+++ b/src/win32/mod.rs
@@ -49,7 +49,9 @@ unsafe impl Send for Window {}
 unsafe impl Sync for Window {}
 
 /// A simple wrapper that destroys the context when it is destroyed.
-struct ContextWrapper(pub winapi::HGLRC);
+// FIXME: remove `pub` (https://github.com/rust-lang/rust/issues/23585)
+#[doc(hidden)]
+pub struct ContextWrapper(pub winapi::HGLRC);
 
 impl Drop for ContextWrapper {
     fn drop(&mut self) {
@@ -60,7 +62,9 @@ impl Drop for ContextWrapper {
 }
 
 /// A simple wrapper that destroys the window when it is destroyed.
-struct WindowWrapper(pub winapi::HWND, pub winapi::HDC);
+// FIXME: remove `pub` (https://github.com/rust-lang/rust/issues/23585)
+#[doc(hidden)]
+pub struct WindowWrapper(pub winapi::HWND, pub winapi::HDC);
 
 impl Drop for WindowWrapper {
     fn drop(&mut self) {