diff --git a/programs/notepad/Bg.rc b/programs/notepad/Bg.rc
index 2a8dcad2336..85fb4fc5aa5 100644
--- a/programs/notepad/Bg.rc
+++ b/programs/notepad/Bg.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Cs.rc b/programs/notepad/Cs.rc
index f2720e5ceae..745062df6e5 100644
--- a/programs/notepad/Cs.rc
+++ b/programs/notepad/Cs.rc
@@ -22,6 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 /* Czech strings in CP1250 */
diff --git a/programs/notepad/Da.rc b/programs/notepad/Da.rc
index 5454ea22f34..d152cfeea66 100644
--- a/programs/notepad/Da.rc
+++ b/programs/notepad/Da.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/De.rc b/programs/notepad/De.rc
index fb315a863fb..2e7154abf59 100644
--- a/programs/notepad/De.rc
+++ b/programs/notepad/De.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 MAIN_MENU MENU
diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc
index c4a4baf440e..68edf51c7bb 100644
--- a/programs/notepad/En.rc
+++ b/programs/notepad/En.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Eo.rc b/programs/notepad/Eo.rc
index 7b75244c195..9aafbef8c85 100644
--- a/programs/notepad/Eo.rc
+++ b/programs/notepad/Eo.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Es.rc b/programs/notepad/Es.rc
index ae1e0f7a6e6..d73f167140d 100644
--- a/programs/notepad/Es.rc
+++ b/programs/notepad/Es.rc
@@ -22,6 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Fi.rc b/programs/notepad/Fi.rc
index 914a03f9710..637dc7726ca 100644
--- a/programs/notepad/Fi.rc
+++ b/programs/notepad/Fi.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Fr.rc b/programs/notepad/Fr.rc
index 506fd523b41..d46711cc38d 100644
--- a/programs/notepad/Fr.rc
+++ b/programs/notepad/Fr.rc
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Hu.rc b/programs/notepad/Hu.rc
index 9bf29866c9f..e1251b5215f 100644
--- a/programs/notepad/Hu.rc
+++ b/programs/notepad/Hu.rc
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 {
  POPUP "&F�jl" {
diff --git a/programs/notepad/It.rc b/programs/notepad/It.rc
index 755b08a15ff..b8fb42ab5cc 100644
--- a/programs/notepad/It.rc
+++ b/programs/notepad/It.rc
@@ -23,6 +23,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Ja.rc b/programs/notepad/Ja.rc
index 1ad40629e19..fcb81686e63 100644
--- a/programs/notepad/Ja.rc
+++ b/programs/notepad/Ja.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -123,5 +125,3 @@ STRING_OUT_OF_MEMORY,                   "この操作を実行するためのメ
 下さい。"
 
 }
-
-#pragma code_page(default)
diff --git a/programs/notepad/Ko.rc b/programs/notepad/Ko.rc
index 3b4e5d470fe..b838cbf4f67 100644
--- a/programs/notepad/Ko.rc
+++ b/programs/notepad/Ko.rc
@@ -22,6 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Lt.rc b/programs/notepad/Lt.rc
index c3ccfb95237..0a123056d9f 100644
--- a/programs/notepad/Lt.rc
+++ b/programs/notepad/Lt.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -120,4 +122,3 @@ STRING_OUT_OF_MEMORY,                  "Neužtenka atminties operacijai užbaigt
                                        Norėdami atlaisvinti atminties uždarykite vieną ar daugiau programų."
 
 }
-#pragma code_page(default)
diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index fcdc8729600..c48acf7350e 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -13,7 +13,34 @@ C_SRCS = \
 	dialog.c \
 	main.c
 
-RC_SRCS = rsrc.rc
+RC_SRCS = \
+	Bg.rc \
+	Cs.rc \
+	Da.rc \
+	De.rc \
+	En.rc \
+	Eo.rc \
+	Es.rc \
+	Fi.rc \
+	Fr.rc \
+	Hu.rc \
+	It.rc \
+	Ja.rc \
+	Ko.rc \
+	Lt.rc \
+	Nl.rc \
+	No.rc \
+	Pl.rc \
+	Pt.rc \
+	Ro.rc \
+	Ru.rc \
+	Si.rc \
+	Sv.rc \
+	Th.rc \
+	Tr.rc \
+	Wa.rc \
+	Zh.rc \
+	rsrc.rc
 
 SVG_SRCS = notepad.svg
 
diff --git a/programs/notepad/Nl.rc b/programs/notepad/Nl.rc
index e4d12217c64..77ee3e166a3 100644
--- a/programs/notepad/Nl.rc
+++ b/programs/notepad/Nl.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 MAIN_MENU MENU
diff --git a/programs/notepad/No.rc b/programs/notepad/No.rc
index 6692561b697..fe3f19ec16f 100644
--- a/programs/notepad/No.rc
+++ b/programs/notepad/No.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Pl.rc b/programs/notepad/Pl.rc
index c05c715be97..f7dbfe008b1 100644
--- a/programs/notepad/Pl.rc
+++ b/programs/notepad/Pl.rc
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Pt.rc b/programs/notepad/Pt.rc
index b9ef4d9a6ce..8ad08093bfb 100644
--- a/programs/notepad/Pt.rc
+++ b/programs/notepad/Pt.rc
@@ -22,6 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Ro.rc b/programs/notepad/Ro.rc
index 9685de903af..a00be21eaad 100644
--- a/programs/notepad/Ro.rc
+++ b/programs/notepad/Ro.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
@@ -114,5 +116,3 @@ STRING_NOTFOUND,                "'%s' nu a fost găsit."
 STRING_OUT_OF_MEMORY,           "Nu este destulă memorie pentru a completa această sarcină.\nÎnchideți una sau mai multe aplicații pentru a mări memoria liberă."
 
 }
-
-#pragma code_page(default)
diff --git a/programs/notepad/Ru.rc b/programs/notepad/Ru.rc
index 439c1ebca9d..6e9f64ed64e 100644
--- a/programs/notepad/Ru.rc
+++ b/programs/notepad/Ru.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Si.rc b/programs/notepad/Si.rc
index a1ffc731ce4..57a8071dd53 100644
--- a/programs/notepad/Si.rc
+++ b/programs/notepad/Si.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -119,5 +121,3 @@ STRING_OUT_OF_MEMORY,                   "Za dokončanje operacije je na voljo pr
 pomnilnika.\nZaprite enega ali več programov in poskusite znova."
 
 }
-
-#pragma code_page(default)
diff --git a/programs/notepad/Sv.rc b/programs/notepad/Sv.rc
index 7e4aa294c1f..f2893b03f14 100644
--- a/programs/notepad/Sv.rc
+++ b/programs/notepad/Sv.rc
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Th.rc b/programs/notepad/Th.rc
index 988a39210d4..10a6db56c6c 100644
--- a/programs/notepad/Th.rc
+++ b/programs/notepad/Th.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_THAI, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Tr.rc b/programs/notepad/Tr.rc
index 172193cc7ae..31b02652fa1 100644
--- a/programs/notepad/Tr.rc
+++ b/programs/notepad/Tr.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Wa.rc b/programs/notepad/Wa.rc
index 88f206889ae..1856490b9a7 100644
--- a/programs/notepad/Wa.rc
+++ b/programs/notepad/Wa.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 #ifdef LANG_WALON
 
 LANGUAGE LANG_WALON, SUBLANG_DEFAULT
diff --git a/programs/notepad/Zh.rc b/programs/notepad/Zh.rc
index 040b8cc2263..005c67d9ce9 100644
--- a/programs/notepad/Zh.rc
+++ b/programs/notepad/Zh.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
@@ -212,5 +214,3 @@ STRING_NOTSAVED,       "檔案 '%s'\n正文已更改\n\n是否儲存更改？"
 STRING_NOTFOUND,       "找不到: '%s'"
 STRING_OUT_OF_MEMORY,  "沒有足夠的內存來完成此項任務,\n請關閉一些程式後再試。"
 }
-
-#pragma code_page(default)
diff --git a/programs/notepad/notepad_res.h b/programs/notepad/notepad_res.h
index 8176b855e7f..e8e6317cd5e 100644
--- a/programs/notepad/notepad_res.h
+++ b/programs/notepad/notepad_res.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <windef.h>
+#include <winuser.h>
+
 #define MAIN_MENU               0x201
 #define DIALOG_PAGESETUP        0x202
 #define ID_ACCEL                0x203
diff --git a/programs/notepad/rsrc.rc b/programs/notepad/rsrc.rc
index 50b3558f5ad..f796d92d52b 100644
--- a/programs/notepad/rsrc.rc
+++ b/programs/notepad/rsrc.rc
@@ -17,12 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "main.h"
-#include "winnls.h"
-#include "commctrl.h"
 #include "notepad_res.h"
 
 ID_ACCEL ACCELERATORS
@@ -47,30 +41,3 @@ ID_ACCEL ACCELERATORS
 
 /* @makedep: notepad.ico */
 IDI_NOTEPAD ICON "notepad.ico"
-
-#include "Bg.rc"
-#include "Cs.rc"
-#include "Da.rc"
-#include "De.rc"
-#include "En.rc"
-#include "Eo.rc"
-#include "Es.rc"
-#include "Fi.rc"
-#include "Fr.rc"
-#include "Hu.rc"
-#include "It.rc"
-#include "Ja.rc"
-#include "Ko.rc"
-#include "Lt.rc"
-#include "Nl.rc"
-#include "No.rc"
-#include "Pl.rc"
-#include "Pt.rc"
-#include "Ro.rc"
-#include "Ru.rc"
-#include "Si.rc"
-#include "Sv.rc"
-#include "Th.rc"
-#include "Tr.rc"
-#include "Wa.rc"
-#include "Zh.rc"