diff --git a/Makefile b/Makefile
index beb26cc8..b9f321dd 100644
--- a/Makefile
+++ b/Makefile
@@ -41,8 +41,11 @@ endif
 
 app: ## Build goneovim
 	@test -f ./editor/moc.go & $(GOQTMOC) desktop ./cmd/goneovim && \
-	go generate && \
-	$(GOQTDEPLOY) build desktop ./cmd/goneovim && \
+	go generate
+ifneq ($(OSNAME),Darwin)
+	@rm -fr editor/objcbridge*
+endif
+	@$(GOQTDEPLOY) build desktop ./cmd/goneovim && \
 	cp -pR runtime $(RUNTIME_DIR)
 ifeq ($(OSNAME),Darwin)
 	@/usr/libexec/PlistBuddy -c "Add :CFBundleVersion string $(VERSION_HASH)" "./cmd/goneovim/deploy/darwin/goneovim.app/Contents/Info.plist" && \
@@ -75,8 +78,11 @@ deps: ## Get dependent libraries.
 	@$(GOQTMOC) desktop ./cmd/goneovim
 
 test: ## Test goneovim
-	@go generate && \
-	go test ./editor
+	@go generate
+ifneq ($(OSNAME),Darwin)
+	@rm -fr editor/objcbridge*
+endif
+	@go test ./editor
 
 clean: ## Delete pre-built application binaries and Moc files.
 	@rm -fr cmd/goneovim/deploy/*
diff --git a/editor/objcbridge.h b/editor/objcbridge.h
index b6a6674c..87b503d6 100644
--- a/editor/objcbridge.h
+++ b/editor/objcbridge.h
@@ -1,4 +1 @@
-#ifdef __APPLE__
 void SetMyApplicationDelegate();
-#else
-#endif
diff --git a/editor/objcbridge.m b/editor/objcbridge.m
index d9017cfb..e4c6875b 100644
--- a/editor/objcbridge.m
+++ b/editor/objcbridge.m
@@ -1,4 +1,3 @@
-#ifdef __APPLE__
 #import <Cocoa/Cocoa.h>
 
 char *cFilename;
@@ -29,5 +28,3 @@ void SetMyApplicationDelegate() {
     app.delegate = [[MyApplicationDelegate alloc] init];
     [app activateIgnoringOtherApps:YES]; // make application foreground
 }
-#else
-#endif