diff --git a/.idea/modules.xml b/.idea/modules.xml
index d321f88..1577b1d 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -20,4 +20,9 @@
       </configuration>
     </configurations>
   </component>
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/aaruremote.iml" filepath="$PROJECT_DIR$/.idea/aaruremote.iml" />
+    </modules>
+  </component>
 </project>
\ No newline at end of file
diff --git a/hex2bin.c b/hex2bin.c
index 059f09a..2f366dc 100644
--- a/hex2bin.c
+++ b/hex2bin.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
 
diff --git a/main.c b/main.c
index 074ef2a..e56c94b 100644
--- a/main.c
+++ b/main.c
@@ -22,6 +22,8 @@
 #include <windows.h>
 
 #include "win32/win32.h"
+#else
+#include <stdint.h>
 #endif
 
 #include "aaruremote.h"
diff --git a/unix/hello.c b/unix/hello.c
index 5af1369..8827a4e 100644
--- a/unix/hello.c
+++ b/unix/hello.c
@@ -15,11 +15,16 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/utsname.h>
 
+#ifndef _WIN32
+#include <stdint.h>
+#endif
+
 #include "../aaruremote.h"
+#include "../endian.h"
 
 AaruPacketHello* GetHello()
 {
diff --git a/worker.c b/worker.c
index eb44797..e351f2d 100644
--- a/worker.c
+++ b/worker.c
@@ -26,6 +26,8 @@
 #include <windows.h>
 
 #include "win32/win32.h"
+#else
+#include <stdint.h>
 #endif
 
 #include "aaruremote.h"