diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
index c4c0dcda24..6d0201f872 100644
--- a/assignment-client/src/avatars/AvatarMixer.cpp
+++ b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -9,6 +9,7 @@
 //
 //  The avatar mixer receives head, hand and positional data from all connected
 //  nodes, and broadcasts that data back to them, every BROADCAST_INTERVAL ms.
+//
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDateTime>
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 45ae36a23b..4013989b99 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Andrzej Kapolka on 5/10/13.
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//
 
 #ifdef WIN32
 #include <Systime.h>
diff --git a/interface/src/Camera.cpp b/interface/src/Camera.cpp
index 252b3be685..8918a3018d 100644
--- a/interface/src/Camera.cpp
+++ b/interface/src/Camera.cpp
@@ -3,6 +3,7 @@
 //  interface
 //
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//
 
 #include <glm/gtx/quaternion.hpp>
 
diff --git a/interface/src/Environment.cpp b/interface/src/Environment.cpp
index 096b8770fb..36292c56a1 100644
--- a/interface/src/Environment.cpp
+++ b/interface/src/Environment.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Andrzej Kapolka on 5/6/13.
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//
 
 #include "InterfaceConfig.h"
 
diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 05f74755df..494c45c295 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Philip Rosedale on 9/11/12.
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//
 
 #include <vector>
 
diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index c2ba28ac7b..9f8e7feb2e 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -5,6 +5,7 @@
 //  Created by Stephen Birarda on 1/23/2014.
 //  Copyright (c) 2014 HighFidelity, Inc. All rights reserved.
 //
+
 #include <string>
 
 #include <glm/gtx/string_cast.hpp>
diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp
index fc47520c83..c2ce17022d 100644
--- a/interface/src/avatar/Hand.cpp
+++ b/interface/src/avatar/Hand.cpp
@@ -3,6 +3,7 @@
 //  interface
 //
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//
 
 #include <QImage>
 
diff --git a/interface/src/avatar/Head.cpp b/interface/src/avatar/Head.cpp
index f42220c0f4..fed86ed81f 100644
--- a/interface/src/avatar/Head.cpp
+++ b/interface/src/avatar/Head.cpp
@@ -3,6 +3,7 @@
 //  interface
 //
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//
 
 #include <glm/gtx/quaternion.hpp>
 
diff --git a/interface/src/renderer/GeometryCache.cpp b/interface/src/renderer/GeometryCache.cpp
index b835e91a12..a3984b9306 100644
--- a/interface/src/renderer/GeometryCache.cpp
+++ b/interface/src/renderer/GeometryCache.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Andrzej Kapolka on 6/21/13.
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//
 
 #include <cmath>
 
diff --git a/interface/src/renderer/GlowEffect.cpp b/interface/src/renderer/GlowEffect.cpp
index f926a81941..1aea22367f 100644
--- a/interface/src/renderer/GlowEffect.cpp
+++ b/interface/src/renderer/GlowEffect.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Andrzej Kapolka on 8/7/13.
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//
 
 // include this before QOpenGLFramebufferObject, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"
diff --git a/interface/src/renderer/PointShader.cpp b/interface/src/renderer/PointShader.cpp
index 6dd4aae485..4191a116e3 100644
--- a/interface/src/renderer/PointShader.cpp
+++ b/interface/src/renderer/PointShader.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Brad Hefta-Gaub on 10/30/13.
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//
 
 // include this before QOpenGLFramebufferObject, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"
diff --git a/interface/src/renderer/ProgramObject.cpp b/interface/src/renderer/ProgramObject.cpp
index 5108c15068..71d6c100f1 100644
--- a/interface/src/renderer/ProgramObject.cpp
+++ b/interface/src/renderer/ProgramObject.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Andrzej Kapolka on 5/7/13.
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//
 
 #include "ProgramObject.h"
 
diff --git a/interface/src/renderer/RenderUtil.cpp b/interface/src/renderer/RenderUtil.cpp
index 11ec8b572c..32cf36a650 100644
--- a/interface/src/renderer/RenderUtil.cpp
+++ b/interface/src/renderer/RenderUtil.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Andrzej Kapolka on 8/15/13.
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//
 
 #include "InterfaceConfig.h"
 #include "RenderUtil.h"
diff --git a/interface/src/renderer/TextureCache.cpp b/interface/src/renderer/TextureCache.cpp
index b3820abf25..c959340f6b 100644
--- a/interface/src/renderer/TextureCache.cpp
+++ b/interface/src/renderer/TextureCache.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Andrzej Kapolka on 8/6/13.
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//
 
 // include this before QGLWidget, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"
diff --git a/interface/src/renderer/VoxelShader.cpp b/interface/src/renderer/VoxelShader.cpp
index fab40fc338..0377e5fe72 100644
--- a/interface/src/renderer/VoxelShader.cpp
+++ b/interface/src/renderer/VoxelShader.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Brad Hefta-Gaub on 9/22/13.
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//
 
 // include this before QOpenGLFramebufferObject, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"
diff --git a/interface/src/starfield/data/GpuVertex.cpp b/interface/src/starfield/data/GpuVertex.cpp
index 58db1d499a..85fc6f8f7e 100755
--- a/interface/src/starfield/data/GpuVertex.cpp
+++ b/interface/src/starfield/data/GpuVertex.cpp
@@ -6,6 +6,7 @@
 // Based on code by Tobias Schwinger on 3/29/13.
 // Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
 //
+
 #include "starfield/data/GpuVertex.h"
 
 using namespace starfield;
diff --git a/interface/src/starfield/renderer/Renderer.cpp b/interface/src/starfield/renderer/Renderer.cpp
index 0be9850338..356e46c468 100755
--- a/interface/src/starfield/renderer/Renderer.cpp
+++ b/interface/src/starfield/renderer/Renderer.cpp
@@ -1,10 +1,10 @@
 //
-// starfield/renderer/Renderer.cpp
-// interface
+//  starfield/renderer/Renderer.cpp
+//  interface
 //
-// Created by Chris Barnard on 10/17/13.
-// Based on earlier work by Tobias Schwinger 3/22/13.
-// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//  Created by Chris Barnard on 10/17/13.
+//  Based on earlier work by Tobias Schwinger 3/22/13.
+//  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
 //
 
 #include "starfield/renderer/Renderer.h"
diff --git a/interface/src/ui/MetavoxelEditor.cpp b/interface/src/ui/MetavoxelEditor.cpp
index ee1b4b0460..73a2476aa4 100644
--- a/interface/src/ui/MetavoxelEditor.cpp
+++ b/interface/src/ui/MetavoxelEditor.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Andrzej Kapolka on 1/21/14.
 //  Copyright (c) 2014 High Fidelity, Inc. All rights reserved.
+//
 
 // include this before QOpenGLFramebufferObject, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"
diff --git a/interface/src/ui/RearMirrorTools.cpp b/interface/src/ui/RearMirrorTools.cpp
index 314fd7157b..c86770d4f0 100644
--- a/interface/src/ui/RearMirrorTools.cpp
+++ b/interface/src/ui/RearMirrorTools.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by stojce on 23.10.2013.
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//
 
 #include "InterfaceConfig.h"
 
diff --git a/interface/src/ui/RunningScriptsWidget.cpp b/interface/src/ui/RunningScriptsWidget.cpp
index 2238cab2df..dcb9210d56 100644
--- a/interface/src/ui/RunningScriptsWidget.cpp
+++ b/interface/src/ui/RunningScriptsWidget.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Mohammed Nafees on 03/28/2014.
 //  Copyright (c) 2014 High Fidelity, Inc. All rights reserved.
+//
 
 #include "ui_runningScriptsWidget.h"
 #include "RunningScriptsWidget.h"
diff --git a/interface/src/ui/TextRenderer.cpp b/interface/src/ui/TextRenderer.cpp
index cacd730fd6..06c657e96e 100644
--- a/interface/src/ui/TextRenderer.cpp
+++ b/interface/src/ui/TextRenderer.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Andrzej Kapolka on 4/24/13.
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//
 
 #include <QFont>
 #include <QPaintEngine>
diff --git a/interface/src/ui/overlays/LocalVoxelsOverlay.cpp b/interface/src/ui/overlays/LocalVoxelsOverlay.cpp
index 460f4eadb6..e605f8879d 100644
--- a/interface/src/ui/overlays/LocalVoxelsOverlay.cpp
+++ b/interface/src/ui/overlays/LocalVoxelsOverlay.cpp
@@ -5,7 +5,7 @@
 //  Created by Clément Brisset on 2/28/14.
 //  Copyright (c) 2014 High Fidelity, Inc. All rights reserved.
 //
-//
+
 // include this before QGLWidget, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"
 
diff --git a/libraries/octree/src/Plane.cpp b/libraries/octree/src/Plane.cpp
index 6a356784b7..727e16724c 100755
--- a/libraries/octree/src/Plane.cpp
+++ b/libraries/octree/src/Plane.cpp
@@ -1,5 +1,5 @@
 //
-//  Plane.h
+//  Plane.cpp
 //  hifi
 //
 //  Created by Brad Hefta-Gaub on 04/11/13.
diff --git a/libraries/script-engine/src/EventTypes.cpp b/libraries/script-engine/src/EventTypes.cpp
index 9885b8d9dc..d5c2d72786 100644
--- a/libraries/script-engine/src/EventTypes.cpp
+++ b/libraries/script-engine/src/EventTypes.cpp
@@ -7,6 +7,7 @@
 //
 //  Used to register meta-types with Qt for very various event types so that they can be exposed to our
 //  scripting engine
+//
 
 #include <QDebug>
 #include <RegisteredMetaTypes.h>
diff --git a/libraries/script-engine/src/MenuItemProperties.cpp b/libraries/script-engine/src/MenuItemProperties.cpp
index f071723233..8c91ad8fef 100644
--- a/libraries/script-engine/src/MenuItemProperties.cpp
+++ b/libraries/script-engine/src/MenuItemProperties.cpp
@@ -7,6 +7,7 @@
 //
 //  Used to register meta-types with Qt for very various event types so that they can be exposed to our
 //  scripting engine
+//
 
 #include <QDebug>
 #include <RegisteredMetaTypes.h>
diff --git a/libraries/shared/src/RegisteredMetaTypes.cpp b/libraries/shared/src/RegisteredMetaTypes.cpp
index af074c59bc..0354fedba9 100644
--- a/libraries/shared/src/RegisteredMetaTypes.cpp
+++ b/libraries/shared/src/RegisteredMetaTypes.cpp
@@ -7,6 +7,7 @@
 //
 //  Used to register meta-types with Qt so that they can be used as properties for objects exposed to our
 //  Agent scripting.
+//
 
 #include "RegisteredMetaTypes.h"
 
diff --git a/libraries/voxels/src/EnvironmentData.cpp b/libraries/voxels/src/EnvironmentData.cpp
index 1c9af55abd..dc82844bd0 100644
--- a/libraries/voxels/src/EnvironmentData.cpp
+++ b/libraries/voxels/src/EnvironmentData.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Andrzej Kapolka on 5/6/13.
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//
 
 #include <cstring>