diff --git a/aegisub/src/agi_pre.h b/aegisub/src/agi_pre.h
index 698ee5fc3..cd97a4757 100644
--- a/aegisub/src/agi_pre.h
+++ b/aegisub/src/agi_pre.h
@@ -76,6 +76,8 @@
 #include <utility>
 #include <vector>
 
+#include "boost/shared_ptr.hpp"
+
 // General headers
 #include <assert.h>
 #include <ctype.h>
@@ -237,7 +239,7 @@
 #include <GL/glu.h>
 #endif
 
-#ifndef _CRT_SECURE_NO_WARNINGS_DEFINED
+#ifdef _CRT_SECURE_NO_WARNINGS_DEFINED
 #undef _CRT_SECURE_NO_WARNINGS
 #endif
 
diff --git a/aegisub/src/ass_attachment.h b/aegisub/src/ass_attachment.h
index 2f8390b76..c9411fa3b 100644
--- a/aegisub/src/ass_attachment.h
+++ b/aegisub/src/ass_attachment.h
@@ -39,11 +39,10 @@
 // Headers
 #ifndef AGI_PRE
 #include <vector>
+#include "boost/shared_ptr.hpp"
 #endif
 
 #include "ass_entry.h"
-#include "boost/shared_ptr.hpp"
-
 
 /// DOCME
 typedef std::vector<unsigned char> DataVec;
diff --git a/aegisub/src/visual_feature.h b/aegisub/src/visual_feature.h
index fa65ec506..fade30fe4 100644
--- a/aegisub/src/visual_feature.h
+++ b/aegisub/src/visual_feature.h
@@ -75,13 +75,13 @@ public:
 
 	int layer; /// Layer; Higher = above
 
-	int value; /// userdata
+	int value; /// userdata; used by drag tool for time
 	int value2; /// more userdata
 
 	AssDialogue* line; /// The dialogue line this feature is for
 	int lineN; /// The line's index in the file
 
-	int brother[4]; /// userdata; generall indexes of other features in an array
+	int brother[4]; /// userdata; generally indexes of other features in an array
 
 	/// @brief Is the given point over this feature?
 	/// @param mx x coordinate to test
diff --git a/aegisub/src/visual_tool.h b/aegisub/src/visual_tool.h
index aa3b372d3..63c3f4828 100644
--- a/aegisub/src/visual_tool.h
+++ b/aegisub/src/visual_tool.h
@@ -35,10 +35,9 @@
 
 #pragma once
 
-///////////
-// Headers
 #ifndef AGI_PRE
 #include <vector>
+#include "boost/shared_ptr.hpp"
 
 #include <wx/log.h>
 #include <wx/event.h>