diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca176759..b6f0495f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,7 +106,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   set(PLATFORM_INCLUDES "lib/linux" ${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS})
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   # Windows.h defines to avoid as many issues as possible.
-  add_compile_definitions(WIN32_LEAN_AND_MEAN NOMINMAX NODRAWTEXT NOBITMAP NOMCX NOSERVICE NOHELP PRIMARY_HOG=\"d3-win.hog\"
+  add_compile_definitions(WIN32_LEAN_AND_MEAN NOMINMAX NODRAWTEXT NOBITMAP NOMCX NOSERVICE PRIMARY_HOG=\"d3-win.hog\"
           #[[NOGDI]] # We need GDI for now, enable when GDI is actually not needed (or when all windows.h mentions are gone)
   )
 
diff --git a/editor/BriefEdit.h b/editor/BriefEdit.h
index e1b7129c..16acaba6 100644
--- a/editor/BriefEdit.h
+++ b/editor/BriefEdit.h
@@ -39,10 +39,10 @@
 //	BriefGlobalValues
 //
 //	struct for global variables for a telcom briefing
-struct{
+struct BriefGlobalValues{
 	char title[128];
 	float static_val,glitch_val;
-}BriefGlobalValues;
+};
 
 #define BE_NONE			-1
 #define BE_TEXT			0
@@ -55,7 +55,7 @@ struct{
 //	tBriefEffect
 //
 //	struct for a briefing effect
-struct{
+struct tBriefEffect{
 	uint8_t type;							//type of effect (for union)
 	bool used;							//is the effect being used
 	int id;								//ID# used
@@ -72,16 +72,16 @@ struct{
 		TCBUTTONDESC	button_desc;
 	};
 	int next,prev;						//next/prev effect in list
-}tBriefEffect;
+};
 
-struct{
+struct tBriefScreen{
 	bool used;										//is screen being used
 	int root_effect;								//root effect to start the list
 	char layout[_MAX_PATH];							//layout screen to use
 	tBriefEffect effects[MAX_EFFECTS_PER_SCREEN];	//the effects for the screen
 	uint32_t mission_mask_set,mission_mask_unset;
 	int next,prev;									//next/prev screen in list
-}tBriefScreen;
+};
 
 extern int Briefing_root_screen;
 extern tBriefScreen Briefing_screens[MAX_TELCOM_SCREENS];
@@ -125,7 +125,7 @@ uint8_t BriefEditLoadScreens(char *filename,CComboBox *screen_combo,CComboBox *e
 
 
 #define MAX_LAYOUT_PREDEFS	10
-struct{
+struct tLayoutScreen{
 	char filename[_MAX_PATH];
 	int num_texts,num_bmps;
 	struct{
@@ -134,7 +134,7 @@ struct{
 	struct{
 		int x,y;
 	}bmps[MAX_LAYOUT_PREDEFS];
-}tLayoutScreen;
+};
 
 extern tLayoutScreen *PBlayouts;
 extern int *PBnum_layouts;
diff --git a/editor/ObjCScript.h b/editor/ObjCScript.h
index 722d3935..bf985040 100644
--- a/editor/ObjCScript.h
+++ b/editor/ObjCScript.h
@@ -140,8 +140,7 @@ struct tScriptName
 
 	void add_parameter(const char *type, const char *parm);
 	void free_parameters();
-}
-tScriptName;
+};
 
 //	per level script.
 extern char Level_script_name[];
diff --git a/editor/ObjectListDialog.h b/editor/ObjectListDialog.h
index 59dc401e..660ccbcf 100644
--- a/editor/ObjectListDialog.h
+++ b/editor/ObjectListDialog.h
@@ -85,8 +85,7 @@ private:
 	{
 		HTREEITEM hItem;
 		int handle;
-	}
-	tObjNode;
+	};
 
 	tObjNode *m_Leafs[MAX_OBJ_LEAFS];
 
diff --git a/editor/ScriptCompilerAPI.h b/editor/ScriptCompilerAPI.h
index 3fcbb305..4fc850bc 100644
--- a/editor/ScriptCompilerAPI.h
+++ b/editor/ScriptCompilerAPI.h
@@ -45,11 +45,11 @@
 
 #define ST_LEVEL	0
 #define ST_GAME		1
-struct{
+struct tCompilerInfo{
 	char source_filename[_MAX_PATH];
 	uint8_t script_type;
 	void (*callback)(char *str);
-}tCompilerInfo;
+};
 
 #define CERR_NOERR				0
 #define CERR_NOCOMPILERDEFINED	1
diff --git a/editor/ScriptSyncDialog.h b/editor/ScriptSyncDialog.h
index db829230..2f13327b 100644
--- a/editor/ScriptSyncDialog.h
+++ b/editor/ScriptSyncDialog.h
@@ -40,11 +40,11 @@
 #define STATE_ERROOS	5
 #define STATE_NOCOMPILER	6
 
-struct
+struct tFileInfo
 {
 	char filename[PAGENAME_LEN];
 	int state;
-}tFileInfo;
+};
 
 
 class CMyListCtrl : public CListCtrl
diff --git a/editor/d3edit.h b/editor/d3edit.h
index 6868994f..a4f302da 100644
--- a/editor/d3edit.h
+++ b/editor/d3edit.h
@@ -306,8 +306,8 @@
 #endif
 
 //Define group & room structs so we don't have to include group.h & room.h
-struct group group;
-struct room room;
+struct group;
+struct room;
 
 const int	TEXSCREEN_WIDTH		= 512,	// Texture screen base width and height
 			TEXSCREEN_HEIGHT	= 384,