diff --git a/raylib/audio.c b/raylib/audio.c
index 5efca74..23a834d 100644
--- a/raylib/audio.c
+++ b/raylib/audio.c
@@ -1,4 +1,4 @@
-// +build !noaudio
+// +build !noaudio,!js
 
 /**********************************************************************************************
 *
diff --git a/raylib/audio.go b/raylib/audio.go
index 2b7c621..fd5079f 100644
--- a/raylib/audio.go
+++ b/raylib/audio.go
@@ -1,4 +1,4 @@
-// +build !noaudio
+// +build !noaudio,!js
 
 package raylib
 
diff --git a/raylib/camera.go b/raylib/camera.go
index 960cf7b..e224dcd 100644
--- a/raylib/camera.go
+++ b/raylib/camera.go
@@ -1,4 +1,4 @@
-// +build !android
+// +build !android,!js
 
 package raylib
 
diff --git a/raylib/cgo.go b/raylib/cgo.go
index 18f493c..3046677 100644
--- a/raylib/cgo.go
+++ b/raylib/cgo.go
@@ -1,3 +1,5 @@
+// +build !js
+
 package raylib
 
 /*
diff --git a/raylib/cgo_android.go b/raylib/cgo_android.go
index e56b130..50459f5 100644
--- a/raylib/cgo_android.go
+++ b/raylib/cgo_android.go
@@ -1,4 +1,4 @@
-// +build android
+// +build android,!js
 
 package raylib
 
diff --git a/raylib/cgo_darwin.go b/raylib/cgo_darwin.go
index 8b7bf07..8c96fea 100644
--- a/raylib/cgo_darwin.go
+++ b/raylib/cgo_darwin.go
@@ -1,4 +1,4 @@
-// +build darwin
+// +build darwin,!js
 
 package raylib
 
diff --git a/raylib/cgo_linux.go b/raylib/cgo_linux.go
index 5297216..2675bc6 100644
--- a/raylib/cgo_linux.go
+++ b/raylib/cgo_linux.go
@@ -1,4 +1,4 @@
-// +build linux,!arm,!arm64
+// +build linux,!arm,!arm64,!js
 
 package raylib
 
diff --git a/raylib/cgo_linux_arm.go b/raylib/cgo_linux_arm.go
index 3326212..739d508 100644
--- a/raylib/cgo_linux_arm.go
+++ b/raylib/cgo_linux_arm.go
@@ -1,4 +1,4 @@
-// +build linux,arm,!android
+// +build linux,arm,!android,!js
 
 package raylib
 
diff --git a/raylib/cgo_windows.go b/raylib/cgo_windows.go
index 6615cc2..4245ba4 100644
--- a/raylib/cgo_windows.go
+++ b/raylib/cgo_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+// +build windows,!js
 
 package raylib
 
diff --git a/raylib/core.c b/raylib/core.c
index 36b9de6..1d57704 100644
--- a/raylib/core.c
+++ b/raylib/core.c
@@ -1,3 +1,5 @@
+// +build !js
+
 /**********************************************************************************************
 *
 *   raylib.core - Basic functions to manage windows, OpenGL context and input on multiple platforms
diff --git a/raylib/core.go b/raylib/core.go
index 0351705..bcf1e5a 100644
--- a/raylib/core.go
+++ b/raylib/core.go
@@ -1,3 +1,5 @@
+// +build !js
+
 package raylib
 
 /*
diff --git a/raylib/gestures.go b/raylib/gestures.go
index efe34ba..e1ec0cf 100644
--- a/raylib/gestures.go
+++ b/raylib/gestures.go
@@ -1,3 +1,5 @@
+// +build !js
+
 package raylib
 
 /*
diff --git a/raylib/mini_al.c b/raylib/mini_al.c
index 7b43785..6475476 100644
--- a/raylib/mini_al.c
+++ b/raylib/mini_al.c
@@ -1,4 +1,6 @@
+// +build !js
+
 // The implementation of mini_al needs to #include windows.h which means it needs to go into
 // it's own translation unit. Not doing this will cause conflicts with CloseWindow(), etc.
 #define MAL_IMPLEMENTATION
-#include "mini_al.h"
\ No newline at end of file
+#include "mini_al.h"
diff --git a/raylib/models.c b/raylib/models.c
index 4b8a673..1fd3999 100644
--- a/raylib/models.c
+++ b/raylib/models.c
@@ -1,3 +1,5 @@
+// +build !js
+
 /**********************************************************************************************
 *
 *   raylib.models - Basic functions to deal with 3d shapes and 3d models
diff --git a/raylib/models.go b/raylib/models.go
index c9b3e19..7c88250 100644
--- a/raylib/models.go
+++ b/raylib/models.go
@@ -1,3 +1,5 @@
+// +build !js
+
 package raylib
 
 /*
diff --git a/raylib/platform_android.c b/raylib/platform_android.c
index 8212e0c..021f27f 100644
--- a/raylib/platform_android.c
+++ b/raylib/platform_android.c
@@ -1,4 +1,4 @@
-// +build android
+// +build android,!js
 
 #include "_cgo_export.h"
 
diff --git a/raylib/platform_android.go b/raylib/platform_android.go
index bba458f..31f3841 100644
--- a/raylib/platform_android.go
+++ b/raylib/platform_android.go
@@ -1,4 +1,4 @@
-// +build android
+// +build android,!js
 
 package raylib
 
diff --git a/raylib/platform_arm.go b/raylib/platform_arm.go
index 0139729..241d733 100644
--- a/raylib/platform_arm.go
+++ b/raylib/platform_arm.go
@@ -1,4 +1,4 @@
-// +build !android,arm
+// +build !android,arm,!js
 
 package raylib
 
diff --git a/raylib/platform_desktop.go b/raylib/platform_desktop.go
index 3994cd8..cedc2d4 100644
--- a/raylib/platform_desktop.go
+++ b/raylib/platform_desktop.go
@@ -1,4 +1,4 @@
-// +build !android,!arm
+// +build !android,!arm,!js
 
 package raylib
 
diff --git a/raylib/rlgl.c b/raylib/rlgl.c
index 6ae7df4..0319a17 100644
--- a/raylib/rlgl.c
+++ b/raylib/rlgl.c
@@ -1,3 +1,5 @@
+// +build !js
+
 /**********************************************************************************************
 *
 *   rlgl - raylib OpenGL abstraction layer
diff --git a/raylib/shaders.go b/raylib/shaders.go
index ae11b6c..61893f9 100644
--- a/raylib/shaders.go
+++ b/raylib/shaders.go
@@ -1,3 +1,5 @@
+// +build !js
+
 package raylib
 
 /*
diff --git a/raylib/shapes.c b/raylib/shapes.c
index 0b34f92..970b7fe 100644
--- a/raylib/shapes.c
+++ b/raylib/shapes.c
@@ -1,3 +1,5 @@
+// +build !js
+
 /**********************************************************************************************
 *
 *   raylib.shapes - Basic functions to draw 2d Shapes and check collisions
diff --git a/raylib/shapes.go b/raylib/shapes.go
index 5deed7b..8f81df3 100644
--- a/raylib/shapes.go
+++ b/raylib/shapes.go
@@ -1,3 +1,5 @@
+// +build !js
+
 package raylib
 
 /*
diff --git a/raylib/text.c b/raylib/text.c
index 8db2fc9..5998978 100644
--- a/raylib/text.c
+++ b/raylib/text.c
@@ -1,3 +1,5 @@
+// +build !js
+
 /**********************************************************************************************
 *
 *   raylib.text - Basic functions to load SpriteFonts and draw Text
diff --git a/raylib/text.go b/raylib/text.go
index 94affec..253fd11 100644
--- a/raylib/text.go
+++ b/raylib/text.go
@@ -1,3 +1,5 @@
+// +build !js
+
 package raylib
 
 /*
diff --git a/raylib/textures.c b/raylib/textures.c
index 090de24..d24a72d 100644
--- a/raylib/textures.c
+++ b/raylib/textures.c
@@ -1,3 +1,5 @@
+// +build !js
+
 /**********************************************************************************************
 *
 *   raylib.textures - Basic functions to load and draw Textures (2d)
diff --git a/raylib/textures.go b/raylib/textures.go
index 3141eab..ab05b50 100644
--- a/raylib/textures.go
+++ b/raylib/textures.go
@@ -1,3 +1,5 @@
+// +build !js
+
 package raylib
 
 /*
diff --git a/raylib/utils.c b/raylib/utils.c
index 967ed91..5c91f4c 100644
--- a/raylib/utils.c
+++ b/raylib/utils.c
@@ -1,3 +1,5 @@
+// +build !js
+
 /**********************************************************************************************
 *
 *   raylib.utils - Some common utility functions
diff --git a/raylib/utils.go b/raylib/utils.go
index 2ca8842..15f4033 100644
--- a/raylib/utils.go
+++ b/raylib/utils.go
@@ -1,4 +1,4 @@
-// +build !android,!windows
+// +build !android,!windows,!js
 
 package raylib
 
diff --git a/raylib/utils_android.c b/raylib/utils_android.c
index 9f290f2..26dad23 100644
--- a/raylib/utils_android.c
+++ b/raylib/utils_android.c
@@ -1,4 +1,4 @@
-// +build android
+// +build android,!js
 
 #include "_cgo_export.h"
 #include <android/log.h>
diff --git a/raylib/utils_android.go b/raylib/utils_android.go
index 0863cf0..7f797c9 100644
--- a/raylib/utils_android.go
+++ b/raylib/utils_android.go
@@ -1,4 +1,4 @@
-// +build android
+// +build android,!js
 
 package raylib
 
diff --git a/raylib/utils_windows.go b/raylib/utils_windows.go
index acc6a81..7814c97 100644
--- a/raylib/utils_windows.go
+++ b/raylib/utils_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+// +build windows,!js
 
 package raylib