diff --git a/makefile.gaz b/makefile.gaz
index b8503c4cc..0562a29de 100644
--- a/makefile.gaz
+++ b/makefile.gaz
@@ -51,8 +51,7 @@ CD_FILESYS_LIB :=		CMXBoot
 backend_src :=		gameover \
 					complete
 
-enemy_src :=		2denemy \
-					npc \
+enemy_src :=		npc \
 					npcdata \
 					npcpath \
 					nsjfish \
@@ -74,8 +73,7 @@ enemy_src :=		2denemy \
 					nocto \
 					nfskull \
 					nsklfish \
-					ngary \
-					enemy
+					ngary
 
 projectl_src :=		projectl
 
diff --git a/source/game/game.cpp b/source/game/game.cpp
index 51f873de7..369f16aab 100644
--- a/source/game/game.cpp
+++ b/source/game/game.cpp
@@ -23,8 +23,8 @@
 #endif
 #include "player\demoplay.h"
 
-#ifndef __ENEMY_2DENEMY_H__
-#include "enemy\2denemy.h"
+#ifndef	__ENEMY_NPC_H__
+#include "enemy\npc.h"
 #endif
 
 #ifndef __PROJECTL_PROJECTL_H__