diff --git a/source/simulation/BaseEntityCollection.h b/source/simulation/BaseEntityCollection.h
index 23db03e0b4..05f685be06 100755
--- a/source/simulation/BaseEntityCollection.h
+++ b/source/simulation/BaseEntityCollection.h
@@ -36,4 +36,4 @@ public:
 	CBaseEntity* getTemplateByActor( CObjectEntry* actor );
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/source/simulation/BoundingObjects.h b/source/simulation/BoundingObjects.h
index 999e03d258..0717855726 100755
--- a/source/simulation/BoundingObjects.h
+++ b/source/simulation/BoundingObjects.h
@@ -76,4 +76,4 @@ public:
 	void render( float height );	// Temporary
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/source/simulation/Collision.cpp b/source/simulation/Collision.cpp
index 8c876c1446..7f62b2e686 100755
--- a/source/simulation/Collision.cpp
+++ b/source/simulation/Collision.cpp
@@ -41,7 +41,7 @@ HEntity getCollisionObject( CEntity* entity )
 	}
 
 	delete( entities );
-	return( HEntity() );
+	return HEntity();
 }
 
 HEntity getCollisionObject( CEntity* entity, float x, float y )
@@ -90,4 +90,4 @@ bool getRayIntersection( const CVector2D& source, const CVector2D& forward, cons
 	delete( entities );
 	if( results->boundingObject ) return( true );
 	return( false );
-}
\ No newline at end of file
+}
diff --git a/source/simulation/Collision.h b/source/simulation/Collision.h
index 8b1d08eec8..5a9b4b6637 100755
--- a/source/simulation/Collision.h
+++ b/source/simulation/Collision.h
@@ -32,4 +32,4 @@ HEntity getCollisionObject( CEntity* entity, float x, float y );
 CBoundingObject* getContainingObject( const CVector2D& point );
 bool getRayIntersection( const CVector2D& source, const CVector2D& forward, const CVector2D& right, float length, float maxDistance, rayIntersectionResults* results );
 
-#endif
\ No newline at end of file
+#endif
diff --git a/source/simulation/Entity.h b/source/simulation/Entity.h
index e2440736ec..473d9dc157 100755
--- a/source/simulation/Entity.h
+++ b/source/simulation/Entity.h
@@ -49,7 +49,7 @@ class CEntityManager;
 
 class CEntity
 {
-	friend CEntityManager;
+	friend class CEntityManager;
 private:
 	// Intrinsic properties
 public:
@@ -91,4 +91,4 @@ public:
 	void pushOrder( CEntityOrder& order );
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/source/simulation/EntityHandles.h b/source/simulation/EntityHandles.h
index 9391cdf7ea..783de7bb99 100755
--- a/source/simulation/EntityHandles.h
+++ b/source/simulation/EntityHandles.h
@@ -37,7 +37,7 @@ public:
 
 class HEntity
 {
-	friend CEntityManager;
+	friend class CEntityManager;
 	u16 m_handle;
 	void addRef();
 	void decRef();
@@ -53,4 +53,4 @@ public:
 	~HEntity();
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/source/simulation/EntityManager.cpp b/source/simulation/EntityManager.cpp
index 4864275d8e..cee3eab0bf 100755
--- a/source/simulation/EntityManager.cpp
+++ b/source/simulation/EntityManager.cpp
@@ -88,4 +88,4 @@ void CEntityManager::destroy( u16 handle )
 	delete( m_entities[handle].m_entity );
 }
 
-bool CEntityManager::m_extant = false;
\ No newline at end of file
+bool CEntityManager::m_extant = false;
diff --git a/source/simulation/EntityManager.h b/source/simulation/EntityManager.h
index 38b971f988..e3bf27415b 100755
--- a/source/simulation/EntityManager.h
+++ b/source/simulation/EntityManager.h
@@ -29,8 +29,8 @@
 
 class CEntityManager : public Singleton<CEntityManager>
 {
-friend HEntity;
-friend CHandle;
+friend class HEntity;
+friend class CHandle;
 	CHandle m_entities[MAX_HANDLES];
 	std::vector<HEntity> m_reaper;
 	int m_nextalloc;
@@ -54,4 +54,5 @@ public:
 	}
 };
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/source/simulation/EntityMessage.h b/source/simulation/EntityMessage.h
index c82b1b95d4..9de5183f8a 100755
--- a/source/simulation/EntityMessage.h
+++ b/source/simulation/EntityMessage.h
@@ -28,4 +28,4 @@ struct CMessage
 	}
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/source/simulation/EntityOrders.h b/source/simulation/EntityOrders.h
index bf1ebb7e1f..af920f5f6a 100755
--- a/source/simulation/EntityOrders.h
+++ b/source/simulation/EntityOrders.h
@@ -52,4 +52,4 @@ public:
 	SOrderData m_data[ORDER_MAX_DATA];
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/source/simulation/EntityProperties.cpp b/source/simulation/EntityProperties.cpp
index 4e925f7139..f2623be9f9 100755
--- a/source/simulation/EntityProperties.cpp
+++ b/source/simulation/EntityProperties.cpp
@@ -299,11 +299,11 @@ CStr CGenericProperty::toString()
 			return( CStr( buffer ) );
 		}
 	case PROP_PTR:
-		return( CStr() );
+		return CStr();
 	default:
 		assert( 0 && "Invalid property type" );
 	}
-	return( CStr() );
+	return CStr();
 }
 
 CVector3D CGenericProperty::toVector()
@@ -316,11 +316,11 @@ CVector3D CGenericProperty::toVector()
 	case PROP_FLOAT:
 	case PROP_STRING:
 	case PROP_PTR:
-		return( CVector3D() );
+		return CVector3D();
 	default:
 		assert( 0 && "Invalid property type" );
 	}
-	return( CVector3D() );
+	return CVector3D();
 }
 
 void* CGenericProperty::toVoid()
@@ -551,7 +551,7 @@ CGenericProperty::operator CStr&()
 	case PROP_FLOAT_INTRINSIC:
 		return( CStr( *m_floatptr ) );
 	default:
-		return( CStr() );
+		return CStr();
 	}
 }
 
@@ -562,7 +562,7 @@ CGenericProperty::operator CVector3D()
 	case PROP_VECTOR:
 		return( *m_vector );
 	default:
-		return( CVector3D() );
+		return CVector3D();
 	}
 }
 
diff --git a/source/simulation/EntityStateProcessing.cpp b/source/simulation/EntityStateProcessing.cpp
index aff7b31d65..9b9ad3380d 100755
--- a/source/simulation/EntityStateProcessing.cpp
+++ b/source/simulation/EntityStateProcessing.cpp
@@ -136,4 +136,4 @@ bool CEntity::processPatrol( CEntityOrder* current, float timestep )
 	m_orderQueue.push_front( this_segment );
 	m_orderQueue.push_back( repeat_patrol );
 	return( true );
-}
\ No newline at end of file
+}
diff --git a/source/simulation/PathfindEngine.cpp b/source/simulation/PathfindEngine.cpp
index 58b8576597..f46896349d 100755
--- a/source/simulation/PathfindEngine.cpp
+++ b/source/simulation/PathfindEngine.cpp
@@ -4,4 +4,4 @@
 void CPathfindEngine::requestPath( HEntity entity, const CVector2D& destination )
 {
 	pathSparse( entity, destination );
-}
\ No newline at end of file
+}
diff --git a/source/simulation/PathfindSparse.cpp b/source/simulation/PathfindSparse.cpp
index 88fb6ee71a..39ecaf7614 100755
--- a/source/simulation/PathfindSparse.cpp
+++ b/source/simulation/PathfindSparse.cpp
@@ -207,4 +207,4 @@ void pathSparse( HEntity entity, CVector2D destination )
 		direct.m_data[0].location = destination;
 		entity->m_orderQueue.push_front( direct );
 	}
-}
\ No newline at end of file
+}
diff --git a/source/simulation/PathfindSparse.h b/source/simulation/PathfindSparse.h
index b078228164..25fbd7e03b 100755
--- a/source/simulation/PathfindSparse.h
+++ b/source/simulation/PathfindSparse.h
@@ -61,4 +61,4 @@ void nodeSmooth( HEntity entity, std::vector<CVector2D>& nodelist );
 void pathSparse( HEntity entity, CVector2D destination );
 bool pathSparseRecursive( HEntity entity, CVector2D from, CVector2D to, CBoundingObject* destinationCollisionObject );
 
-#endif
\ No newline at end of file
+#endif