6 files changed, 10 insertions, 5 deletions
diff --git a/src/enums/being/attributesstrings.cpp b/src/enums/being/attributesstrings.cpp
index 6a74f0fd5..29681e14a 100644
--- a/src/enums/being/attributesstrings.cpp
+++ b/src/enums/being/attributesstrings.cpp
@@ -114,4 +114,4 @@ namespace AttributesEnum
         strEnumDef(Attributes, ELEMENTAL_MP)
         strEnumDef(Attributes, ELEMENTAL_MAX_MP)
     stringEnumEnd
-}
+}  // namespace AttributesEnum
diff --git a/src/enums/being/attributesstrings.h b/src/enums/being/attributesstrings.h
index 629f1006e..aa8a14c9f 100644
--- a/src/enums/being/attributesstrings.h
+++ b/src/enums/being/attributesstrings.h
@@ -31,6 +31,6 @@
 namespace AttributesEnum
 {
     stringEnumDef(AttributesT)
-}
+}  // namespace AttributesEnum
 
 #endif  // ENUMS_BEING_ATTRIBUTESSTRINGS_H
diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp
index 0947e8882..7ffe8d0ce 100644
--- a/src/gui/popups/statuspopup.cpp
+++ b/src/gui/popups/statuspopup.cpp
@@ -46,7 +46,8 @@
     }
 
 StatusPopup::StatusPopup() :
-    Popup("StatusPopup", "statuspopup.xml")
+    Popup("StatusPopup", "statuspopup.xml"),
+    mLabels()
 {
     for (int f = 0; f < STATUSPOPUP_NUM_LABELS; f ++)
         mLabels[f] = new Label(this);
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 5299d4fd1..509b04fda 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -49,6 +49,10 @@
 
 #include "debug.h"
 
+#ifdef WIN32
+#undef ERROR
+#endif
+
 static const int MAX_SERVERLIST = 15;
 
 static std::string serverTypeToString(const ServerTypeT type)
diff --git a/src/resources/beingcommon.cpp b/src/resources/beingcommon.cpp
index 6f9c3aa6d..2b63063f8 100644
--- a/src/resources/beingcommon.cpp
+++ b/src/resources/beingcommon.cpp
@@ -62,7 +62,7 @@ void BeingCommon::readWalkingAttributes(BeingInfo *const info,
     std::string walkStr = XML::getProperty(
         node, "walkType", "walk");
 
-    const int allFlags = BlockMask::GROUND |
+    const unsigned char allFlags = BlockMask::GROUND |
         BlockMask::WALL |
         BlockMask::WATER |
         BlockMask::AIR |
diff --git a/src/resources/db/elementaldb.cpp b/src/resources/db/elementaldb.cpp
index 6706c0acb..928200404 100644
--- a/src/resources/db/elementaldb.cpp
+++ b/src/resources/db/elementaldb.cpp
@@ -52,7 +52,7 @@ void ElementalDb::load()
 }
 
 void ElementalDb::loadXmlFile(const std::string &fileName,
-                               const SkipError skipError)
+                              const SkipError skipError)
 {
     XML::Document doc(fileName, UseResman_true, skipError);
     const XmlNodePtr rootNode = doc.rootNode();