diff --git a/Makefile b/Makefile
index 688cabd2f5..41cf227758 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,10 @@ else
 LDFLAGS = -lncurses
 endif
 
+ifeq ($(OS), Cygwin)
+CFLAGS += -DNCURSES
+endif
+
 SOURCES = $(wildcard *.cpp)
 _OBJS = $(SOURCES:.cpp=.o)
 OBJS = $(patsubst %,$(ODIR)/%,$(_OBJS))
diff --git a/catacurse.h b/catacurse.h
index b35268c09c..5d0abed513 100644
--- a/catacurse.h
+++ b/catacurse.h
@@ -1,5 +1,16 @@
 #ifndef __CATACURSE__
 #define __CATACURSE__
+
+#if !defined(_WIN32) && !defined(WINDOWS)
+
+	#if defined(NCURSES)
+		#include <ncurses/curses.h>
+	#else
+		#include <curses.h>
+	#endif
+
+#else
+
 #define _WIN32_WINNT 0x0500
 #define WIN32_LEAN_AND_MEAN
 //#define VC_EXTRALEAN
@@ -149,4 +160,7 @@ bool WinCreate(bool initgl);
 void CheckMessages();
 int FindWin(WINDOW *wnd);
 LRESULT CALLBACK ProcessMessages(HWND__ *hWnd,u_int32_t Msg,WPARAM wParam, LPARAM lParam);
+
+#endif // windows ifdef block
+
 #endif
diff --git a/color.h b/color.h
index e73be52035..86db476d20 100644
--- a/color.h
+++ b/color.h
@@ -1,11 +1,7 @@
 #ifndef _COLOR_H_
 #define _COLOR_H
 
-#if (defined _WIN32 || defined WINDOWS)
-	#include "catacurse.h"
-#else
-	#include <curses.h>
-#endif
+#include "catacurse.h"
 
 #ifndef _COLOR_LIST_
 #define _COLOR_LIST_
diff --git a/item.cpp b/item.cpp
index 73de077b5d..27ab07773b 100644
--- a/item.cpp
+++ b/item.cpp
@@ -5,11 +5,7 @@
 #include "game.h"
 #include <sstream>
 
-#if (defined _WIN32 || defined WINDOWS)
-	#include "catacurse.h"
-#else
-	#include <curses.h>
-#endif
+#include "catacurse.h"
 
 bool is_flammable(material m);
 
diff --git a/keypress.h b/keypress.h
index bfa042fafd..d5553180f1 100644
--- a/keypress.h
+++ b/keypress.h
@@ -1,11 +1,7 @@
 #ifndef _KEYPRESS_H_
 #define _KEYPRESS_H_
-#if (defined _WIN32 || defined WINDOWS)
-	#include "catacurse.h"
-#else
-	#include <curses.h>
-#endif
 
+#include "catacurse.h"
 #include <string>
 
 class game;
diff --git a/main.cpp b/main.cpp
index 19d054d601..d4e16fd8de 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,12 +4,7 @@
  * Who knows
  */
 
-#if (defined _WIN32 || defined WINDOWS)
-	#include "catacurse.h"
-#else
-	#include <curses.h>
-#endif
-
+#include "catacurse.h"
 #include <ctime>
 #include "game.h"
 #include "color.h"
diff --git a/map.h b/map.h
index 854de949f7..bb89600604 100644
--- a/map.h
+++ b/map.h
@@ -1,11 +1,7 @@
 #ifndef _MAP_H_
 #define _MAP_H_
 
-#if (defined _WIN32 || defined WINDOWS)
-	#include "catacurse.h"
-#else
-	#include <curses.h>
-#endif
+#include "catacurse.h"
 
 #include <stdlib.h>
 #include <vector>
diff --git a/melee.cpp b/melee.cpp
index 621833f677..3b51a6b605 100644
--- a/melee.cpp
+++ b/melee.cpp
@@ -5,11 +5,7 @@
 #include <sstream>
 #include <stdlib.h>
 
-#if (defined _WIN32 || defined WINDOWS)
-	#include "catacurse.h"
-#else
-	#include <curses.h>
-#endif
+#include "catacurse.h"
 
 void hit_message(game *g, std::string subject, std::string verb,
                  std::string target, int dam, bool crit);
diff --git a/monmove.cpp b/monmove.cpp
index b4b2ecb283..f3ac1bdd7b 100644
--- a/monmove.cpp
+++ b/monmove.cpp
@@ -8,11 +8,7 @@
 #include "pldata.h"
 #include <stdlib.h>
 
-#if (defined _WIN32 || defined WINDOWS)
-	#include "catacurse.h"
-#else
-	#include <curses.h>
-#endif
+#include "catacurse.h"
 
 #ifndef SGN
 #define SGN(a) (((a)<0) ? -1 : 1)
diff --git a/monster.cpp b/monster.cpp
index 75dac6ab8b..83c85fe6a7 100644
--- a/monster.cpp
+++ b/monster.cpp
@@ -9,11 +9,7 @@
 #include <fstream>
 #include <stdlib.h>
 
-#if (defined _WIN32 || defined WINDOWS)
-	#include "catacurse.h"
-#else
-	#include <curses.h>
-#endif
+#include "catacurse.h"
 
 #define SGN(a) (((a)<0) ? -1 : 1)
 #define SQR(a) ((a)*(a))
diff --git a/output.cpp b/output.cpp
index fb82783cf9..f0a354556f 100644
--- a/output.cpp
+++ b/output.cpp
@@ -1,9 +1,4 @@
-
-#if (defined _WIN32 || defined WINDOWS)
-	#include "catacurse.h"
-#else
-	#include <curses.h>
-#endif
+#include "catacurse.h"
 
 #include <string>
 #include <vector>
diff --git a/overmap.cpp b/overmap.cpp
index 42d36ad85c..93b4de87dd 100644
--- a/overmap.cpp
+++ b/overmap.cpp
@@ -1,8 +1,4 @@
-#if (defined _WIN32 || defined WINDOWS)
-	#include "catacurse.h"
-#else
-	#include <curses.h>
-#endif
+#include "catacurse.h"
 
 #include <stdlib.h>
 #include <time.h>
diff --git a/overmap.h b/overmap.h
index ce0cc80c08..c99fdb8c1b 100644
--- a/overmap.h
+++ b/overmap.h
@@ -8,11 +8,7 @@
 #include "output.h"
 #include <vector>
 
-#if (defined _WIN32 || defined WINDOWS)
-	#include "catacurse.h"
-#else
-	#include <curses.h>
-#endif
+#include "catacurse.h"
 
 
 class npc;
diff --git a/player.cpp b/player.cpp
index 2ac24e8557..78eb66416a 100644
--- a/player.cpp
+++ b/player.cpp
@@ -11,11 +11,7 @@
 #include <sstream>
 #include <stdlib.h>
 
-#if (defined _WIN32 || defined WINDOWS)
-	#include "catacurse.h"
-#else
-	#include <curses.h>
-#endif
+#include "catacurse.h"
 
 nc_color encumb_color(int level);
 bool activity_is_suspendable(activity_type type);
diff --git a/vehicle.cpp b/vehicle.cpp
index 537f6985ce..1f6df357ed 100644
--- a/vehicle.cpp
+++ b/vehicle.cpp
@@ -5,11 +5,8 @@
 #include "item.h"
 #include <sstream>
 #include <stdlib.h>
-#if (defined _WIN32 || defined WINDOWS)
-    #include "catacurse.h"
-#else
-    #include <curses.h>
-#endif
+
+#include "catacurse.h"
 
 vehicle::vehicle(game *ag, vhtype_id type_id): g(ag), type(type_id)
 {