diff --git a/core/org.eclipse.cdt.core.win32/library/winreg/Makefile b/core/org.eclipse.cdt.core.win32/library/winreg/Makefile
new file mode 100644
index 00000000000..be8a06fa3e9
--- /dev/null
+++ b/core/org.eclipse.cdt.core.win32/library/winreg/Makefile
@@ -0,0 +1,28 @@
+ifeq ($(JAVA_HOME),)
+$(warning JAVA_HOME not set in environment)
+endif
+
+# Defaults which can be overridden.
+OS = win32
+ARCH = x86
+
+JDK_INCLUDES = "$(JAVA_HOME)/include"
+JDK_OS_INCLUDES = "$(JAVA_HOME)/include/$(OS)"
+
+CXX = g++
+CXXFLAGS = -DUNICODE -I$(JDK_INCLUDES) -I$(JDK_OS_INCLUDES)
+
+INSTALL_DIR = ../../os/$(OS)/$(ARCH)
+
+TARGET = $(INSTALL_DIR)/winreg.dll
+OBJS = winreg.o
+
+all: $(TARGET)
+
+rebuild: clean all
+
+clean :
+	$(RM) $(OBJS)
+
+$(TARGET) : $(OBJS)
+	$(CXX) -Wl,--kill-at -shared -o $(TARGET) $(OBJS)
diff --git a/core/org.eclipse.cdt.core.win32/library/winreg.cpp b/core/org.eclipse.cdt.core.win32/library/winreg/winreg.cpp
similarity index 100%
rename from core/org.eclipse.cdt.core.win32/library/winreg.cpp
rename to core/org.eclipse.cdt.core.win32/library/winreg/winreg.cpp