diff --git a/.gitignore b/.gitignore
index 84636a0a..4eb2d98e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,14 @@
 # The canonical out-of-tree build subdirectory
 build
 
+# Directories
+.vs/
+bin/
+bin-int/
+
+# Files
+*.user
+
 # Visual Studio clutter
 _ReSharper*
 *.sdf
diff --git a/premake5.lua b/premake5.lua
index 4ff14156..97eff05c 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -9,26 +9,38 @@ project "GLFW"
 	{
 		"include/GLFW/glfw3.h",
 		"include/GLFW/glfw3native.h",
+		"src/internal.h",
+		"src/platform.h",
+		"src/mappings.h",
 		"src/glfw_config.h",
 		"src/context.c",
 		"src/init.c",
 		"src/input.c",
 		"src/monitor.c",
+		"src/platform.c",
 		"src/vulkan.c",
-		"src/window.c"
+		"src/window.c",
+		"src/null_platform.h",
+		"src/null_joystick.h",
+		"src/null_init.c",
+		"src/null_monitor.c",
+		"src/null_window.c",
+		"src/null_joystick.c"
 	}
 
 	filter "system:windows"
-		buildoptions { "-std=c11", "-lgdi32" }
 		systemversion "latest"
 		staticruntime "On"
 
 		files
 		{
 			"src/win32_init.c",
+			"src/win32_module.c",
 			"src/win32_joystick.c",
 			"src/win32_monitor.c",
+			"src/win32_time.h",
 			"src/win32_time.c",
+			"src/win32_thread.h",
 			"src/win32_thread.c",
 			"src/win32_window.c",
 			"src/wgl_context.c",