diff --git a/src/cacic_hardware.cpp b/src/cacic_hardware.cpp
index 1d1c5d9..2a5fe38 100644
--- a/src/cacic_hardware.cpp
+++ b/src/cacic_hardware.cpp
@@ -48,7 +48,7 @@ QJsonObject cacic_hardware::coletaWin()
     }
     return QJsonObject();
 }
-#elif Q_OS_LINUX
+#elif defined(Q_OS_LINUX)
 QJsonObject cacic_hardware::coletaLinux()
 {
 
diff --git a/src/cacic_hardware.h b/src/cacic_hardware.h
index 682feb0..531f2e3 100644
--- a/src/cacic_hardware.h
+++ b/src/cacic_hardware.h
@@ -22,7 +22,12 @@ public:
 private:
 #ifdef Q_OS_WIN
     QJsonObject coletaWin();
-#elif Q_OS_LINUX
+
+#elif defined(Q_OS_LINUX)
+/* Thiago aqui:
+ * Ao menos nos elif's tem que deixar com o "defined()".
+ * Por isso antes eu preferia deixar todas essas verificações com ele, mesmo tendo o ifdef.
+ */
     QJsonObject coletaLinux();
     void coletaLinuxMem(QJsonObject &hardware, const QJsonObject &component);
     void coletaLinuxCpu(QJsonObject &hardware, const QJsonObject &component);
diff --git a/src/cacic_software.cpp b/src/cacic_software.cpp
index 3ff423c..3f079bc 100644
--- a/src/cacic_software.cpp
+++ b/src/cacic_software.cpp
@@ -8,7 +8,7 @@ void cacic_software::iniciaColeta()
 {
 #ifdef Q_OS_WIN
     this->coletaSoftware = coletaWin();
-#elif Q_OS_LINUX
+#elif defined(Q_OS_LINUX)
     this->coletaSoftware = coletaLinux();
 
 #endif
diff --git a/src/vqtconvert.cpp b/src/vqtconvert.cpp
index cbd6cda..d10f2dc 100644
--- a/src/vqtconvert.cpp
+++ b/src/vqtconvert.cpp
@@ -1,3 +1,5 @@
+#if defined(Q_OS_WIN)
+
 #include "vqtconvert.h"
 
 #include <QString>
@@ -58,3 +60,4 @@ namespace voidrealms
 
     } //end voidrealms::win32 namespace
 } //end voidrealms namespace
+#endif //defined(Q_OS_WIN)
diff --git a/src/vqtconvert.h b/src/vqtconvert.h
index d24e24f..6e31bfb 100644
--- a/src/vqtconvert.h
+++ b/src/vqtconvert.h
@@ -1,6 +1,3 @@
-#ifndef VQTCONVERT_H
-#define VQTCONVERT_H
-
 /*
 Converts between QT types and Windows Types
 Version: 1.0
@@ -10,6 +7,11 @@ Tested on: Windows XP SP3
 Bryan Cairns - August 2009
 */
 
+#if defined(Q_OS_WIN)
+
+#ifndef VQTCONVERT_H
+#define VQTCONVERT_H
+
 #include <QString>
 #include "windows.h"
 
@@ -49,3 +51,4 @@ namespace voidrealms
     } //end voidrealms::win32 namespace
 } //end voidrealms namespace
 #endif // VQTCONVERT_H
+#endif // defined(Q_OS_WIN)
diff --git a/src/vregistry.cpp b/src/vregistry.cpp
index c6f7c3d..b32cc2e 100644
--- a/src/vregistry.cpp
+++ b/src/vregistry.cpp
@@ -7,6 +7,8 @@ Tested on: Windows XP SP3
 Bryan Cairns
 */
 
+#if defined(Q_OS_WIN)
+
 #include "vregistry.h"
 #include "windows.h"
 #include "VQTConvert.h"
@@ -475,3 +477,5 @@ namespace voidrealms
 
     } //end voidrealms::win32 namespace
 } //end voidrealms namespace
+
+#endif // defined(Q_OS_WIN)
diff --git a/src/vregistry.h b/src/vregistry.h
index 8609aee..7aedc1f 100644
--- a/src/vregistry.h
+++ b/src/vregistry.h
@@ -7,6 +7,7 @@ Tested on: Windows XP SP3
 Bryan Cairns
 */
 
+#if defined(Q_OS_WIN)
 #ifndef VREGISTRY_H
 #define VREGISTRY_H
 
@@ -125,3 +126,4 @@ namespace voidrealms
     } //end voidrealms::win32 namespace
 } //end voidrealms namespace
 #endif // VREGISTRY_H
+#endif // defined(Q_OS_WIN)
--
libgit2 0.21.2