REFAC: Make sure all macros are #undef'd again

If they are not there is the potential of name clashes when performing a
unity build.

See: https://stackoverflow.com/questions/847974/the-benefits-disadvantages-of-unity-builds

40 files changed, 167 insertions, 22 deletions

diff --git a/src/SelfSignedCertificate.cpp b/src/SelfSignedCertificate.cpp
index 9a45db3c7..85640aa32 100644
--- a/src/SelfSignedCertificate.cpp
+++ b/src/SelfSignedCertificate.cpp
@@ -278,3 +278,5 @@ bool SelfSignedCertificate::generateMumbleCertificate(QString name, QString emai
 bool SelfSignedCertificate::generateMurmurV2Certificate(QSslCertificate &qscCert, QSslKey &qskKey) {
 	return SelfSignedCertificate::generate(CertificateTypeServerCertificate, QString(), QString(), qscCert, qskKey);
 }
+
+#undef SSL_STRING
diff --git a/src/crypto/CryptStateOCB2.cpp b/src/crypto/CryptStateOCB2.cpp
index 7cd1be047..51253b0a5 100644
--- a/src/crypto/CryptStateOCB2.cpp
+++ b/src/crypto/CryptStateOCB2.cpp
@@ -375,3 +375,10 @@ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *
 
 	return success;
 }
+
+#undef BLOCKSIZE
+#undef SHIFTBITS
+#undef SWAPPED
+#undef HIGHBIT
+#undef AES_encrypt
+#undef AES_decrypt
diff --git a/src/mumble/ALSAAudio.cpp b/src/mumble/ALSAAudio.cpp
index 8c79c7c97..7053e6ffb 100644
--- a/src/mumble/ALSAAudio.cpp
+++ b/src/mumble/ALSAAudio.cpp
@@ -565,3 +565,7 @@ void ALSAAudioOutput::run() {
 	}
 	snd_pcm_close(pcm_handle);
 }
+
+#undef NBLOCKS
+#undef ALSA_ERRBAIL
+#undef ALSA_ERRCHECK
diff --git a/src/mumble/About.cpp b/src/mumble/About.cpp
index cfe211bb4..7ec2f2a73 100644
--- a/src/mumble/About.cpp
+++ b/src/mumble/About.cpp
@@ -86,3 +86,6 @@ AboutDialog::AboutDialog(QWidget *p) : QDialog(p) {
 	vblMain->addWidget(qtwTab);
 	vblMain->addWidget(okButton);
 }
+
+#undef DOQUOTE
+#undef QUOTE
diff --git a/src/mumble/Audio.cpp b/src/mumble/Audio.cpp
index 498f0e845..27a783503 100644
--- a/src/mumble/Audio.cpp
+++ b/src/mumble/Audio.cpp
@@ -303,3 +303,5 @@ void Audio::stop() {
 	ai.reset();
 	ao.reset();
 }
+
+#undef DOUBLE_RAND
diff --git a/src/mumble/AudioInput.cpp b/src/mumble/AudioInput.cpp
index 5a4723c97..7c8f01486 100644
--- a/src/mumble/AudioInput.cpp
+++ b/src/mumble/AudioInput.cpp
@@ -420,6 +420,9 @@ IN_MIXER_SHORT(7)
 IN_MIXER_SHORT(8)
 IN_MIXER_SHORT(N)
 
+#undef IN_MIXER_FLOAT
+#undef IN_MIXER_SHORT
+
 AudioInput::inMixerFunc AudioInput::chooseMixer(const unsigned int nchan, SampleFormat sf, quint64 chanmask) {
 	inMixerFunc r = nullptr;
 
diff --git a/src/mumble/AudioStats.cpp b/src/mumble/AudioStats.cpp
index 1d2e30988..878ddbfcb 100644
--- a/src/mumble/AudioStats.cpp
+++ b/src/mumble/AudioStats.cpp
@@ -138,8 +138,6 @@ static inline const QColor mapEchoToColor(float echo) {
 		return QColor::fromRgbF(c, b, a);
 }
 
-#define WGT(x, y) st->W[(y) *N + 2 * (x) + 1]
-
 void AudioEchoWidget::paintEvent(QPaintEvent *) {
 	QPainter paint(this);
 
diff --git a/src/mumble/CELTCodec.cpp b/src/mumble/CELTCodec.cpp
index 38cb1f4c3..2a1872c3e 100644
--- a/src/mumble/CELTCodec.cpp
+++ b/src/mumble/CELTCodec.cpp
@@ -155,3 +155,5 @@ int CELTCodec070::encode(CELTEncoder *st, const celt_int16 *pcm, unsigned char *
 int CELTCodec070::decode_float(CELTDecoder *st, const unsigned char *data, int len, float *pcm) {
 	return celt_decode_float(st, data, len, pcm);
 }
+
+#undef RESOLVE
diff --git a/src/mumble/Cert.cpp b/src/mumble/Cert.cpp
index 929c2fc22..1ea5227d6 100644
--- a/src/mumble/Cert.cpp
+++ b/src/mumble/Cert.cpp
@@ -545,3 +545,5 @@ QByteArray CertWizard::exportCert(const Settings::KeyPair &kp) {
 
 	return qba;
 }
+
+#undef SSL_STRING
diff --git a/src/mumble/G15LCDEngine_lglcd.cpp b/src/mumble/G15LCDEngine_lglcd.cpp
index f72f46ef5..640564afa 100644
--- a/src/mumble/G15LCDEngine_lglcd.cpp
+++ b/src/mumble/G15LCDEngine_lglcd.cpp
@@ -157,3 +157,11 @@ QString G15LCDDeviceLGLCD::name() const {
 QSize G15LCDDeviceLGLCD::size() const {
 	return QSize(G15_MAX_WIDTH, G15_MAX_HEIGHT);
 }
+
+#undef G15_MAX_DEV
+#undef G15_MAX_WIDTH
+#undef G15_MAX_HEIGHT
+#undef G15_MAX_BPP
+#undef G15_MAX_FBMEM
+#undef G15_MAX_FBMEM_BITS
+#undef G15_WIDGET_NAME
diff --git a/src/mumble/GKey.cpp b/src/mumble/GKey.cpp
index cafba9784..309c81648 100644
--- a/src/mumble/GKey.cpp
+++ b/src/mumble/GKey.cpp
@@ -150,3 +150,5 @@ QString GKeyLibrary::getMouseButtonString(int button) {
 QString GKeyLibrary::getKeyboardGkeyString(int key, int mode) {
 	return QString::fromWCharArray(LogiGkeyGetKeyboardGkeyString(key, mode));
 }
+
+#undef RESOLVE
diff --git a/src/mumble/GlobalShortcut_macx.mm b/src/mumble/GlobalShortcut_macx.mm
index c3aba27b3..397b79398 100644
--- a/src/mumble/GlobalShortcut_macx.mm
+++ b/src/mumble/GlobalShortcut_macx.mm
@@ -480,3 +480,7 @@ bool GlobalShortcutMac::canSuppress() {
 bool GlobalShortcutMac::canDisable() {
 	return true;
 }
+
+#undef MOD_OFFSET
+#undef MOUSE_OFFSET
+#undef MOD_CHANGED
diff --git a/src/mumble/GlobalShortcut_unix.cpp b/src/mumble/GlobalShortcut_unix.cpp
index d8c1c8a46..379bd41b0 100644
--- a/src/mumble/GlobalShortcut_unix.cpp
+++ b/src/mumble/GlobalShortcut_unix.cpp
@@ -350,6 +350,8 @@ void GlobalShortcutX::directoryChanged(const QString &dir) {
 #endif
 }
 
+#undef test_bit
+
 GlobalShortcutX::ButtonInfo GlobalShortcutX::buttonInfo(const QVariant &v) {
 	bool ok;
 	unsigned int key = v.toUInt(&ok);
diff --git a/src/mumble/GlobalShortcut_win.cpp b/src/mumble/GlobalShortcut_win.cpp
index 61c1834a5..2641f2006 100644
--- a/src/mumble/GlobalShortcut_win.cpp
+++ b/src/mumble/GlobalShortcut_win.cpp
@@ -24,8 +24,7 @@
 // Used to detect screen readers
 #include <tlhelp32.h>
 
-#undef FAILED
-#define FAILED(Status) (static_cast< HRESULT >(Status) < 0)
+#define HAS_FAILED(Status) (static_cast< HRESULT >(Status) < 0)
 
 #define DX_SAMPLE_BUFFER_SIZE 512
 
@@ -131,7 +130,7 @@ GlobalShortcutWin::~GlobalShortcutWin() {
 }
 
 void GlobalShortcutWin::run() {
-	if (FAILED(DirectInput8Create(GetModuleHandle(nullptr), DIRECTINPUT_VERSION, IID_IDirectInput8,
+	if (HAS_FAILED(DirectInput8Create(GetModuleHandle(nullptr), DIRECTINPUT_VERSION, IID_IDirectInput8,
 								  reinterpret_cast< void ** >(&pDI), nullptr))) {
 		qFatal("GlobalShortcutWin: Failed to create d8input");
 		return;
@@ -541,10 +540,10 @@ BOOL GlobalShortcutWin::EnumDevicesCB(LPCDIDEVICEINSTANCE pdidi, LPVOID pContext
 		}
 	}
 
-	if (FAILED(hr = cbgsw->pDI->CreateDevice(pdidi->guidInstance, &id->pDID, nullptr)))
+	if (HAS_FAILED(hr = cbgsw->pDI->CreateDevice(pdidi->guidInstance, &id->pDID, nullptr)))
 		qFatal("GlobalShortcutWin: CreateDevice: %lx", hr);
 
-	if (FAILED(hr = id->pDID->EnumObjects(EnumDeviceObjectsCallback, static_cast< void * >(id), DIDFT_BUTTON)))
+	if (HAS_FAILED(hr = id->pDID->EnumObjects(EnumDeviceObjectsCallback, static_cast< void * >(id), DIDFT_BUTTON)))
 		qFatal("GlobalShortcutWin: EnumObjects: %lx", hr);
 
 	if (id->qhNames.count() > 0) {
@@ -571,10 +570,10 @@ BOOL GlobalShortcutWin::EnumDevicesCB(LPCDIDEVICEINSTANCE pdidi, LPVOID pContext
 			id->qhTypeToOfs[dwType] = dwOfs;
 		}
 
-		if (FAILED(hr = id->pDID->SetCooperativeLevel(mumble_mw_hwnd, DISCL_NONEXCLUSIVE | DISCL_BACKGROUND)))
+		if (HAS_FAILED(hr = id->pDID->SetCooperativeLevel(mumble_mw_hwnd, DISCL_NONEXCLUSIVE | DISCL_BACKGROUND)))
 			qFatal("GlobalShortcutWin: SetCooperativeLevel: %lx", hr);
 
-		if (FAILED(hr = id->pDID->SetDataFormat(&df)))
+		if (HAS_FAILED(hr = id->pDID->SetDataFormat(&df)))
 			qFatal("GlobalShortcutWin: SetDataFormat: %lx", hr);
 
 		DIPROPDWORD dipdw;
@@ -585,7 +584,7 @@ BOOL GlobalShortcutWin::EnumDevicesCB(LPCDIDEVICEINSTANCE pdidi, LPVOID pContext
 		dipdw.diph.dwHow        = DIPH_DEVICE;
 		dipdw.dwData            = DX_SAMPLE_BUFFER_SIZE;
 
-		if (FAILED(hr = id->pDID->SetProperty(DIPROP_BUFFERSIZE, &dipdw.diph)))
+		if (HAS_FAILED(hr = id->pDID->SetProperty(DIPROP_BUFFERSIZE, &dipdw.diph)))
 			qFatal("GlobalShortcutWin: SetProperty: %lx", hr);
 
 		qWarning("Adding device %s %s %s:%d type 0x%.8lx guid product %s", qPrintable(QUuid(id->guid).toString()),
@@ -656,7 +655,7 @@ void GlobalShortcutWin::timeTicked() {
 		}
 
 		hr = id->pDID->GetDeviceData(sizeof(DIDEVICEOBJECTDATA), rgdod, &dwItems, 0);
-		if (FAILED(hr))
+		if (HAS_FAILED(hr))
 			continue;
 
 		if (dwItems <= 0)
@@ -924,3 +923,7 @@ bool GlobalShortcutWin::areScreenReadersActive() {
 	}
 	return false;
 }
+
+#undef BOOST_THREAD_VERSION
+#undef HAS_FAILED
+#undef DX_SAMPLE_BUFFER_SIZE
diff --git a/src/mumble/JackAudio.cpp b/src/mumble/JackAudio.cpp
index 3ab7f7a57..4207ad329 100644
--- a/src/mumble/JackAudio.cpp
+++ b/src/mumble/JackAudio.cpp
@@ -1126,3 +1126,5 @@ void JackAudioOutput::run() {
 		qsSleep.acquire(1);
 	} while (bReady);
 }
+
+#undef RESOLVE
diff --git a/src/mumble/ManualPlugin.cpp b/src/mumble/ManualPlugin.cpp
index ef1a4746d..38eae17c1 100644
--- a/src/mumble/ManualPlugin.cpp
+++ b/src/mumble/ManualPlugin.cpp
@@ -416,3 +416,5 @@ MumblePlugin *ManualPlugin_getMumblePlugin() {
 MumblePluginQt *ManualPlugin_getMumblePluginQt() {
 	return &manualqt;
 }
+
+#undef _USE_MATH_DEFINES
diff --git a/src/mumble/Messages.cpp b/src/mumble/Messages.cpp
index 72fea881e..62887c34f 100644
--- a/src/mumble/Messages.cpp
+++ b/src/mumble/Messages.cpp
@@ -1302,3 +1302,7 @@ void MainWindow::msgSuggestConfig(const MumbleProto::SuggestConfig &msg) {
 			Global::get().l->log(Log::Warning, tr("The server requests Push-to-Talk be disabled."));
 	}
 }
+
+#undef ACTOR_INIT
+#undef VICTIM_INIT
+#undef SELF_INIT
diff --git a/src/mumble/OSS.cpp b/src/mumble/OSS.cpp
index ac37a3d33..5a8aa7e89 100644
--- a/src/mumble/OSS.cpp
+++ b/src/mumble/OSS.cpp
@@ -327,3 +327,5 @@ void OSSOutput::run() {
 	ioctl(fd, SNDCTL_DSP_RESET, nullptr);
 	close(fd);
 }
+
+#undef NBLOCKS
diff --git a/src/mumble/OpusCodec.cpp b/src/mumble/OpusCodec.cpp
index 8791b37e6..291823ce4 100644
--- a/src/mumble/OpusCodec.cpp
+++ b/src/mumble/OpusCodec.cpp
@@ -100,3 +100,5 @@ bool OpusCodec::isValid() const {
 void OpusCodec::report() const {
 	qDebug("%s from %s", opus_get_version_string(), qPrintable(qlOpus.fileName()));
 }
+
+#undef RESOLVE
diff --git a/src/mumble/OverlayEditorScene.cpp b/src/mumble/OverlayEditorScene.cpp
index 2d4cb6f7b..7ed0c848f 100644
--- a/src/mumble/OverlayEditorScene.cpp
+++ b/src/mumble/OverlayEditorScene.cpp
@@ -866,3 +866,5 @@ Qt::WindowFrameSection OverlayEditorScene::rectSection(const QRectF &qrf, const
 
 	return Qt::NoSection;
 }
+
+#undef SCALESIZE
diff --git a/src/mumble/OverlayUser.cpp b/src/mumble/OverlayUser.cpp
index 59f210f14..84f14e2f9 100644
--- a/src/mumble/OverlayUser.cpp
+++ b/src/mumble/OverlayUser.cpp
@@ -286,3 +286,5 @@ QPointF OverlayUser::alignedPosition(const QRectF &box, const QRectF &item, Qt::
 
 	return QPointF(iroundf(xofs + 0.5f), iroundf(yofs + 0.5f));
 }
+
+#undef SCALESIZE
diff --git a/src/mumble/PAAudio.cpp b/src/mumble/PAAudio.cpp
index a97fabd5b..f04a3756a 100644
--- a/src/mumble/PAAudio.cpp
+++ b/src/mumble/PAAudio.cpp
@@ -462,3 +462,5 @@ void PortAudioOutput::run() {
 	qwcSleep.wait(&qmWait);
 	qmWait.unlock();
 }
+
+#undef RESOLVE
diff --git a/src/mumble/PulseAudio.cpp b/src/mumble/PulseAudio.cpp
index 5bb0baf79..dcfb1cef5 100644
--- a/src/mumble/PulseAudio.cpp
+++ b/src/mumble/PulseAudio.cpp
@@ -1076,3 +1076,6 @@ PulseAudio::PulseAudio() : m_ok(false) {
 
 	m_ok = true;
 }
+
+#undef RESOLVE
+#undef NBLOCKS
diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp
index 797dbc169..a4f94d625 100644
--- a/src/mumble/Settings.cpp
+++ b/src/mumble/Settings.cpp
@@ -1389,3 +1389,10 @@ void Settings::save() {
 	os.save(settings_ptr);
 	settings_ptr->endGroup();
 }
+
+#undef LOAD
+#undef LOADENUM
+#undef LOADFLAG
+#undef DEPRECATED
+#undef SAVE
+#undef SAVEFLAG
diff --git a/src/mumble/TextToSpeech_win.cpp b/src/mumble/TextToSpeech_win.cpp
index 48703c00e..e48a2d1b4 100644
--- a/src/mumble/TextToSpeech_win.cpp
+++ b/src/mumble/TextToSpeech_win.cpp
@@ -11,8 +11,7 @@
 #include <sapi.h>
 // clang-format on
 
-#undef FAILED
-#define FAILED(Status) (static_cast< HRESULT >(Status) < 0)
+#define HAS_FAILED(Status) (static_cast< HRESULT >(Status) < 0)
 
 class TextToSpeechPrivate {
 public:
@@ -27,7 +26,7 @@ TextToSpeechPrivate::TextToSpeechPrivate() {
 	pVoice = nullptr;
 
 	HRESULT hr = CoCreateInstance(CLSID_SpVoice, nullptr, CLSCTX_ALL, IID_ISpVoice, (void **) &pVoice);
-	if (FAILED(hr))
+	if (HAS_FAILED(hr))
 		qWarning("TextToSpeechPrivate: Failed to allocate TTS Voice");
 }
 
@@ -72,3 +71,5 @@ void TextToSpeech::setVolume(int volume) {
 bool TextToSpeech::isEnabled() const {
 	return enabled;
 }
+
+#undef HAS_FAILED
diff --git a/src/mumble/UserModel.cpp b/src/mumble/UserModel.cpp
index 14b681b71..d1d12445d 100644
--- a/src/mumble/UserModel.cpp
+++ b/src/mumble/UserModel.cpp
@@ -1938,6 +1938,7 @@ bool UserModel::dropMimeData(const QMimeData *md, Qt::DropAction, int row, int c
 	}
 
 	return true;
+#undef NAMECMPCHANNEL
 }
 
 void UserModel::updateOverlay() const {
diff --git a/src/mumble/Zeroconf.cpp b/src/mumble/Zeroconf.cpp
index 10bdf4a2f..5187096e4 100644
--- a/src/mumble/Zeroconf.cpp
+++ b/src/mumble/Zeroconf.cpp
@@ -304,3 +304,5 @@ void WINAPI Zeroconf::callbackResolveComplete(const DWORD status, void *context,
 	zeroconf->DnsServiceFreeInstance(instance);
 }
 #endif
+
+#undef GET_SYMBOL
diff --git a/src/mumble/os_macx.mm b/src/mumble/os_macx.mm
index c33b7a6d0..01daed89d 100644
--- a/src/mumble/os_macx.mm
+++ b/src/mumble/os_macx.mm
@@ -41,9 +41,6 @@ static void mumbleMessageOutputQString(QtMsgType type, const QString &msg) {
 			c='X';
 	}
 
-#define LOG(f, msg) fprintf(f, "<%c>%s %s\n", c, \
-		qPrintable(QDateTime::currentDateTime().toString(QLatin1String("yyyy-MM-dd hh:mm:ss.zzz"))), qPrintable(msg))
-
 	QString date = QDateTime::currentDateTime().toString(QLatin1String("yyyy-MM-dd hh:mm:ss.zzz"));
 	QString fmsg = QString::fromLatin1("<%1>%2 %3").arg(c).arg(date).arg(msg);
 	fprintf(stderr, "%s\n", qPrintable(fmsg));
@@ -157,3 +154,6 @@ void os_init() {
 	 * by always using the system langauge, to get rid of all sorts of nasty langauge inconsistencies. */
 	query_language();
 }
+
+#undef PATH_MAX
+#undef NSIGS
diff --git a/src/mumble/os_unix.cpp b/src/mumble/os_unix.cpp
index 4c86ad0df..ed17adedf 100644
--- a/src/mumble/os_unix.cpp
+++ b/src/mumble/os_unix.cpp
@@ -24,11 +24,6 @@ static void mumbleMessageOutputQString(QtMsgType type, const QString &msg) {
 			c = 'X';
 	}
 
-#define LOG(f, msg)                                                                                      \
-	fprintf(f, "<%c>%s %s\n", c,                                                                         \
-			qPrintable(QDateTime::currentDateTime().toString(QLatin1String("yyyy-MM-dd hh:mm:ss.zzz"))), \
-			qPrintable(msg))
-
 	QString date = QDateTime::currentDateTime().toString(QLatin1String("yyyy-MM-dd hh:mm:ss.zzz"));
 	QString fmsg = QString::fromLatin1("<%1>%2 %3").arg(c).arg(date).arg(msg);
 	fprintf(stderr, "%s\n", qPrintable(fmsg));
diff --git a/src/mumble/os_win.cpp b/src/mumble/os_win.cpp
index 317183bb9..825318290 100644
--- a/src/mumble/os_win.cpp
+++ b/src/mumble/os_win.cpp
@@ -332,3 +332,7 @@ DWORD WinVerifySslCert(const QByteArray &cert) {
 
 	return errorStatus;
 }
+
+#undef DUMP_BUFFER_SIZE
+#undef HeapEnableTerminationOnCorruption
+#undef MMXSSE
diff --git a/src/murmur/DBus.cpp b/src/murmur/DBus.cpp
index a870b2f8e..6db489183 100644
--- a/src/murmur/DBus.cpp
+++ b/src/murmur/DBus.cpp
@@ -941,3 +941,8 @@ void MetaDBus::quit() {
 void MetaDBus::getVersion(int &major, int &minor, int &patch, QString &text) {
 	Meta::getVersion(major, minor, patch, text);
 }
+
+#undef PLAYER_SETUP_VAR
+#undef PLAYER_SETUP
+#undef CHANNEL_SETUP_VAR2
+#undef CHANNEL_SETUP_VAR
diff --git a/src/murmur/Messages.cpp b/src/murmur/Messages.cpp
index 94adc2c71..8e42e4042 100644
--- a/src/murmur/Messages.cpp
+++ b/src/murmur/Messages.cpp
@@ -2164,3 +2164,12 @@ void Server::msgServerConfig(ServerUser *, MumbleProto::ServerConfig &) {
 
 void Server::msgSuggestConfig(ServerUser *, MumbleProto::SuggestConfig &) {
 }
+
+#undef RATELIMIT
+#undef MSG_SETUP
+#undef MSG_SETUP_NO_UNIDLE
+#undef VICTIM_SETUP
+#undef PERM_DENIED
+#undef PERM_DENIED_TYPE
+#undef PERM_DENIED_FALLBACK
+#undef PERM_DENIED_HASH
diff --git a/src/murmur/MurmurIce.cpp b/src/murmur/MurmurIce.cpp
index a3a13751b..f256713fd 100644
--- a/src/murmur/MurmurIce.cpp
+++ b/src/murmur/MurmurIce.cpp
@@ -1942,3 +1942,40 @@ static void impl_Meta_getUptime(const ::Murmur::AMD_Meta_getUptimePtr cb, const
 }
 
 #include "MurmurIceWrapper.cpp"
+
+#undef FIND_SERVER
+#undef NEED_SERVER_EXISTS
+#undef NEED_SERVER
+#undef NEED_PLAYER
+#undef NEED_CHANNEL_VAR
+#undef NEED_CHANNEL
+#undef ACCESS_Server_isRunning_READ
+#undef ACCESS_Server_id_READ
+#undef ACCESS_Server_getConf_READ
+#undef ACCESS_Server_getAllConf_READ
+#undef ACCESS_Server_getLog_READ
+#undef ACCESS_Server_getLogLen_READ
+#undef ACCESS_Server_getUsers_READ
+#undef ACCESS_Server_getChannels_READ
+#undef ACCESS_Server_getTree_READ
+#undef ACCESS_Server_getCertificateList_READ
+#undef ACCESS_Server_getBans_READ
+#undef ACCESS_Server_hasPermission_READ
+#undef ACCESS_Server_effectivePermissions_READ
+#undef ACCESS_Server_getState_READ
+#undef ACCESS_Server_getChannelState_READ
+#undef ACCESS_Server_getACL_READ
+#undef ACCESS_Server_getUserNames_READ
+#undef ACCESS_Server_getUserIds_READ
+#undef ACCESS_Server_getRegistration_READ
+#undef ACCESS_Server_getRegisteredUsers_READ
+#undef ACCESS_Server_verifyPassword_READ
+#undef ACCESS_Server_getTexture_READ
+#undef ACCESS_Server_getUptime_READ
+#undef ACCESS_Meta_getSliceChecksums_ALL
+#undef ACCESS_Meta_getServer_READ
+#undef ACCESS_Meta_getAllServers_READ
+#undef ACCESS_Meta_getDefaultConf_READ
+#undef ACCESS_Meta_getBootedServers_READ
+#undef ACCESS_Meta_getVersion_ALL
+#undef ACCESS_Meta_getUptime_ALL
diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp
index 3f879f682..a47816d95 100644
--- a/src/murmur/Server.cpp
+++ b/src/murmur/Server.cpp
@@ -1753,6 +1753,8 @@ void Server::message(unsigned int uiType, const QByteArray &qbaMsg, ServerUser *
 #endif
 
 	switch (uiType) { MUMBLE_MH_ALL }
+
+#undef MUMBLE_MH_MSG
 }
 
 void Server::checkTimeout() {
@@ -2288,3 +2290,8 @@ bool Server::canNest(Channel *newParent, Channel *channel) const {
 
 	return (parentLevel + channelDepth) < iChannelNestingLimit;
 }
+
+#undef MAX
+#undef UDP_PACKET_SIZE
+#undef SIO_UDP_CONNRESET
+#undef SENDTO
diff --git a/src/murmur/Zeroconf.cpp b/src/murmur/Zeroconf.cpp
index 01c455928..83f0da584 100644
--- a/src/murmur/Zeroconf.cpp
+++ b/src/murmur/Zeroconf.cpp
@@ -157,3 +157,5 @@ void WINAPI Zeroconf::callbackRegisterComplete(const DWORD status, void *context
 	}
 }
 #endif
+
+#undef GET_SYMBOL
diff --git a/src/tests/Collections.cpp b/src/tests/Collections.cpp
index ef6a5228d..8703ab41e 100644
--- a/src/tests/Collections.cpp
+++ b/src/tests/Collections.cpp
@@ -120,3 +120,6 @@ int main(int argc, char **argv) {
 	}
 	qWarning("QListSet: %lldus insert, %lldus iterate: %d", usins, usiter, sum);
 }
+
+#undef SL
+#undef NE
diff --git a/src/tests/Hash.cpp b/src/tests/Hash.cpp
index 6f4908b04..91065721d 100644
--- a/src/tests/Hash.cpp
+++ b/src/tests/Hash.cpp
@@ -85,3 +85,5 @@ int main(int argc, char **argv) {
 }
 
 #include "Hash.moc"
+
+#undef ITER
diff --git a/src/tests/Lock.cpp b/src/tests/Lock.cpp
index 26897f5cb..c862f0ab2 100644
--- a/src/tests/Lock.cpp
+++ b/src/tests/Lock.cpp
@@ -111,3 +111,5 @@ int main(int argc, char **argv) {
 }
 
 // #include "Lock.moc"
+
+#undef ITER
diff --git a/src/tests/Resample.cpp b/src/tests/Resample.cpp
index cb0c72d90..ec0f256cd 100644
--- a/src/tests/Resample.cpp
+++ b/src/tests/Resample.cpp
@@ -131,3 +131,6 @@ int main(int argc, char **argv) {
 
 	return 0;
 }
+
+#undef _USE_MATH_DEFINES
+#undef ITER
diff --git a/src/tests/TestLink.cpp b/src/tests/TestLink.cpp
index 10f1f6a28..cc2faea47 100644
--- a/src/tests/TestLink.cpp
+++ b/src/tests/TestLink.cpp
@@ -152,3 +152,5 @@ int main(int argc, char **argv) {
 #endif
 	}
 }
+
+#undef _CRT_SECURE_NO_WARNINGS