diff --git a/.gitignore b/.gitignore
index d147fba..266c9ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ build/*
 !build/templates
 bin/*
 !bin/media/
-*.lib
+lib
+CMakeFiles
diff --git a/include/vgl.h b/include/vgl.h
index 4c16b8a..99a9dcd 100644
--- a/include/vgl.h
+++ b/include/vgl.h
@@ -5,6 +5,8 @@
 #include <GL3/gl3w.h>
 
 #include <GLFW/glfw3.h>
+#include <sys/time.h>
+#include <string.h>
 
 #define BUFFER_OFFSET(a) ((void*)(a))
 
diff --git a/lib/vdds.cpp b/lib/vdds.cpp
index e417679..c32ca57 100644
--- a/lib/vdds.cpp
+++ b/lib/vdds.cpp
@@ -587,7 +587,8 @@ void vglLoadDDS(const char* filename, vglImageData* image)
 
     if (file_header.magic != DDS_MAGIC)
     {
-        goto done_close_file;
+        fclose(f);
+        return;
     }
 
     if (file_header.std_header.ddspf.dwFourCC == DDS_FOURCC_DX10)
@@ -596,12 +597,14 @@ void vglLoadDDS(const char* filename, vglImageData* image)
     }
 
     if (!vgl_DDSHeaderToImageDataHeader(file_header, image))
-        goto done_close_file;
+        fclose(f);
+        return;
 
     image->target = vgl_GetTargetFromDDSHeader(file_header);
 
     if (image->target == GL_NONE)
-        goto done_close_file;
+        fclose(f);
+        return;
 
     size_t current_pos = ftell(f);
     size_t file_size;
diff --git a/src/12-particlesimulator/12-particlesimulator.cpp b/src/12-particlesimulator/12-particlesimulator.cpp
index ea90b5e..ad0b266 100644
--- a/src/12-particlesimulator/12-particlesimulator.cpp
+++ b/src/12-particlesimulator/12-particlesimulator.cpp
@@ -111,7 +111,7 @@ void ComputeParticleSimulator::Initialize(const char * title)
 
     static const char compute_shader_source[] =
         STRINGIZE(
-#version 430 core\n
+version 430 core\n
 
 layout (std140, binding = 0) uniform attractor_block
 {