fix header include guards via regex

animation-server/src/AnimationServer.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__AnimationServer__
-#define __hifi__AnimationServer__
+#ifndef hifi_AnimationServer_h
+#define hifi_AnimationServer_h
 
 #include <QtCore/QCoreApplication>
 
@@ -24,4 +24,4 @@ private slots:
 };
 
 
-#endif /* defined(__hifi__AnimationServer__) */
+#endif // hifi_AnimationServer_h

assignment-client/src/Agent.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__Agent__
-#define __hifi__Agent__
+#ifndef hifi_Agent_h
+#define hifi_Agent_h
 
 #include <vector>
 
@@ -67,4 +67,4 @@ private:
     MixedAudioRingBuffer _receivedAudioBuffer;
 };
 
-#endif /* defined(__hifi__Agent__) */
+#endif // hifi_Agent_h

assignment-client/src/AssignmentClient.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__AssignmentClient__
-#define __hifi__AssignmentClient__
+#ifndef hifi_AssignmentClient_h
+#define hifi_AssignmentClient_h
 
 #include <QtCore/QCoreApplication>
 
@@ -30,4 +30,4 @@ private:
     SharedAssignmentPointer _currentAssignment;
 };
 
-#endif /* defined(__hifi__AssignmentClient__) */
+#endif // hifi_AssignmentClient_h

assignment-client/src/AssignmentClientMonitor.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__AssignmentClientMonitor__
-#define __hifi__AssignmentClientMonitor__
+#ifndef hifi_AssignmentClientMonitor_h
+#define hifi_AssignmentClientMonitor_h
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QProcess>
@@ -31,4 +31,4 @@ private:
     QStringList _childArguments;
 };
 
-#endif /* defined(__hifi__AssignmentClientMonitor__) */
+#endif // hifi_AssignmentClientMonitor_h

assignment-client/src/AssignmentFactory.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__AssignmentFactory__
-#define __hifi__AssignmentFactory__
+#ifndef hifi_AssignmentFactory_h
+#define hifi_AssignmentFactory_h
 
 #include <ThreadedAssignment.h>
 
@@ -19,4 +19,4 @@ public:
     static ThreadedAssignment* unpackAssignment(const QByteArray& packet);
 };
 
-#endif /* defined(__hifi__AssignmentFactory__) */
+#endif // hifi_AssignmentFactory_h

assignment-client/src/AssignmentThread.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__AssignmentThread__
-#define __hifi__AssignmentThread__
+#ifndef hifi_AssignmentThread_h
+#define hifi_AssignmentThread_h
 
 #include <QtCore/QThread>
 
@@ -23,4 +23,4 @@ private:
     SharedAssignmentPointer _assignment;
 };
 
-#endif /* defined(__hifi__AssignmentThread__) */
+#endif // hifi_AssignmentThread_h

assignment-client/src/audio/AudioMixer.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__AudioMixer__
-#define __hifi__AudioMixer__
+#ifndef hifi_AudioMixer_h
+#define hifi_AudioMixer_h
 
 #include <AudioRingBuffer.h>
 
@@ -53,4 +53,4 @@ private:
     int _sumMixes;
 };
 
-#endif /* defined(__hifi__AudioMixer__) */
+#endif // hifi_AudioMixer_h

assignment-client/src/audio/AudioMixerClientData.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__AudioMixerClientData__
-#define __hifi__AudioMixerClientData__
+#ifndef hifi_AudioMixerClientData_h
+#define hifi_AudioMixerClientData_h
 
 #include <vector>
 
@@ -34,4 +34,4 @@ private:
     std::vector<PositionalAudioRingBuffer*> _ringBuffers;
 };
 
-#endif /* defined(__hifi__AudioMixerClientData__) */
+#endif // hifi_AudioMixerClientData_h

assignment-client/src/audio/AvatarAudioRingBuffer.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__AvatarAudioRingBuffer__
-#define __hifi__AvatarAudioRingBuffer__
+#ifndef hifi_AvatarAudioRingBuffer_h
+#define hifi_AvatarAudioRingBuffer_h
 
 #include <QtCore/QUuid>
 
@@ -27,4 +27,4 @@ private:
     AvatarAudioRingBuffer& operator= (const AvatarAudioRingBuffer&);
 };
 
-#endif /* defined(__hifi__AvatarAudioRingBuffer__) */
+#endif // hifi_AvatarAudioRingBuffer_h

assignment-client/src/avatars/AvatarMixer.h

@@ -12,8 +12,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__AvatarMixer__
-#define __hifi__AvatarMixer__
+#ifndef hifi_AvatarMixer_h
+#define hifi_AvatarMixer_h
 
 #include <ThreadedAssignment.h>
 
@@ -49,4 +49,4 @@ private:
     int _sumIdentityPackets;
 };
 
-#endif /* defined(__hifi__AvatarMixer__) */
+#endif // hifi_AvatarMixer_h

assignment-client/src/avatars/AvatarMixerClientData.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__AvatarMixerClientData__
-#define __hifi__AvatarMixerClientData__
+#ifndef hifi_AvatarMixerClientData_h
+#define hifi_AvatarMixerClientData_h
 
 #include <QtCore/QUrl>
 
@@ -40,4 +40,4 @@ private:
     quint64 _identityChangeTimestamp;
 };
 
-#endif /* defined(__hifi__AvatarMixerClientData__) */
+#endif // hifi_AvatarMixerClientData_h

assignment-client/src/metavoxels/MetavoxelServer.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__MetavoxelServer__
-#define __hifi__MetavoxelServer__
+#ifndef hifi_MetavoxelServer_h
+#define hifi_MetavoxelServer_h
 
 #include <QList>
 #include <QTimer>
@@ -95,4 +95,4 @@ private:
     QList<SendRecord> _sendRecords;
 };
 
-#endif /* defined(__hifi__MetavoxelServer__) */
+#endif // hifi_MetavoxelServer_h

assignment-client/src/octree/OctreeInboundPacketProcessor.h

@@ -11,8 +11,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __octree_server__OctreeInboundPacketProcessor__
-#define __octree_server__OctreeInboundPacketProcessor__
+#ifndef hifi_OctreeInboundPacketProcessor_h
+#define hifi_OctreeInboundPacketProcessor_h
 
 #include <map>
 
@@ -83,4 +83,4 @@ private:
     
     NodeToSenderStatsMap _singleSenderStats;
 };
-#endif // __octree_server__OctreeInboundPacketProcessor__
+#endif // hifi_OctreeInboundPacketProcessor_h

assignment-client/src/octree/OctreeQueryNode.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__OctreeQueryNode__
-#define __hifi__OctreeQueryNode__
+#ifndef hifi_OctreeQueryNode_h
+#define hifi_OctreeQueryNode_h
 
 #include <iostream>
 #include <NodeData.h>
@@ -138,4 +138,4 @@ private:
     bool _isShuttingDown;
 };
 
-#endif /* defined(__hifi__OctreeQueryNode__) */
+#endif // hifi_OctreeQueryNode_h

assignment-client/src/octree/OctreeSendThread.h

@@ -11,8 +11,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __octree_server__OctreeSendThread__
-#define __octree_server__OctreeSendThread__
+#ifndef hifi_OctreeSendThread_h
+#define hifi_OctreeSendThread_h
 
 #include <GenericThread.h>
 #include <NetworkPacket.h>
@@ -55,4 +55,4 @@ private:
     bool _isShuttingDown;
 };
 
-#endif // __octree_server__OctreeSendThread__
+#endif // hifi_OctreeSendThread_h

assignment-client/src/octree/OctreeServer.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __octree_server__OctreeServer__
-#define __octree_server__OctreeServer__
+#ifndef hifi_OctreeServer_h
+#define hifi_OctreeServer_h
 
 #include <QStringList>
 #include <QDateTime>
@@ -219,4 +219,4 @@ protected:
     static QMutex _threadsDidCallWriteDatagramMutex;
 };
 
-#endif // __octree_server__OctreeServer__
+#endif // hifi_OctreeServer_h

assignment-client/src/octree/OctreeServerConsts.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __octree_server__OctreeServerConsts__
-#define __octree_server__OctreeServerConsts__
+#ifndef hifi_OctreeServerConsts_h
+#define hifi_OctreeServerConsts_h
 
 #include <SharedUtil.h>
 #include <NodeList.h> // for MAX_PACKET_SIZE
@@ -21,4 +21,4 @@ const int INTERVALS_PER_SECOND = 60;
 const int OCTREE_SEND_INTERVAL_USECS = (1000 * 1000)/INTERVALS_PER_SECOND;
 const int SENDING_TIME_TO_SPARE = 5 * 1000; // usec of sending interval to spare for calculating voxels
 
-#endif // __octree_server__OctreeServerConsts__
+#endif // hifi_OctreeServerConsts_h

assignment-client/src/particles/ParticleNodeData.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__ParticleNodeData__
-#define __hifi__ParticleNodeData__
+#ifndef hifi_ParticleNodeData_h
+#define hifi_ParticleNodeData_h
 
 #include <PacketHeaders.h>
 
@@ -31,4 +31,4 @@ private:
     quint64 _lastDeletedParticlesSentAt;
 };
 
-#endif /* defined(__hifi__ParticleNodeData__) */
+#endif // hifi_ParticleNodeData_h

assignment-client/src/particles/ParticleServer.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __particle_server__ParticleServer__
-#define __particle_server__ParticleServer__
+#ifndef hifi_ParticleServer_h
+#define hifi_ParticleServer_h
 
 #include "../octree/OctreeServer.h"
 
@@ -47,4 +47,4 @@ public slots:
 private:
 };
 
-#endif // __particle_server__ParticleServer__
+#endif // hifi_ParticleServer_h

assignment-client/src/particles/ParticleServerConsts.h

@@ -9,11 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __particle_server__ParticleServerConsts__
-#define __particle_server__ParticleServerConsts__
+#ifndef hifi_ParticleServerConsts_h
+#define hifi_ParticleServerConsts_h
 
 extern const char* PARTICLE_SERVER_NAME;
 extern const char* PARTICLE_SERVER_LOGGING_TARGET_NAME;
 extern const char* LOCAL_PARTICLES_PERSIST_FILE;
 
-#endif // __particle_server__ParticleServerConsts__
+#endif // hifi_ParticleServerConsts_h

assignment-client/src/voxels/VoxelNodeData.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__VoxelNodeData__
-#define __hifi__VoxelNodeData__
+#ifndef hifi_VoxelNodeData_h
+#define hifi_VoxelNodeData_h
 
 #include <PacketHeaders.h>
 
@@ -22,4 +22,4 @@ public:
     virtual PacketType getMyPacketType() const { return PacketTypeVoxelData; }
 };
 
-#endif /* defined(__hifi__VoxelNodeData__) */
+#endif // hifi_VoxelNodeData_h

assignment-client/src/voxels/VoxelServer.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __voxel_server__VoxelServer__
-#define __voxel_server__VoxelServer__
+#ifndef hifi_VoxelServer_h
+#define hifi_VoxelServer_h
 
 #include <QStringList>
 #include <QDateTime>
@@ -55,4 +55,4 @@ private:
     unsigned char _tempOutputBuffer[MAX_PACKET_SIZE];
 };
 
-#endif // __voxel_server__VoxelServer__
+#endif // hifi_VoxelServer_h

assignment-client/src/voxels/VoxelServerConsts.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __voxel_server__VoxelServerConsts__
-#define __voxel_server__VoxelServerConsts__
+#ifndef hifi_VoxelServerConsts_h
+#define hifi_VoxelServerConsts_h
 
 extern const char* VOXEL_SERVER_NAME;
 extern const char* VOXEL_SERVER_LOGGING_TARGET_NAME;
@@ -18,4 +18,4 @@ extern const char* LOCAL_VOXELS_PERSIST_FILE;
 
 const int ENVIRONMENT_SEND_INTERVAL_USECS = 1000000;
 
-#endif // __voxel_server__VoxelServerConsts__
+#endif // hifi_VoxelServerConsts_h

domain-server/src/DomainServer.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__DomainServer__
-#define __hifi__DomainServer__
+#ifndef hifi_DomainServer_h
+#define hifi_DomainServer_h
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QHash>
@@ -89,4 +89,4 @@ private slots:
     void readAvailableDatagrams();
 };
 
-#endif /* defined(__hifi__DomainServer__) */
+#endif // hifi_DomainServer_h

domain-server/src/DomainServerNodeData.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__DomainServerNodeData__
-#define __hifi__DomainServerNodeData__
+#ifndef hifi_DomainServerNodeData_h
+#define hifi_DomainServerNodeData_h
 
 #include <QtCore/QHash>
 #include <QtCore/QUuid>
@@ -38,4 +38,4 @@ private:
     QJsonObject _statsJSONObject;
 };
 
-#endif /* defined(__hifi__DomainServerNodeData__) */
+#endif // hifi_DomainServerNodeData_h

interface/src/AbstractLoggerInterface.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__AbstractLoggerInterface__
-#define __interface__AbstractLoggerInterface__
+#ifndef hifi_AbstractLoggerInterface_h
+#define hifi_AbstractLoggerInterface_h
 
 #include <QtCore/QObject>
 #include <QString>
@@ -35,4 +35,4 @@ private:
     bool _extraDebugging;
 };
 
-#endif /* defined(__interface__AbstractLoggerInterface__) */
+#endif // hifi_AbstractLoggerInterface_h

interface/src/Application.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__Application__
-#define __interface__Application__
+#ifndef hifi_Application_h
+#define hifi_Application_h
 
 #include <map>
 #include <time.h>
@@ -508,4 +508,4 @@ private:
     QHash<QString, ScriptEngine*> _scriptEnginesHash;
 };
 
-#endif /* defined(__interface__Application__) */
+#endif // hifi_Application_h

interface/src/Audio.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__Audio__
-#define __interface__Audio__
+#ifndef hifi_Audio_h
+#define hifi_Audio_h
 
 #ifdef _WIN32
 #define WANT_TIMEVAL
@@ -192,4 +192,4 @@ private:
 };
 
 
-#endif /* defined(__interface__audio__) */
+#endif // hifi_Audio_h

interface/src/BuckyBalls.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__BuckyBalls__
-#define __hifi__BuckyBalls__
+#ifndef hifi_BuckyBalls_h
+#define hifi_BuckyBalls_h
 
 #include <iostream>
 
@@ -47,4 +47,4 @@ private:
     
 };
 
-#endif /* defined(__hifi__BuckyBalls__) */
+#endif // hifi_BuckyBalls_h

interface/src/Camera.h

@@ -8,8 +8,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__camera__
-#define __interface__camera__
+#ifndef hifi_Camera_h
+#define hifi_Camera_h
 
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
@@ -154,4 +154,4 @@ private:
     Camera* _camera;
     ViewFrustum* _viewFrustum;
 };
-#endif
+#endif // hifi_Camera_h

interface/src/DatagramProcessor.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__DatagramProcessor__
-#define __hifi__DatagramProcessor__
+#ifndef hifi_DatagramProcessor_h
+#define hifi_DatagramProcessor_h
 
 #include <QtCore/QObject>
 
@@ -31,4 +31,4 @@ private:
     int _byteCount;
 };
 
-#endif /* defined(__hifi__DatagramProcessor__) */
+#endif // hifi_DatagramProcessor_h

interface/src/Environment.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__Environment__
-#define __interface__Environment__
+#ifndef hifi_Environment_h
+#define hifi_Environment_h
 
 #include <QHash>
 #include <QMutex>
@@ -78,4 +78,4 @@ private:
     QMutex _mutex;
 };
 
-#endif /* defined(__interface__Environment__) */
+#endif // hifi_Environment_h

interface/src/FileLogger.h

@@ -32,4 +32,4 @@ private:
 
 };
 
-#endif
+#endif // hifi_FileLogger_h

interface/src/GLCanvas.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__GLCanvas__
-#define __hifi__GLCanvas__
+#ifndef hifi_GLCanvas_h
+#define hifi_GLCanvas_h
 
 #include <QGLWidget>
 #include <QTimer>
@@ -52,4 +52,4 @@ private slots:
     void throttleRender();
 };
 
-#endif /* defined(__hifi__GLCanvas__) */
+#endif // hifi_GLCanvas_h

interface/src/Menu.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__Menu__
-#define __hifi__Menu__
+#ifndef hifi_Menu_h
+#define hifi_Menu_h
 
 #include <QMenuBar>
 #include <QHash>
@@ -323,4 +323,4 @@ namespace MenuOption {
 
 void sendFakeEnterEvent();
 
-#endif /* defined(__hifi__Menu__) */
+#endif // hifi_Menu_h

interface/src/MetavoxelSystem.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__MetavoxelSystem__
-#define __interface__MetavoxelSystem__
+#ifndef hifi_MetavoxelSystem_h
+#define hifi_MetavoxelSystem_h
 
 #include <QList>
 #include <QOpenGLBuffer>
@@ -201,4 +201,4 @@ private:
     Model* _model;
 };
 
-#endif /* defined(__interface__MetavoxelSystem__) */
+#endif // hifi_MetavoxelSystem_h

interface/src/ParticleTreeRenderer.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__ParticleTreeRenderer__
-#define __hifi__ParticleTreeRenderer__
+#ifndef hifi_ParticleTreeRenderer_h
+#define hifi_ParticleTreeRenderer_h
 
 #include <glm/glm.hpp>
 #include <stdint.h>
@@ -51,4 +51,4 @@ protected:
     QMap<QString, Model*> _particleModels;
 };
 
-#endif /* defined(__hifi__ParticleTreeRenderer__) */
+#endif // hifi_ParticleTreeRenderer_h

interface/src/Physics.h

@@ -15,4 +15,4 @@
 void applyStaticFriction(float deltaTime, glm::vec3& velocity, float maxVelocity, float strength);
 void applyDamping(float deltaTime, glm::vec3& velocity, float linearStrength, float squaredStrength);
 
-#endif
+#endif // hifi_Physics_h

interface/src/Stars.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__Stars__
-#define __interface__Stars__
+#ifndef hifi_Stars_h
+#define hifi_Stars_h
 
 #include <glm/glm.hpp>
 
@@ -52,5 +52,4 @@ private:
 };
 
 
-#endif
-
+#endif // hifi_Stars_h

interface/src/Util.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__Util__
-#define __interface__Util__
+#ifndef hifi_Util_h
+#define hifi_Util_h
 
 #ifdef _WIN32
 #include "Systime.h"
@@ -80,4 +80,4 @@ bool rayIntersectsSphere(const glm::vec3& rayStarting, const glm::vec3& rayNorma
 
 bool pointInSphere(glm::vec3& point, glm::vec3& sphereCenter, double sphereRadius);
 
-#endif
+#endif // hifi_Util_h

interface/src/XmppClient.h

@@ -11,8 +11,8 @@
 
 #ifdef HAVE_QXMPP
 
-#ifndef __interface__XmppClient__
-#define __interface__XmppClient__
+#ifndef hifi_XmppClient_h
+#define hifi_XmppClient_h
 
 #include <QObject>
 #include <QXmppClient.h>
@@ -47,4 +47,4 @@ private:
 
 #endif // __interface__XmppClient__
 
-#endif
+#endif // hifi_XmppClient_h

interface/src/avatar/Avatar.h

@@ -8,8 +8,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__avatar__
-#define __interface__avatar__
+#ifndef hifi_Avatar_h
+#define hifi_Avatar_h
 
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
@@ -202,4 +202,4 @@ private:
     float getBillboardSize() const;
 };
 
-#endif
+#endif // hifi_Avatar_h

interface/src/avatar/AvatarManager.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__AvatarManager__
-#define __hifi__AvatarManager__
+#ifndef hifi_AvatarManager_h
+#define hifi_AvatarManager_h
 
 #include <QtCore/QHash>
 #include <QtCore/QObject>
@@ -59,4 +59,4 @@ private:
     QSharedPointer<MyAvatar> _myAvatar;
 };
 
-#endif /* defined(__hifi__AvatarManager__) */
+#endif // hifi_AvatarManager_h

interface/src/avatar/FaceModel.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__FaceModel__
-#define __interface__FaceModel__
+#ifndef hifi_FaceModel_h
+#define hifi_FaceModel_h
 
 #include "renderer/Model.h"
 
@@ -36,4 +36,4 @@ private:
     Head* _owningHead;
 };
 
-#endif /* defined(__interface__FaceModel__) */
+#endif // hifi_FaceModel_h

interface/src/avatar/Hand.h

@@ -84,5 +84,4 @@ private:
     void playSlaps(PalmData& palm, Avatar* avatar);
 };
 
-#endif
-
+#endif // hifi_Hand_h

interface/src/avatar/Head.h

@@ -140,4 +140,4 @@ private:
     friend class FaceModel;
 };
 
-#endif
+#endif // hifi_Head_h

interface/src/avatar/MyAvatar.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__myavatar__
-#define __interface__myavatar__
+#ifndef hifi_MyAvatar_h
+#define hifi_MyAvatar_h
 
 #include <QSettings>
 
@@ -143,4 +143,4 @@ private:
     void maybeUpdateBillboard();
 };
 
-#endif
+#endif // hifi_MyAvatar_h

interface/src/avatar/SkeletonModel.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__SkeletonModel__
-#define __interface__SkeletonModel__
+#ifndef hifi_SkeletonModel_h
+#define hifi_SkeletonModel_h
 
 #include "renderer/Model.h"
 
@@ -50,4 +50,4 @@ private:
     Avatar* _owningAvatar;
 };
 
-#endif /* defined(__interface__SkeletonModel__) */
+#endif // hifi_SkeletonModel_h

interface/src/devices/Faceshift.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__Faceshift__
-#define __interface__Faceshift__
+#ifndef hifi_Faceshift_h
+#define hifi_Faceshift_h
 
 #include <QTcpSocket>
 #include <QUdpSocket>
@@ -141,4 +141,4 @@ private:
     float _estimatedEyeYaw;
 };
 
-#endif /* defined(__interface__Faceshift__) */
+#endif // hifi_Faceshift_h

interface/src/devices/OculusManager.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__OculusManager__
-#define __hifi__OculusManager__
+#ifndef hifi_OculusManager_h
+#define hifi_OculusManager_h
 
 #include <iostream>
 
@@ -62,4 +62,4 @@ private:
 #endif
 };
 
-#endif /* defined(__hifi__OculusManager__) */
+#endif // hifi_OculusManager_h

interface/src/devices/SixenseManager.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__SixenseManager__
-#define __interface__SixenseManager__
+#ifndef hifi_SixenseManager_h
+#define hifi_SixenseManager_h
 
 #include <QObject>
 
@@ -66,5 +66,4 @@ private:
     quint64 _lastMovement;
 };
 
-#endif /* defined(__interface__SixenseManager__) */
-
+#endif // hifi_SixenseManager_h

interface/src/devices/TV3DManager.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__TV3DManager__
-#define __hifi__TV3DManager__
+#ifndef hifi_TV3DManager_h
+#define hifi_TV3DManager_h
 
 #include <iostream>
 
@@ -41,4 +41,4 @@ private:
     static eyeFrustum _rightEye;
 };
 
-#endif /* defined(__hifi__TV3DManager__) */
+#endif // hifi_TV3DManager_h

interface/src/devices/Visage.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__Visage__
-#define __interface__Visage__
+#ifndef hifi_Visage_h
+#define hifi_Visage_h
 
 #include <QMultiHash>
 #include <QPair>
@@ -75,4 +75,4 @@ private:
     QVector<float> _blendshapeCoefficients;
 };
 
-#endif /* defined(__interface__Visage__) */
+#endif // hifi_Visage_h

interface/src/location/LocationManager.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__LocationManager__
-#define __hifi__LocationManager__
+#ifndef hifi_LocationManager_h
+#define hifi_LocationManager_h
 
 #include <QtCore>
 
@@ -58,4 +58,4 @@ private slots:
 
 };
 
-#endif /* defined(__hifi__LocationManager__) */
+#endif // hifi_LocationManager_h

interface/src/location/NamedLocation.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__NamedLocation__
-#define __hifi__NamedLocation__
+#ifndef hifi_NamedLocation_h
+#define hifi_NamedLocation_h
 
 #include <glm/glm.hpp>
 #include <glm/gtx/string_cast.hpp>
@@ -58,4 +58,4 @@ private:
 
 };
 
-#endif /* defined(__hifi__NamedLocation__) */
+#endif // hifi_NamedLocation_h

interface/src/renderer/AmbientOcclusionEffect.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__AmbientOcclusionEffect__
-#define __interface__AmbientOcclusionEffect__
+#ifndef hifi_AmbientOcclusionEffect_h
+#define hifi_AmbientOcclusionEffect_h
 
 class ProgramObject;
 
@@ -40,4 +40,4 @@ private:
     GLuint _rotationTextureID;
 };
 
-#endif /* defined(__interface__AmbientOcclusionEffect__) */
+#endif // hifi_AmbientOcclusionEffect_h

interface/src/renderer/FBXReader.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__FBXReader__
-#define __interface__FBXReader__
+#ifndef hifi_FBXReader_h
+#define hifi_FBXReader_h
 
 #include <QMetaType>
 #include <QUrl>
@@ -203,4 +203,4 @@ FBXGeometry readFBX(const QByteArray& model, const QVariantHash& mapping);
 /// Reads SVO geometry from the supplied model data.
 FBXGeometry readSVO(const QByteArray& model);
 
-#endif /* defined(__interface__FBXReader__) */
+#endif // hifi_FBXReader_h

interface/src/renderer/GeometryCache.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__GeometryCache__
-#define __interface__GeometryCache__
+#ifndef hifi_GeometryCache_h
+#define hifi_GeometryCache_h
 
 // include this before QOpenGLBuffer, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"
@@ -140,4 +140,4 @@ public:
     int getTranslucentPartCount() const;
 };
 
-#endif /* defined(__interface__GeometryCache__) */
+#endif // hifi_GeometryCache_h

interface/src/renderer/GlowEffect.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__GlowEffect__
-#define __interface__GlowEffect__
+#ifndef hifi_GlowEffect_h
+#define hifi_GlowEffect_h
 
 #include <QObject>
 #include <QStack>
@@ -83,4 +83,4 @@ public:
     ~Glower();
 };
 
-#endif /* defined(__interface__GlowEffect__) */
+#endif // hifi_GlowEffect_h

interface/src/renderer/Model.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__Model__
-#define __interface__Model__
+#ifndef hifi_Model_h
+#define hifi_Model_h
 
 #include <QObject>
 #include <QUrl>
@@ -309,4 +309,4 @@ Q_DECLARE_METATYPE(QPointer<Model>)
 Q_DECLARE_METATYPE(QWeakPointer<NetworkGeometry>)
 Q_DECLARE_METATYPE(QVector<glm::vec3>)
 
-#endif /* defined(__interface__Model__) */
+#endif // hifi_Model_h

interface/src/renderer/PointShader.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__PointShader__
-#define __interface__PointShader__
+#ifndef hifi_PointShader_h
+#define hifi_PointShader_h
 
 #include <QObject>
 
@@ -45,4 +45,4 @@ private:
     ProgramObject* _program;
 };
 
-#endif /* defined(__interface__PointShader__) */
+#endif // hifi_PointShader_h

interface/src/renderer/ProgramObject.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__ProgramObject__
-#define __interface__ProgramObject__
+#ifndef hifi_ProgramObject_h
+#define hifi_ProgramObject_h
 
 #include <QGLShaderProgram>
 
@@ -25,4 +25,4 @@ public:
     void setUniform(const char* name, const glm::vec3& value);
 };
 
-#endif /* defined(__interface__ProgramObject__) */
+#endif // hifi_ProgramObject_h

interface/src/renderer/RenderUtil.h

@@ -9,10 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__RenderUtil__
-#define __interface__RenderUtil__
+#ifndef hifi_RenderUtil_h
+#define hifi_RenderUtil_h
 
 /// Renders a quad from (-1, -1, 0) to (1, 1, 0) with texture coordinates from (sMin, 0) to (sMax, 1).
 void renderFullscreenQuad(float sMin = 0.0f, float sMax = 1.0f);
 
-#endif /* defined(__interface__RenderUtil__) */
+#endif // hifi_RenderUtil_h

interface/src/renderer/TextureCache.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__TextureCache__
-#define __interface__TextureCache__
+#ifndef hifi_TextureCache_h
+#define hifi_TextureCache_h
 
 #include <QImage>
 #include <QMap>
@@ -158,4 +158,4 @@ private:
     QMap<float, QWeakPointer<Texture> > _dilatedTextures;    
 };
 
-#endif /* defined(__interface__TextureCache__) */
+#endif // hifi_TextureCache_h

interface/src/renderer/VoxelShader.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__VoxelShader__
-#define __interface__VoxelShader__
+#ifndef hifi_VoxelShader_h
+#define hifi_VoxelShader_h
 
 #include <QObject>
 
@@ -46,4 +46,4 @@ private:
     ProgramObject* _program;
 };
 
-#endif /* defined(__interface__VoxelShader__) */
+#endif // hifi_VoxelShader_h

interface/src/scripting/AudioDeviceScriptingInterface.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__AudioDeviceScriptingInterface__
-#define __hifi__AudioDeviceScriptingInterface__
+#ifndef hifi_AudioDeviceScriptingInterface_h
+#define hifi_AudioDeviceScriptingInterface_h
 
 #include <QDebug>
 #include <QObject>
@@ -41,4 +41,4 @@ public slots:
     void setInputVolume(float volume);
 };
 
-#endif /* defined(__hifi__AudioDeviceScriptingInterface__) */
+#endif // hifi_AudioDeviceScriptingInterface_h

interface/src/scripting/ClipboardScriptingInterface.h

@@ -8,8 +8,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__Clipboard__
-#define __interface__Clipboard__
+#ifndef hifi_ClipboardScriptingInterface_h
+#define hifi_ClipboardScriptingInterface_h
 
 #include <QObject>
 #include <VoxelDetail.h>
@@ -44,4 +44,4 @@ public slots:
     void nudgeVoxel(float x, float y, float z, float s, const glm::vec3& nudgeVec);
 };
 
-#endif // __interface__Clipboard__
+#endif // hifi_ClipboardScriptingInterface_h

interface/src/scripting/ControllerScriptingInterface.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__ControllerScriptingInterface__
-#define __hifi__ControllerScriptingInterface__
+#ifndef hifi_ControllerScriptingInterface_h
+#define hifi_ControllerScriptingInterface_h
 
 #include <QtCore/QObject>
 
@@ -98,4 +98,4 @@ const int NUMBER_OF_BUTTONS_PER_PALM = 6;
 const int PALM_SPATIALCONTROL = 0;
 const int TIP_SPATIALCONTROL = 1;
 
-#endif /* defined(__hifi__ControllerScriptingInterface__) */
+#endif // hifi_ControllerScriptingInterface_h

interface/src/scripting/MenuScriptingInterface.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__MenuScriptingInterface__
-#define __hifi__MenuScriptingInterface__
+#ifndef hifi_MenuScriptingInterface_h
+#define hifi_MenuScriptingInterface_h
 
 #include <QDebug>
 #include <QMutex>
@@ -50,4 +50,4 @@ signals:
     void menuItemEvent(const QString& menuItem);
 };
 
-#endif /* defined(__hifi__MenuScriptingInterface__) */
+#endif // hifi_MenuScriptingInterface_h

interface/src/scripting/SettingsScriptingInterface.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__SettingsScriptingInterface__
-#define __hifi__SettingsScriptingInterface__
+#ifndef hifi_SettingsScriptingInterface_h
+#define hifi_SettingsScriptingInterface_h
 
 #include <QDebug>
 #include <QObject>
@@ -30,4 +30,4 @@ public slots:
     void setValue(const QString& setting, const QVariant& value);
 };
 
-#endif /* defined(__hifi__SettingsScriptingInterface__) */
+#endif // hifi_SettingsScriptingInterface_h

interface/src/starfield/Config.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__starfield__Config__
-#define __interface__starfield__Config__
+#ifndef hifi_Config_h
+#define hifi_Config_h
 
 #include "InterfaceConfig.h"
 #include "renderer/ProgramObject.h"
@@ -58,4 +58,4 @@ namespace starfield {
 
 }
 
-#endif
+#endif // hifi_Config_h

interface/src/starfield/Controller.h

@@ -10,8 +10,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__starfield__Controller__
-#define __interface__starfield__Controller__
+#ifndef hifi_Controller_h
+#define hifi_Controller_h
 
 #include <time.h>
 
@@ -41,4 +41,4 @@ namespace starfield {
         Renderer* _renderer;
     };
 }
-#endif
+#endif // hifi_Controller_h

interface/src/starfield/Generator.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__starfield__Generator__
-#define __interface__starfield__Generator__
+#ifndef hifi_Generator_h
+#define hifi_Generator_h
 
 #include <locale.h>
 #include <time.h>
@@ -37,4 +37,4 @@ namespace starfield {
     };
     
 }
-#endif
+#endif // hifi_Generator_h

interface/src/starfield/data/GpuVertex.h

@@ -10,8 +10,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__starfield__data__GpuVertex__
-#define __interface__starfield__data__GpuVertex__
+#ifndef hifi_GpuVertex_h
+#define hifi_GpuVertex_h
 
 #include "starfield/data/InputVertex.h"
 
@@ -34,5 +34,4 @@ namespace starfield {
 
 }
 
-#endif
-
+#endif // hifi_GpuVertex_h

interface/src/starfield/data/InputVertex.h

@@ -10,8 +10,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__starfield__data__InputVertex__
-#define __interface__starfield__data__InputVertex__
+#ifndef hifi_InputVertex_h
+#define hifi_InputVertex_h
 
 #include "starfield/Config.h"
 
@@ -36,5 +36,4 @@ namespace starfield {
 
 }
 
-#endif
-
+#endif // hifi_InputVertex_h

interface/src/starfield/data/Tile.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__starfield__data__Tile__
-#define __interface__starfield__data__Tile__
+#ifndef hifi_Tile_h
+#define hifi_Tile_h
 
 #include "starfield/Config.h"
 
@@ -29,5 +29,4 @@ namespace starfield {
     
 }
 
-#endif
-
+#endif // hifi_Tile_h

interface/src/starfield/renderer/Renderer.h

@@ -10,8 +10,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__starfield__renderer__Renderer__
-#define __interface__starfield__renderer__Renderer__
+#ifndef hifi_Renderer_h
+#define hifi_Renderer_h
 
 #include "starfield/Config.h"
 #include "starfield/data/InputVertex.h"
@@ -139,4 +139,4 @@ namespace starfield {
 
 }
 
-#endif
+#endif // hifi_Renderer_h

interface/src/starfield/renderer/Tiling.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__starfield__renderer__Tiling__
-#define __interface__starfield__renderer__Tiling__
+#ifndef hifi_Tiling_h
+#define hifi_Tiling_h
 
 #include "starfield/Config.h"
 
@@ -45,5 +45,4 @@ namespace starfield {
     };
 }
 
-#endif
-
+#endif // hifi_Tiling_h

interface/src/starfield/renderer/VertexOrder.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__starfield__renderer__VertexOrder__
-#define __interface__starfield__renderer__VertexOrder__
+#ifndef hifi_VertexOrder_h
+#define hifi_VertexOrder_h
 
 #include "starfield/Config.h"
 #include "starfield/data/InputVertex.h"
@@ -38,5 +38,4 @@ namespace starfield {
 
 } // anonymous namespace
 
-#endif
-
+#endif // hifi_VertexOrder_h

interface/src/ui/BandwidthDialog.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__BandwidthDialog__
-#define __hifi__BandwidthDialog__
+#ifndef hifi_BandwidthDialog_h
+#define hifi_BandwidthDialog_h
 
 #include <QDialog>
 #include <QLabel>
@@ -46,5 +46,4 @@ private:
     QLabel*         _labels[BandwidthMeter::N_STREAMS];
 };
 
-#endif /* defined(__interface__BandwidthDialog__) */
-
+#endif // hifi_BandwidthDialog_h

interface/src/ui/BandwidthMeter.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__BandwidthMeter__
-#define __interface__BandwidthMeter__
+#ifndef hifi_BandwidthMeter_h
+#define hifi_BandwidthMeter_h
 
 #ifdef _WIN32
 #define WANT_TIMEVAL
@@ -87,5 +87,4 @@ private:
     int _scaleMaxIndex;
 };
 
-#endif /* defined(__interface__BandwidthMeter__) */
-
+#endif // hifi_BandwidthMeter_h

interface/src/ui/ChatWindow.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__ChatWindow__
-#define __interface__ChatWindow__
+#ifndef hifi_ChatWindow_h
+#define hifi_ChatWindow_h
 
 #include <QDateTime>
 #include <QDockWidget>
@@ -63,4 +63,4 @@ private slots:
 #endif
 };
 
-#endif /* defined(__interface__ChatWindow__) */
+#endif // hifi_ChatWindow_h

interface/src/ui/ImportDialog.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__ImportDialog__
-#define __hifi__ImportDialog__
+#ifndef hifi_ImportDialog_h
+#define hifi_ImportDialog_h
 
 #include "InterfaceConfig.h"
 
@@ -70,4 +70,4 @@ private:
     void setImportTypes();
 };
 
-#endif /* defined(__hifi__ImportDialog__) */
+#endif // hifi_ImportDialog_h

interface/src/ui/InfoView.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__InfoView__
-#define __hifi__InfoView__
+#ifndef hifi_InfoView_h
+#define hifi_InfoView_h
 
 #include <QtWebKitWidgets/QWebView>
 
@@ -29,4 +29,4 @@ private slots:
     void loaded(bool ok);
 };
 
-#endif /* defined(__hifi__InfoView__) */
+#endif // hifi_InfoView_h

interface/src/ui/LodToolsDialog.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__LodToolsDialog__
-#define __hifi__LodToolsDialog__
+#ifndef hifi_LodToolsDialog_h
+#define hifi_LodToolsDialog_h
 
 #include <QDialog>
 #include <QLabel>
@@ -44,5 +44,4 @@ private:
     QLabel* _feedback;
 };
 
-#endif /* defined(__interface__LodToolsDialog__) */
-
+#endif // hifi_LodToolsDialog_h

interface/src/ui/LogDialog.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__LogDialog__
-#define __interface__LogDialog__
+#ifndef hifi_LogDialog_h
+#define hifi_LogDialog_h
 
 #include "InterfaceConfig.h"
 
@@ -74,5 +74,4 @@ private:
     void showLogData();
 };
 
-#endif
-
+#endif // hifi_LogDialog_h

interface/src/ui/MetavoxelEditor.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__MetavoxelEditor__
-#define __interface__MetavoxelEditor__
+#ifndef hifi_MetavoxelEditor_h
+#define hifi_MetavoxelEditor_h
 
 #include <QList>
 #include <QWidget>
@@ -223,4 +223,4 @@ protected:
     virtual void applyEdit(const AttributePointer& attribute, const SharedObjectPointer& spanner);
 };
 
-#endif /* defined(__interface__MetavoxelEditor__) */
+#endif // hifi_MetavoxelEditor_h

interface/src/ui/ModelsBrowser.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__ModelsBrowser__
-#define __hifi__ModelsBrowser__
+#ifndef hifi_ModelsBrowser_h
+#define hifi_ModelsBrowser_h
 
 #include <QReadWriteLock>
 #include <QStandardItemModel>
@@ -78,4 +78,4 @@ private:
     QTreeView _view;
 };
 
-#endif /* defined(__hifi__ModelBrowser__) */
+#endif // hifi_ModelsBrowser_h

interface/src/ui/OctreeStatsDialog.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__OctreeStatsDialog__
-#define __hifi__OctreeStatsDialog__
+#ifndef hifi_OctreeStatsDialog_h
+#define hifi_OctreeStatsDialog_h
 
 #include <QDialog>
 #include <QFormLayout>
@@ -69,5 +69,4 @@ private:
     details _extraServerDetails[MAX_VOXEL_SERVERS];
 };
 
-#endif /* defined(__interface__OctreeStatsDialog__) */
-
+#endif // hifi_OctreeStatsDialog_h

interface/src/ui/Oscilloscope.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__Oscilloscope__
-#define __interface__Oscilloscope__
+#ifndef hifi_Oscilloscope_h
+#define hifi_Oscilloscope_h
 
 #include <cassert>
 
@@ -81,4 +81,4 @@ private:
     unsigned        _colors[MAX_CHANNELS];
 };
 
-#endif /* defined(__interface__oscilloscope__) */
+#endif // hifi_Oscilloscope_h

interface/src/ui/RearMirrorTools.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__RearMirrorTools__
-#define __hifi__RearMirrorTools__
+#ifndef hifi_RearMirrorTools_h
+#define hifi_RearMirrorTools_h
 
 #include "InterfaceConfig.h"
 
@@ -58,4 +58,4 @@ private:
     void displayIcon(QRect bounds, QRect iconBounds, GLuint textureId, bool selected = false);
 };
 
-#endif /* defined(__hifi__RearMirrorTools__) */
+#endif // hifi_RearMirrorTools_h

interface/src/ui/RunningScriptsWidget.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__RunningScriptsWidget__
-#define __hifi__RunningScriptsWidget__
+#ifndef hifi_RunningScriptsWidget_h
+#define hifi_RunningScriptsWidget_h
 
 // Qt
 #include <QDockWidget>
@@ -47,4 +47,4 @@ private:
     void createRecentlyLoadedScriptsTable();
 };
 
-#endif /* defined(__hifi__RunningScriptsWidget__) */
+#endif // hifi_RunningScriptsWidget_h

interface/src/ui/Snapshot.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__Snapshot__
-#define __hifi__Snapshot__
+#ifndef hifi_Snapshot_h
+#define hifi_Snapshot_h
 
 #include "InterfaceConfig.h"
 
@@ -45,4 +45,4 @@ public:
     static SnapshotMetaData* parseSnapshotData(QString snapshotPath);
 };
 
-#endif /* defined(__hifi__Snapshot__) */
+#endif // hifi_Snapshot_h

interface/src/ui/Stats.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef _hifi_Stats_h
-#define _hifi_Stats_h
+#ifndef hifi_Stats_h
+#define hifi_Stats_h
 
 #include <QObject>
 
@@ -46,4 +46,4 @@ private:
     int _lastHorizontalOffset;
 };
 
-#endif
+#endif // hifi_Stats_h

interface/src/ui/TextRenderer.h

@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__TextRenderer__
-#define __interface__TextRenderer__
+#ifndef hifi_TextRenderer_h
+#define hifi_TextRenderer_h
 
 #include <QFont>
 #include <QFontMetrics>
@@ -114,4 +114,4 @@ private:
     int _width;
 };
 
-#endif /* defined(__interface__TextRenderer__) */
+#endif // hifi_TextRenderer_h

interface/src/ui/UpdateDialog.h

@@ -8,8 +8,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __hifi__UpdateDialog__
-#define __hifi__UpdateDialog__
+#ifndef hifi_UpdateDialog_h
+#define hifi_UpdateDialog_h
 
 #include <QWidget>
 
@@ -28,4 +28,4 @@ private slots:
     void handleSkip();
 };
 
-#endif /* defined(__hifi__UpdateDialog__) */
+#endif // hifi_UpdateDialog_h

interface/src/ui/overlays/Base3DOverlay.h

@@ -8,8 +8,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__Base3DOverlay__
-#define __interface__Base3DOverlay__
+#ifndef hifi_Base3DOverlay_h
+#define hifi_Base3DOverlay_h
 
 #include "Overlay.h"
 
@@ -36,4 +36,4 @@ protected:
 };
 
  
-#endif /* defined(__interface__Base3DOverlay__) */
+#endif // hifi_Base3DOverlay_h

interface/src/ui/overlays/Cube3DOverlay.h

@@ -8,8 +8,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__Cube3DOverlay__
-#define __interface__Cube3DOverlay__
+#ifndef hifi_Cube3DOverlay_h
+#define hifi_Cube3DOverlay_h
 
 #include "Volume3DOverlay.h"
 
@@ -23,4 +23,4 @@ public:
 };
 
  
-#endif /* defined(__interface__Cube3DOverlay__) */
+#endif // hifi_Cube3DOverlay_h

interface/src/ui/overlays/ImageOverlay.h

@@ -8,8 +8,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__ImageOverlay__
-#define __interface__ImageOverlay__
+#ifndef hifi_ImageOverlay_h
+#define hifi_ImageOverlay_h
 
 // include this before QGLWidget, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"
@@ -62,4 +62,4 @@ private:
 };
 
  
-#endif /* defined(__interface__ImageOverlay__) */
+#endif // hifi_ImageOverlay_h

interface/src/ui/overlays/Line3DOverlay.h

@@ -8,8 +8,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef __interface__Line3DOverlay__
-#define __interface__Line3DOverlay__
+#ifndef hifi_Line3DOverlay_h
+#define hifi_Line3DOverlay_h
 
 #include "Base3DOverlay.h"
 
@@ -34,4 +34,4 @@ protected:
 };
 
  
-#endif /* defined(__interface__Line3DOverlay__) */
+#endif // hifi_Line3DOverlay_h