diff -Nur rhide-1.5/commands.cc rhide-1.5-gcc3/commands.cc
--- rhide-1.5/commands.cc	2003-01-04 09:54:51.000000000 +0100
+++ rhide-1.5-gcc3/commands.cc	2003-05-09 02:07:29.000000000 +0200
@@ -147,8 +147,7 @@
   __CM(SaveSameTime,121)\
   __CM(WrapOn,122)\
   __CM(WrapOff,123)\
-  __CM(WrapToggle,124)\
-  __CM(UpdateCodePage,125)
+  __CM(WrapToggle,124)
 #undef __CM
 #define __CM(x,y) add_command_constant("cmc"#x,cmc##x);
 __RHIDE_EDITOR_COMMANDS__}
diff -Nur rhide-1.5/idedebug.cc rhide-1.5-gcc3/idedebug.cc
--- rhide-1.5/idedebug.cc	2002-04-10 21:33:37.000000000 +0200
+++ rhide-1.5-gcc3/idedebug.cc	2003-05-09 02:07:56.000000000 +0200
@@ -433,11 +433,11 @@
 static void
 StartSession()
 {
-  if (!dual_display && UseDualDisplay && dual_display_supported())
+  if (!TDisplay::dual_display && UseDualDisplay && dual_display_supported())
   {
     TMouse::suspend();
     TScreen::suspend();
-    dual_display = 1;
+    TDisplay::dual_display = 1;
     TScreen::resume();
     TMouse::resume();
     TProgram::application->setScreenMode(Project.screen_mode);
@@ -460,11 +460,11 @@
 static void
 EndSession(int exit_code)
 {
-  if (dual_display && UseDualDisplay)
+  if (TDisplay::dual_display && UseDualDisplay)
   {
     TMouse::suspend();
     TScreen::suspend();
-    dual_display = 0;
+    TDisplay::dual_display = 0;
     TScreen::resume();
     TMouse::resume();
     TProgram::application->setScreenMode(Project.screen_mode);
@@ -509,11 +509,11 @@
 static void
 BreakSession()
 {
-  if (dual_display && UseDualDisplay)
+  if (TDisplay::dual_display && UseDualDisplay)
   {
     TMouse::suspend();
     TScreen::suspend();
-    dual_display = 0;
+    TDisplay::dual_display = 0;
     TScreen::resume();
     TMouse::resume();
     TProgram::application->setScreenMode(Project.screen_mode);
diff -Nur rhide-1.5/idemain.cc rhide-1.5-gcc3/idemain.cc
--- rhide-1.5/idemain.cc	2002-02-14 19:33:51.000000000 +0100
+++ rhide-1.5-gcc3/idemain.cc	2003-05-09 02:07:50.000000000 +0200
@@ -739,7 +739,7 @@
     D(cmCompile);
   }
 
-  if (dual_display)
+  if (TDisplay::dual_display)
   {
     D(cmUserScreen);
   }
@@ -1726,11 +1726,7 @@
 
           TMouse::suspend();
           update_flag = 0;
-#ifdef __linux__
-          RestoreScreen();
-#else
           TScreen::suspend();
-#endif
           do
           {
             idle();
@@ -1932,8 +1928,9 @@
   char *_rhide_opt = expand_rhide_spec("$(RHIDEOPT)");
   char *rhide_opt = NULL;
 
+#ifdef __DJGPP__
   TGKey::useBIOS = 0;
-
+#endif
   if (*_rhide_opt)
   {
     rhide_opt = (char *) alloca(strlen(_rhide_opt));
@@ -1977,7 +1974,7 @@
           break;
         case 'H':
 #ifdef __linux__
-          extern int install_console_sigs;
+          int install_console_sigs;
 
           install_console_sigs = 0;
 #endif
@@ -2001,7 +1998,9 @@
 #endif
           break;
         case 'K':
+#ifdef __DJGPP__
           TGKey::useBIOS = 1;
+#endif
           break;
         case 'G':
           arg = next_option(rhide_opt, rhide_opt_end, i, argc, argv);
@@ -2014,7 +2013,9 @@
 #endif
           break;
         case 'p':
+#ifdef __DJGPP__
           TGKey::translateKeyPad = 0;
+#endif
           break;
         case 'k':
           arg = next_option(rhide_opt, rhide_opt_end, i, argc, argv);
diff -Nur rhide-1.5/ideprj.cc rhide-1.5-gcc3/ideprj.cc
--- rhide-1.5/ideprj.cc	2003-01-04 09:54:56.000000000 +0100
+++ rhide-1.5-gcc3/ideprj.cc	2003-05-09 02:08:06.000000000 +0200
@@ -315,19 +315,11 @@
 
 }
 
-/* They are in tscreen.cc */
-void setBlinkState(void);
-void setIntenseState(void);
-
 void
 SetProjectScreenMode()
 {
   if (TScreen::screenMode != Project.screen_mode)
     TProgram::application->setScreenMode(Project.screen_mode);
-  if (IntenseMode)
-    setIntenseState();
-  else
-    setBlinkState();
 }
 
 static void
diff -Nur rhide-1.5/rhgdb/main.cc rhide-1.5-gcc3/rhgdb/main.cc
--- rhide-1.5/rhgdb/main.cc	2002-02-08 23:32:31.000000000 +0100
+++ rhide-1.5-gcc3/rhgdb/main.cc	2003-05-09 02:08:40.000000000 +0200
@@ -591,8 +591,6 @@
           TMouse::suspend();
 #if 0
           TScreen::suspend();
-#else
-          RestoreScreen();
 #endif
           do
           {
@@ -790,12 +788,14 @@
           use_dual_display = 1;
           break;
         case 'M':
-          extern int use_mouse_handler;
+          int use_mouse_handler;
 
           use_mouse_handler = 0;
           break;
         case 'K':
+#ifdef __DJGPP__
           TGKey::useBIOS = 1;
+#endif
           break;
         case 'G':
 //          extern int screen_saving;
@@ -1241,11 +1241,11 @@
 StartSession()
 {
   old_mode = TScreen::getCrtMode();
-  if (!dual_display && use_dual_display && dual_display_supported())
+  if (!TDisplay::dual_display && use_dual_display && dual_display_supported())
   {
     TMouse::suspend();
     TScreen::suspend();
-    dual_display = 1;
+    TDisplay::dual_display = 1;
     TScreen::resume();
     TMouse::resume();
     TProgram::application->setScreenMode(old_mode);
@@ -1257,11 +1257,11 @@
 static void
 EndSession(int exit_code)
 {
-  if (dual_display && use_dual_display)
+  if (TDisplay::dual_display && use_dual_display)
   {
     TMouse::suspend();
     TScreen::suspend();
-    dual_display = 0;
+    TDisplay::dual_display = 0;
     TScreen::resume();
     TMouse::resume();
     TProgram::application->setScreenMode(old_mode);
@@ -1276,11 +1276,11 @@
 static void
 BreakSession()
 {
-  if (dual_display && use_dual_display)
+  if (TDisplay::dual_display && use_dual_display)
   {
     TMouse::suspend();
     TScreen::suspend();
-    dual_display = 0;
+    TDisplay::dual_display = 0;
     TScreen::resume();
     TMouse::resume();
     TProgram::application->setScreenMode(old_mode);