diff --git a/SConstruct b/SConstruct
index 2105e796a..0c4c5bb96 100644
--- a/SConstruct
+++ b/SConstruct
@@ -109,6 +109,8 @@ class DXXCommon:
 		self.env.Append(CFLAGS = ['-std=gnu99'])
 		self.env.Append(CPPDEFINES = ['NETWORK'])
 		self.env.Append(CPPPATH = ['common/include', 'common/main', '.'])
+		if (self.user_settings.editor == 1):
+			self.env.Append(CPPPATH = ['common/include/editor'])
 		# Get traditional compiler environment variables
 		for cc in ['CC', 'CXX']:
 			if os.environ.has_key(cc):
diff --git a/d1x-rebirth/include/editor/seguvs.h b/common/include/editor/seguvs.h
similarity index 100%
rename from d1x-rebirth/include/editor/seguvs.h
rename to common/include/editor/seguvs.h
diff --git a/d2x-rebirth/include/editor/seguvs.h b/d2x-rebirth/include/editor/seguvs.h
deleted file mode 100644
index 7d2d444a8..000000000
--- a/d2x-rebirth/include/editor/seguvs.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
-SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
-END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A
-ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS
-IN USING, DISPLAYING,  AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
-SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
-FREE PURPOSES.  IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE
-CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES.  THE END-USER UNDERSTANDS
-AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
-COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
-*/
-
-/*
- *
- * Header for seguvs.c
- *
- */
-
-#ifndef _SEGUVS_H
-#define _SEGUVS_H
-
-extern void assign_light_to_side(segment *sp, int sidenum);
-extern void assign_default_lighting_all(void);
-extern void stretch_uvs_from_curedge(segment *segp, int side);
-
-#endif