diff --git a/src/connectionstartframe.h b/src/connectionstartframe.h
index 42a23a6..6c1d46b 100644
--- a/src/connectionstartframe.h
+++ b/src/connectionstartframe.h
@@ -11,7 +11,7 @@
 /**
  *  Dependencies
  */
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(_WIN64)
 #include "programname.h"
 #include "platformname.h"
 #endif
@@ -225,7 +225,7 @@ public:
         if (!properties.contains("information")) properties["information"] = "https://github.com/CopernicaMarketingSoftware/AMQP-CPP";
         if (!properties.contains("capabilities")) properties["capabilities"] = capabilities;
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
         // i don't know that much about win32, so let's use hardcoded string
         if (!properties.contains("product")) properties["product"] = "application based on AMQP-CPP";
         if (!properties.contains("platform")) properties["platform"] = "windows";
diff --git a/src/programname.h b/src/programname.h
index edae22d..4a16c35 100644
--- a/src/programname.h
+++ b/src/programname.h
@@ -15,8 +15,8 @@
 /**
  *  Dependencies
  */
-#include <unistd.h>
 #include <limits.h>
+#include <unistd.h>
 
 /**
  *  Begin of namespace