diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am
index cb408a364..54acedd56 100644
--- a/aegisub/Makefile.am
+++ b/aegisub/Makefile.am
@@ -140,7 +140,6 @@ aegisub_SOURCES = \
 	video_provider_dummy.cpp \
 	video_provider_lavc.cpp \
 	video_slider.cpp \
-	video_zoom.cpp \
 	MatroskaParser.c
 
 noinst_HEADERS = \
diff --git a/aegisub/stdint.h b/aegisub/win32/stdint.h
similarity index 98%
rename from aegisub/stdint.h
rename to aegisub/win32/stdint.h
index c450f9e51..739c89e7e 100644
--- a/aegisub/stdint.h
+++ b/aegisub/win32/stdint.h
@@ -29,9 +29,7 @@
 // 
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
+#ifdef _MSC_VER
 
 #ifndef _MSC_STDINT_H_ // [
 #define _MSC_STDINT_H_
@@ -220,3 +218,4 @@ typedef uint64_t  uintmax_t;
 
 
 #endif // _MSC_STDINT_H_ ]
+#endif // _MSC_VER ]