diff --git a/rosapps/regedt32/Makefile b/rosapps/regedt32/Makefile
index e524046ee28..44fe5dd1647 100644
--- a/rosapps/regedt32/Makefile
+++ b/rosapps/regedt32/Makefile
@@ -86,4 +86,4 @@ clean:
 	- $(RM) $(TARGET).sym
 	- $(RM) $(TARGET).coff
 
-include ../rules.mak
+include $(PATH_TO_TOP)/rules.mak
diff --git a/rosapps/regedt32/about.h b/rosapps/regedt32/about.h
index fabcfb3d618..bfe6e6ed85c 100644
--- a/rosapps/regedt32/about.h
+++ b/rosapps/regedt32/about.h
@@ -23,8 +23,15 @@
 #ifndef __ABOUT_H__
 #define __ABOUT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 void ShowAboutBox(HWND hWnd);
 
 
+#ifdef __cplusplus
+};
+#endif
+
 #endif // __ABOUT_H__
diff --git a/rosapps/regedt32/regedt32.rc b/rosapps/regedt32/regedt32.rc
index b922f364348..cf2e9d4b201 100644
--- a/rosapps/regedt32/regedt32.rc
+++ b/rosapps/regedt32/regedt32.rc
@@ -31,8 +31,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_REGEDT32            ICON    DISCARDABLE     "regedt32.ICO"
-IDI_SMALL               ICON    DISCARDABLE     "SMALL.ICO"
+IDI_REGEDT32            ICON    DISCARDABLE     "res/regedt32.ico"
+IDI_SMALL               ICON    DISCARDABLE     "res/small.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //