[EventClients] Nuke include guards

14 files changed, 1 insertions, 59 deletions

diff --git a/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.h b/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.h
index b5cb634cc0..003f40f18d 100644
--- a/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.h
+++ b/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.h
@@ -23,9 +23,6 @@
 
 #pragma once
 
-#ifndef WII_REMOTE_H
-#define WII_REMOTE_H
-
 /* Toggle one bit */
 #define ToggleBit(bf,b) (bf) = ((bf) & b) ? ((bf) & ~(b)) : ((bf) | (b))
 
@@ -171,6 +168,4 @@ private:
 #endif
 };
 
-#endif // WII_REMOTE_H
-
 extern CWiiRemote g_WiiRemote;
diff --git a/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h b/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h
index e755300e97..d231436546 100644
--- a/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h
+++ b/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h
@@ -124,3 +124,4 @@ unsigned short convert_code(unsigned short);
 float smoothDeg(float, float);
 
 CXBMCClient EventClient;
+
diff --git a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/classic.h b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/classic.h
index 04032edd84..308e1b5df9 100644
--- a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/classic.h
+++ b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/classic.h
@@ -33,9 +33,6 @@
 
 #pragma once
 
-#ifndef CLASSIC_H_INCLUDED
-#define CLASSIC_H_INCLUDED
-
 #include "wiiuse_internal.h"
 
 #ifdef __cplusplus
@@ -52,4 +49,3 @@ void classic_ctrl_event(struct classic_ctrl_t* cc, byte* msg);
 }
 #endif
 
-#endif // CLASSIC_H_INCLUDED
diff --git a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/definitions.h b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/definitions.h
index b352ea6edb..c5d1270997 100644
--- a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/definitions.h
+++ b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/definitions.h
@@ -33,9 +33,6 @@
 
 #pragma once
 
-#ifndef DEFINITIONS_H_INCLUDED
-#define DEFINITIONS_H_INCLUDED
-
 /* this is wiiuse - used to distinguish from third party programs using wiiuse.h */
 #include "os.h"
 
@@ -78,4 +75,3 @@
 #define absf(x)						((x >= 0) ? (x) : (x * -1.0f))
 #define diff_f(x, y)				((x >= y) ? (absf(x - y)) : (absf(y - x)))
 
-#endif // DEFINITIONS_H_INCLUDED
diff --git a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/dynamics.h b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/dynamics.h
index 07b79e37ec..2f41d04bf7 100644
--- a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/dynamics.h
+++ b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/dynamics.h
@@ -37,9 +37,6 @@
 
 #pragma once
 
-#ifndef DYNAMICS_H_INCLUDED
-#define DYNAMICS_H_INCLUDED
-
 #include "wiiuse_internal.h"
 
 #ifdef __cplusplus
@@ -55,4 +52,3 @@ void apply_smoothing(struct accel_t* ac, struct orient_t* orient, int type);
 }
 #endif
 
-#endif // DYNAMICS_H_INCLUDED
diff --git a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/events.h b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/events.h
index 937bf4ea0f..9b9121c0c6 100644
--- a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/events.h
+++ b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/events.h
@@ -36,9 +36,6 @@
 
 #pragma once
 
-#ifndef EVENTS_H_INCLUDED
-#define EVENTS_H_INCLUDED
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -52,5 +49,3 @@ void disable_expansion(struct wiimote_t* wm);
 }
 #endif
 
-
-#endif // EVENTS_H_INCLUDED
diff --git a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/guitar_hero_3.h b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/guitar_hero_3.h
index 7a2fd09dd2..a8c8ffa307 100644
--- a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/guitar_hero_3.h
+++ b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/guitar_hero_3.h
@@ -33,9 +33,6 @@
 
 #pragma once
 
-#ifndef GUITAR_HERO_3_H_INCLUDED
-#define GUITAR_HERO_3_H_INCLUDED
-
 #include "wiiuse_internal.h"
 
 #define GUITAR_HERO_3_JS_MIN_X				0xC5
@@ -61,4 +58,3 @@ void guitar_hero_3_event(struct guitar_hero_3_t* gh3, byte* msg);
 }
 #endif
 
-#endif // GUITAR_HERO_3_H_INCLUDED
diff --git a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/io.h b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/io.h
index 60a32a6e70..19e703184a 100644
--- a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/io.h
+++ b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/io.h
@@ -33,9 +33,6 @@
 
 #pragma once
 
-#ifndef CONNECT_H_INCLUDED
-#define CONNECT_H_INCLUDED
-
 #ifndef WIN32
 	#include <bluetooth/bluetooth.h>
 #endif
@@ -55,4 +52,3 @@ int wiiuse_io_write(struct wiimote_t* wm, byte* buf, int len);
 }
 #endif
 
-#endif // CONNECT_H_INCLUDED
diff --git a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/ir.h b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/ir.h
index 5dc5e5cf9e..1b9c5c0fac 100644
--- a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/ir.h
+++ b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/ir.h
@@ -33,9 +33,6 @@
 
 #pragma once
 
-#ifndef IR_H_INCLUDED
-#define IR_H_INCLUDED
-
 #include "wiiuse_internal.h"
 
 #define WII_VRES_X		560
@@ -53,6 +50,3 @@ float calc_yaw(struct ir_t* ir);
 }
 #endif
 
-#endif // IR_H_INCLUDED
-
-
diff --git a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/nunchuk.h b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/nunchuk.h
index 9034d0eaf5..a3a2c63e58 100644
--- a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/nunchuk.h
+++ b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/nunchuk.h
@@ -33,9 +33,6 @@
 
 #pragma once
 
-#ifndef NUNCHUK_H_INCLUDED
-#define NUNCHUK_H_INCLUDED
-
 #include "wiiuse_internal.h"
 
 #ifdef __cplusplus
@@ -52,4 +49,3 @@ void nunchuk_event(struct nunchuk_t* nc, byte* msg);
 }
 #endif
 
-#endif // NUNCHUK_H_INCLUDED
diff --git a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/os.h b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/os.h
index b1ac81b758..3e99670db5 100644
--- a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/os.h
+++ b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/os.h
@@ -38,9 +38,6 @@
 
 #pragma once
 
-#ifndef OS_H_INCLUDED
-#define OS_H_INCLUDED
-
 #ifdef WIN32
 	/* windows */
 	#define isnan(x)		_isnan(x)
@@ -54,5 +51,3 @@
 	/* nix */
 #endif
 
-
-#endif // OS_H_INCLUDED
diff --git a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/wiiuse.h b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/wiiuse.h
index 22c9d679db..dc886743e7 100644
--- a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/wiiuse.h
+++ b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/wiiuse.h
@@ -38,9 +38,6 @@
 
 #pragma once
 
-#ifndef WIIUSE_H_INCLUDED
-#define WIIUSE_H_INCLUDED
-
 #ifdef _WIN32
 	/* windows */
 	#include <windows.h>
@@ -650,6 +647,3 @@ WIIUSE_EXPORT extern void wiiuse_set_nunchuk_accel_threshold(struct wiimote_t* w
 }
 #endif
 
-
-#endif /* WIIUSE_H_INCLUDED */
-
diff --git a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/wiiuse_internal.h b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/wiiuse_internal.h
index 4193524899..de5c01137a 100644
--- a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/wiiuse_internal.h
+++ b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/wiiuse_internal.h
@@ -43,9 +43,6 @@
 
 #pragma once
 
-#ifndef WIIUSE_INTERNAL_H_INCLUDED
-#define WIIUSE_INTERNAL_H_INCLUDED
-
 #ifndef WIN32
 	#include <arpa/inet.h>				/* htons() */
 	#include <bluetooth/bluetooth.h>
@@ -225,4 +222,3 @@ int wiiuse_read_data_cb(struct wiimote_t* wm, wiiuse_read_cb read_cb, byte* buff
 }
 #endif
 
-#endif /* WIIUSE_INTERNAL_H_INCLUDED */
diff --git a/tools/EventClients/lib/c++/xbmcclient.h b/tools/EventClients/lib/c++/xbmcclient.h
index 462da39bc9..b6465af6ce 100644
--- a/tools/EventClients/lib/c++/xbmcclient.h
+++ b/tools/EventClients/lib/c++/xbmcclient.h
@@ -1,6 +1,3 @@
-#ifndef __XBMC_CLIENT_H__
-#define __XBMC_CLIENT_H__
-
 /*
  *      Copyright (C) 2008-2015 Team Kodi
  *      http://kodi.tv
@@ -830,4 +827,3 @@ public:
   }
 };
 
-#endif