diff --git a/apps/DataConverter/conversiontask.h b/apps/DataConverter/conversiontask.h
index 5e9d4b6ce2..218336c509 100644
--- a/apps/DataConverter/conversiontask.h
+++ b/apps/DataConverter/conversiontask.h
@@ -1,3 +1,4 @@
+
 #ifndef __CONVERSIONTASK_H__
 #define __CONVERSIONTASK_H__
 
diff --git a/apps/DataConverter/milkywayconversiontask.h b/apps/DataConverter/milkywayconversiontask.h
index 30cf16e824..7d0db7105e 100644
--- a/apps/DataConverter/milkywayconversiontask.h
+++ b/apps/DataConverter/milkywayconversiontask.h
@@ -1,3 +1,4 @@
+
 #ifndef __MILKYWAYCONVERSIONTASK_H__
 #define __MILKYWAYCONVERSIONTASK_H__
 
diff --git a/apps/DataConverter/milkywaypointsconversiontask.h b/apps/DataConverter/milkywaypointsconversiontask.h
index 795425646f..e142282374 100644
--- a/apps/DataConverter/milkywaypointsconversiontask.h
+++ b/apps/DataConverter/milkywaypointsconversiontask.h
@@ -1,3 +1,4 @@
+
 #ifndef __MILKYWAYPOINTSCONVERSIONTASK_H__
 #define __MILKYWAYPOINTSCONVERSIONTASK_H__
 
diff --git a/apps/Launcher/infowidget.h b/apps/Launcher/infowidget.h
index 967e22de43..9bbc17e1a6 100644
--- a/apps/Launcher/infowidget.h
+++ b/apps/Launcher/infowidget.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __INFOWIDGET_H__
-#define __INFOWIDGET_H__
+#ifndef __OPENSPACE_APP_LAUNCHER___INFOWIDGET___H__
+#define __OPENSPACE_APP_LAUNCHER___INFOWIDGET___H__
 
 //#include <QWidget>
 #include <QGroupBox>
@@ -58,4 +58,4 @@ private:
     int _totalBytes;
 };
 
-#endif // __INFOWIDGET_H__
+#endif // __OPENSPACE_APP_LAUNCHER___INFOWIDGET___H__
diff --git a/apps/Launcher/mainwindow.h b/apps/Launcher/mainwindow.h
index 60fd0f1aa2..9fd2626d4d 100644
--- a/apps/Launcher/mainwindow.h
+++ b/apps/Launcher/mainwindow.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __MAINWINDOW_H__
-#define __MAINWINDOW_H__
+#ifndef __OPENSPACE_APP_LAUNCHER___MAINWINDOW___H__
+#define __OPENSPACE_APP_LAUNCHER___MAINWINDOW___H__
 
 #include <QWidget>
 
@@ -112,4 +112,4 @@ private:
 //    bool _hasLabelTimeline = false;
 //};
 
-#endif // __MAINWINDOW_H__
+#endif // __OPENSPACE_APP_LAUNCHER___MAINWINDOW___H__
diff --git a/apps/Launcher/shortcutwidget.h b/apps/Launcher/shortcutwidget.h
index ad4ff319b0..82d96fa118 100644
--- a/apps/Launcher/shortcutwidget.h
+++ b/apps/Launcher/shortcutwidget.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __SHORTCUTWIDGET_H__
-#define __SHORTCUTWIDGET_H__
+#ifndef __OPENSPACE_APP_LAUNCHER___SHORTCUTWIDGET___H__
+#define __OPENSPACE_APP_LAUNCHER___SHORTCUTWIDGET___H__
 
 #include <QWidget>
 
@@ -33,4 +33,4 @@ public:
     ShortcutWidget(QWidget* parent, Qt::WindowFlags f = 0);
 };
 
-#endif // __SHORTCUTWIDGET_H__
+#endif // __OPENSPACE_APP_LAUNCHER___SHORTCUTWIDGET___H__
diff --git a/apps/Launcher/syncwidget.h b/apps/Launcher/syncwidget.h
index 8f2c203c13..f9a77e2861 100644
--- a/apps/Launcher/syncwidget.h
+++ b/apps/Launcher/syncwidget.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __SYNCWIDGET_H__
-#define __SYNCWIDGET_H__
+#ifndef __OPENSPACE_APP_LAUNCHER___SYNCWIDGET___H__
+#define __OPENSPACE_APP_LAUNCHER___SYNCWIDGET___H__
 
 #include <QWidget>
 
@@ -121,4 +121,4 @@ private:
 
 };
 
-#endif // __SYNCWIDGET_H__
+#endif // __OPENSPACE_APP_LAUNCHER___SYNCWIDGET___H__
diff --git a/apps/TimelineView/configurationwidget.h b/apps/TimelineView/configurationwidget.h
index 1f7ff034c2..2d0c9e44d8 100644
--- a/apps/TimelineView/configurationwidget.h
+++ b/apps/TimelineView/configurationwidget.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __CONFIGURATIONWIDGET_H__
-#define __CONFIGURATIONWIDGET_H__
+#ifndef __OPENSPACE_APP_TIMELINEVIEW___CONFIGURATIONWIDGET___H__
+#define __OPENSPACE_APP_TIMELINEVIEW___CONFIGURATIONWIDGET___H__
 
 #include <QWidget>
 #include <QLineEdit>
@@ -50,4 +50,4 @@ private:
     QPushButton* _connect;
 };
 
-#endif // __CONFIGURATIONWIDGET_H__
+#endif // __OPENSPACE_APP_TIMELINEVIEW___CONFIGURATIONWIDGET___H__
diff --git a/apps/TimelineView/controlwidget.h b/apps/TimelineView/controlwidget.h
index 5c6e99e5df..d7d946cc50 100644
--- a/apps/TimelineView/controlwidget.h
+++ b/apps/TimelineView/controlwidget.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __CONTROLWIDGET_H__
-#define __CONTROLWIDGET_H__
+#ifndef __OPENSPACE_APP_TIMELINEVIEW___CONTROLWIDGET___H__
+#define __OPENSPACE_APP_TIMELINEVIEW___CONTROLWIDGET___H__
 
 #include <QWidget>
 
@@ -66,4 +66,4 @@ private:
     QPushButton* _setFocusToNewHorizons;
 };
 
-#endif // __CONTROLWIDGET_H__
+#endif // __OPENSPACE_APP_TIMELINEVIEW___CONTROLWIDGET___H__
diff --git a/apps/TimelineView/informationwidget.h b/apps/TimelineView/informationwidget.h
index 811151a415..09929dcabd 100644
--- a/apps/TimelineView/informationwidget.h
+++ b/apps/TimelineView/informationwidget.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __INFORMATIONWIDGET_H__
-#define __INFORMATIONWIDGET_H__
+#ifndef __OPENSPACE_APP_TIMELINEVIEW___INFORMATIONWIDGET___H__
+#define __OPENSPACE_APP_TIMELINEVIEW___INFORMATIONWIDGET___H__
 
 #include <QTextEdit>
 
@@ -38,4 +38,4 @@ public slots:
     void logInformation(QString text);
 };
 
-#endif // __INFORMATIONWIDGET_H__
+#endif // __OPENSPACE_APP_TIMELINEVIEW___INFORMATIONWIDGET___H__
diff --git a/apps/TimelineView/mainwindow.h b/apps/TimelineView/mainwindow.h
index 9c23cf8448..5a74e197f2 100644
--- a/apps/TimelineView/mainwindow.h
+++ b/apps/TimelineView/mainwindow.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __MAINWINDOW_H__
-#define __MAINWINDOW_H__
+#ifndef __OPENSPACE_APP_TIMELINEVIEW___MAINWINDOW___H__
+#define __OPENSPACE_APP_TIMELINEVIEW___MAINWINDOW___H__
 
 #include <QWidget>
 #include <QTcpSocket>
@@ -71,4 +71,4 @@ private:
     bool _isConnected = false;
 };
 
-#endif // __MAINWINDOW_H__
+#endif // __OPENSPACE_APP_TIMELINEVIEW___MAINWINDOW___H__
diff --git a/apps/TimelineView/timelinewidget.h b/apps/TimelineView/timelinewidget.h
index be3a880d00..38294ccac0 100644
--- a/apps/TimelineView/timelinewidget.h
+++ b/apps/TimelineView/timelinewidget.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __TIMELINEWIDGET_H__
-#define __TIMELINEWIDGET_H__
+#ifndef __OPENSPACE_APP_TIMELINEVIEW___TIMELINEWIDGET___H__
+#define __OPENSPACE_APP_TIMELINEVIEW___TIMELINEWIDGET___H__
 
 #include <QWidget>
 
@@ -67,4 +67,4 @@ private:
     } _currentTime;
 };
 
-#endif // __TIMELINEWIDGET_H__
+#endif // __OPENSPACE_APP_TIMELINEVIEW___TIMELINEWIDGET___H__