From 3574ef838b7926ceea41372efbd096efa1194d8e Mon Sep 17 00:00:00 2001
From: Ben Payne <bpayne@beamng.com>
Date: Tue, 6 Jan 2015 00:42:09 -0500
Subject: [PATCH 1/2] Fix erroneous include guards

---
 Engine/source/T3D/turret/turretShape.h      | 2 +-
 Engine/source/forest/ts/tsForestCellBatch.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Engine/source/T3D/turret/turretShape.h b/Engine/source/T3D/turret/turretShape.h
index 37af57ecf..7bc177eb6 100644
--- a/Engine/source/T3D/turret/turretShape.h
+++ b/Engine/source/T3D/turret/turretShape.h
@@ -23,7 +23,7 @@
 #ifndef _TURRETSHAPE_H_
 #define _TURRETSHAPE_H_
 
-#ifndef _SHAPEBASE_H_
+#ifndef _ITEM_H_
    #include "T3D/item.h"
 #endif
 
diff --git a/Engine/source/forest/ts/tsForestCellBatch.h b/Engine/source/forest/ts/tsForestCellBatch.h
index a4c79d098..a2911addc 100644
--- a/Engine/source/forest/ts/tsForestCellBatch.h
+++ b/Engine/source/forest/ts/tsForestCellBatch.h
@@ -23,7 +23,7 @@
 #ifndef _TSFORESTCELLBATCH_H_
 #define _TSFORESTCELLBATCH_H_
 
-#ifndef _FORESTCELLBATCH_H_
+#ifndef _IMPOSTERRENDERMGR_H_
 #include "renderInstance/renderImposterMgr.h"
 #endif
 #ifndef _FORESTCELLBATCH_H_

From b2b950c84a4b48d3fa9be49a2faa40c5aeb82db0 Mon Sep 17 00:00:00 2001
From: Ben Payne <bpayne@beamng.com>
Date: Tue, 6 Jan 2015 00:42:33 -0500
Subject: [PATCH 2/2] Add missing include guards to some headers

---
 Engine/source/gfx/D3D9/videoCaptureD3D9.h                | 7 ++++++-
 Engine/source/math/mPolyhedron.impl.h                    | 5 +++++
 Engine/source/scene/mixin/sceneAmbientSoundObject.impl.h | 5 +++++
 Engine/source/scene/mixin/scenePolyhedralObject.impl.h   | 4 ++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Engine/source/gfx/D3D9/videoCaptureD3D9.h b/Engine/source/gfx/D3D9/videoCaptureD3D9.h
index f9c5e9f1d..eb3b7e19f 100644
--- a/Engine/source/gfx/D3D9/videoCaptureD3D9.h
+++ b/Engine/source/gfx/D3D9/videoCaptureD3D9.h
@@ -20,6 +20,9 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
+#ifndef _GFX_D3D_VIDEOCAPTURED3D9_H_
+#define _GFX_D3D_VIDEOCAPTURED3D9_H_
+
 #ifndef _VIDEOCAPTURE_H_
 #include "gfx/video/videoCapture.h"
 #endif
@@ -79,4 +82,6 @@ protected:
 public:
    VideoFrameGrabberD3D9();
    ~VideoFrameGrabberD3D9();
-};
\ No newline at end of file
+};
+
+#endif // _GFX_D3D_VIDEOCAPTURED3D9_H_
diff --git a/Engine/source/math/mPolyhedron.impl.h b/Engine/source/math/mPolyhedron.impl.h
index b36debcaa..ef74995ab 100644
--- a/Engine/source/math/mPolyhedron.impl.h
+++ b/Engine/source/math/mPolyhedron.impl.h
@@ -20,6 +20,9 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
+#ifndef _MPOLYHEDRON_IMPL_H_
+#define _MPOLYHEDRON_IMPL_H_
+
 #include "math/mPlaneTransformer.h"
 
 
@@ -503,3 +506,5 @@ void PolyhedronData::buildBoxData( Polyhedron& poly, const MatrixF& mat, const B
       edge ++;
    }
 }
+
+#endif // _MPOLYHEDRON_IMPL_H_
diff --git a/Engine/source/scene/mixin/sceneAmbientSoundObject.impl.h b/Engine/source/scene/mixin/sceneAmbientSoundObject.impl.h
index b975a2d41..8953ac73c 100644
--- a/Engine/source/scene/mixin/sceneAmbientSoundObject.impl.h
+++ b/Engine/source/scene/mixin/sceneAmbientSoundObject.impl.h
@@ -20,6 +20,9 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
+#ifndef _SCENEAMBIENTSOUNDOBJECT_IMPL_H_
+#define _SCENEAMBIENTSOUNDOBJECT_IMPL_H_
+
 #include "platform/platform.h"
 #include "scene/mixin/sceneAmbientSoundObject.h"
 
@@ -112,3 +115,5 @@ bool SceneAmbientSoundObject< Base >::_setSoundAmbience( void* object, const cha
    p->setSoundAmbience( ambience );
    return false;
 }
+
+#endif // _SCENEAMBIENTSOUNDOBJECT_IMPL_H_
diff --git a/Engine/source/scene/mixin/scenePolyhedralObject.impl.h b/Engine/source/scene/mixin/scenePolyhedralObject.impl.h
index 43a1e3e9f..b01eb9691 100644
--- a/Engine/source/scene/mixin/scenePolyhedralObject.impl.h
+++ b/Engine/source/scene/mixin/scenePolyhedralObject.impl.h
@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#ifndef _SCENEPOLYHEDRALOBJECT_IMPL_H_
+#define _SCENEPOLYHEDRALOBJECT_IMPL_H_
 
 #include "platform/platform.h"
 #include "scene/mixin/scenePolyhedralObject.h"
@@ -393,3 +395,5 @@ bool ScenePolyhedralObject< Base, P >::_setEdge( void* object, const char* index
 
    return false;
 }
+
+#endif // _SCENEPOLYHEDRALOBJECT_IMPL_H_