diff --git a/scripts/includes/mac.sh b/scripts/includes/mac.sh
new file mode 100644
index 0000000..a01e74b
--- /dev/null
+++ b/scripts/includes/mac.sh
@@ -0,0 +1,17 @@
+# Mac-only commands
+if [[ $OSTYPE == 'darwin'* ]]; then
+    alias ports="netstat -ap tcp | grep -i \"listen\""
+    alias trash="rmtrash"
+    alias checkrain="/Applications/checkra1n.app/Contents/MacOS/checkra1n"
+    alias obs="open -n -a OBS.app"
+    
+    # Java
+    export JDK8="/usr/local/opt/openjdk@8/libexec/openjdk.jdk/Contents/Home"
+    export JDK11="/usr/local/opt/openjdk@11/libexec/openjdk.jdk/Contents/Home"
+    export JDK16="/usr/local/opt/openjdk@16/libexec/openjdk.jdk/Contents/Home"
+    alias java8="${JDK8}/bin/java"
+    alias java11="${JDK11}/bin/java"
+    alias java16="${JDK16}/bin/java"
+    export JAVA_HOME=${JDK11}
+    export PATH="${JDK11}/bin:$PATH"
+fi
diff --git a/scripts/zshrc.sh b/scripts/zshrc.sh
index dca7a7c..a5ebfc1 100644
--- a/scripts/zshrc.sh
+++ b/scripts/zshrc.sh
@@ -27,14 +27,6 @@ alias fuss='fileusage | sortsize'
 
 alias ds-clean="sudo find ./ -name \".DS_Store\" -depth -exec rm {} \;"
 
-# Mac-only commands
-if [[ $OSTYPE == 'darwin'* ]]; then
-    alias ports="netstat -ap tcp | grep -i \"listen\""
-    alias trash="rmtrash"
-    alias checkrain="/Applications/checkra1n.app/Contents/MacOS/checkra1n"
-    alias obs="open -n -a OBS.app"
-fi
-
 # Lisp wrapper
 lisp() {
     ros run --load $1 --quit
@@ -118,19 +110,6 @@ else
 fi
 PROMPT=$(color "$PROMPT &r%~&n> ")
 
-# Mac-only paths
-if [[ $OSTYPE == 'darwin'* ]]; then
-    # Java
-    export JDK8="/usr/local/opt/openjdk@8/libexec/openjdk.jdk/Contents/Home"
-    export JDK11="/usr/local/opt/openjdk@11/libexec/openjdk.jdk/Contents/Home"
-    export JDK16="/usr/local/opt/openjdk@16/libexec/openjdk.jdk/Contents/Home"
-    alias java8="${JDK8}/bin/java"
-    alias java11="${JDK11}/bin/java"
-    alias java16="${JDK16}/bin/java"
-    export JAVA_HOME=${JDK11}
-    export PATH="${JDK11}/bin:$PATH"
-fi
-
 # Includes
 . $SCR/includes/*