12 files changed, 49 insertions, 19 deletions
diff --git a/macx/overlay/avail.h b/macx/overlay/avail.h
index 6406f0db1..cce844c43 100644
--- a/macx/overlay/avail.h
+++ b/macx/overlay/avail.h
@@ -1,3 +1,6 @@
+#ifndef AVAIL_H_
+#define AVAIL_H_
+
 #define AVAIL_ALL_GLSYM ( \
 	AVAIL(glTexImage2D) && \
 	AVAIL(glCreateShader) && \
@@ -48,3 +51,5 @@
 	AVAIL(glTexParameteri) && \
 	AVAIL(glLoadIdentity) && \
 	1)
+
+#endif
diff --git a/overlay/ods.h b/overlay/ods.h
index 7d9a4d0b7..f091d5fd1 100644
--- a/overlay/ods.h
+++ b/overlay/ods.h
@@ -28,12 +28,12 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef ODS_H
-#define ODS_H
+#ifndef ODS_H_
+#define ODS_H_
 
 #include <stdarg.h>
 
 void __cdecl _ods_out(const char *format, va_list *args);
 void __cdecl fods(const char *format, ...);
 
-#endif // ODS_H
+#endif
diff --git a/plugins/manual/manual.h b/plugins/manual/manual.h
index 611abf46d..62b1ced73 100644
--- a/plugins/manual/manual.h
+++ b/plugins/manual/manual.h
@@ -1,5 +1,5 @@
-#ifndef MANUAL_H
-#define MANUAL_H
+#ifndef MANUAL_H_
+#define MANUAL_H_
 
 #include <QDialog>
 #include <QGraphicsItem>
@@ -34,4 +34,4 @@ class Manual : public QDialog, public Ui::Manual {
 		void updateTopAndFront(int orientation, int azimut);
 };
 
-#endif // MANUAL_H
+#endif
diff --git a/scripts/mklic.pl b/scripts/mklic.pl
index cbd07d2ee..ae7170c04 100755
--- a/scripts/mklic.pl
+++ b/scripts/mklic.pl
@@ -41,6 +41,9 @@ print $F "/*\n";
 print $F " * This file was auto-generated by scripts/mklic.pl\n";
 print $F " * DO NOT EDIT IT MANUALLY\n";
 print $F " */\n";
+print $F "#ifndef LICENSES_H_\n";
+print $F "#define LICENSES_H_\n";
+print $F "\n";
 print $F "#include <QtGlobal>\n\n";
 
 print $F licenseFileToVar("licenseMumble", "../LICENSE");
@@ -89,6 +92,8 @@ foreach (@thirdPartyLicenses) {
 }
 
 print $F "\t0\n";
-print $F "};\n\n\n";
+print $F "};\n";
+print $F "\n";
+print $F "#endif\n";
 
 close($F);
diff --git a/src/bonjour/BonjourRecord.h b/src/bonjour/BonjourRecord.h
index 6c5a21c9f..5d1495e9e 100644
--- a/src/bonjour/BonjourRecord.h
+++ b/src/bonjour/BonjourRecord.h
@@ -26,8 +26,8 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef BONJOUR_RECORD_H
-#define BONJOUR_RECORD_H
+#ifndef BONJOUR_RECORD_H_
+#define BONJOUR_RECORD_H_
 
 #include <QtCore/QMetaType>
 #include <QtCore/QString>
@@ -54,4 +54,4 @@ class BonjourRecord {
 
 Q_DECLARE_METATYPE(BonjourRecord)
 
-#endif // BONJOUR_RECORD_H
+#endif
diff --git a/src/bonjour/BonjourServiceBrowser.h b/src/bonjour/BonjourServiceBrowser.h
index 27570c826..2371a5431 100644
--- a/src/bonjour/BonjourServiceBrowser.h
+++ b/src/bonjour/BonjourServiceBrowser.h
@@ -27,8 +27,8 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef BONJOURSERVICEBROWSER_H
-#define BONJOURSERVICEBROWSER_H
+#ifndef BONJOURSERVICEBROWSER_H_
+#define BONJOURSERVICEBROWSER_H_
 
 #include <dns_sd.h>
 
@@ -66,4 +66,4 @@ class BonjourServiceBrowser : public QObject {
 		QString browsingType;
 };
 
-#endif // BONJOURSERVICEBROWSER_H
+#endif
diff --git a/src/bonjour/BonjourServiceRegister.h b/src/bonjour/BonjourServiceRegister.h
index f80bcc3ef..b96a8e46c 100644
--- a/src/bonjour/BonjourServiceRegister.h
+++ b/src/bonjour/BonjourServiceRegister.h
@@ -27,8 +27,8 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef BONJOUR_SERVICE_REGISTER_H
-#define BONJOUR_SERVICE_REGISTER_H
+#ifndef BONJOUR_SERVICE_REGISTER_H_
+#define BONJOUR_SERVICE_REGISTER_H_
 
 // Bonjour flags
 #include <dns_sd.h>
@@ -66,4 +66,4 @@ class BonjourServiceRegister : public QObject {
 		BonjourRecord finalRecord;
 };
 
-#endif // BONJOUR_SERVICE_REGISTER_H
+#endif
diff --git a/src/bonjour/BonjourServiceResolver.h b/src/bonjour/BonjourServiceResolver.h
index 2694cbae3..368961cbf 100644
--- a/src/bonjour/BonjourServiceResolver.h
+++ b/src/bonjour/BonjourServiceResolver.h
@@ -28,8 +28,8 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef BONJOURSERVICERESOLVER_H
-#define BONJOURSERVICERESOLVER_H
+#ifndef BONJOURSERVICERESOLVER_H_
+#define BONJOURSERVICERESOLVER_H_
 
 #include <QtCore/QMap>
 #include <QtCore/QObject>
@@ -71,4 +71,4 @@ class BonjourServiceResolver : public QObject {
 		        quint16 txtLen, const char *txtRecord, void *context);
 };
 
-#endif // BONJOURSERVICERESOLVER_H
+#endif
diff --git a/src/mumble/GlobalShortcut_macx.h b/src/mumble/GlobalShortcut_macx.h
index 98e4d3acb..60ccdb82e 100644
--- a/src/mumble/GlobalShortcut_macx.h
+++ b/src/mumble/GlobalShortcut_macx.h
@@ -29,6 +29,9 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#ifndef GLOBALSHORTCUT_MACX_H_
+#define GLOBALSHORTCUT_MACX_H_
+
 #include <stdlib.h>
 #include <QtCore/QObject>
 
@@ -70,3 +73,5 @@ class GlobalShortcutMac : public GlobalShortcutEngine {
 		QString translateModifierKey(const unsigned int keycode) const;
 		QString translateKeyName(const unsigned int keycode) const;
 };
+
+#endif
diff --git a/src/mumble/GlobalShortcut_unix.h b/src/mumble/GlobalShortcut_unix.h
index 48d12ef04..625018bfd 100644
--- a/src/mumble/GlobalShortcut_unix.h
+++ b/src/mumble/GlobalShortcut_unix.h
@@ -28,6 +28,9 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#ifndef GLOBALSHORTCUT_UNIX_H_
+#define GLOBALSHORTCUT_UNIX_H_
+
 #include "GlobalShortcut.h"
 #include "ConfigDialog.h"
 #include "Global.h"
@@ -71,3 +74,5 @@ class GlobalShortcutX : public GlobalShortcutEngine {
 		void inputReadyRead(int);
 		void directoryChanged(const QString &);
 };
+
+#endif
diff --git a/src/mumble/GlobalShortcut_win.h b/src/mumble/GlobalShortcut_win.h
index b554c8e8a..a27885121 100644
--- a/src/mumble/GlobalShortcut_win.h
+++ b/src/mumble/GlobalShortcut_win.h
@@ -28,6 +28,9 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#ifndef GLOBALSHORTCUT_WIN_H_
+#define GLOBALSHORTCUT_WIN_H_
+
 #include "GlobalShortcut.h"
 #include "Timer.h"
 
@@ -87,3 +90,5 @@ class GlobalShortcutWin : public GlobalShortcutEngine {
 };
 
 uint qHash(const GUID &);
+
+#endif
diff --git a/src/mumble/murmur_pch.h b/src/mumble/murmur_pch.h
index 36b3ae1f3..54a417d13 100644
--- a/src/mumble/murmur_pch.h
+++ b/src/mumble/murmur_pch.h
@@ -1 +1,6 @@
+#ifndef MURMUR_PCH_H_
+#define MURMUR_PCH_H_
+
 #include "mumble_pch.hpp"
+
+#endif