diff --git a/src/libs/Jamfile b/src/libs/Jamfile
index 592c6b38bd..49c29eae18 100644
--- a/src/libs/Jamfile
+++ b/src/libs/Jamfile
@@ -9,6 +9,7 @@ SubInclude HAIKU_TOP src libs edit ;
 SubInclude HAIKU_TOP src libs expat ;
 SubInclude HAIKU_TOP src libs fluidsynth ;
 SubInclude HAIKU_TOP src libs freetype2 ;
+SubInclude HAIKU_TOP src libs glut ;
 SubInclude HAIKU_TOP src libs gnu ;
 SubInclude HAIKU_TOP src libs icon ;
 SubInclude HAIKU_TOP src libs iconv ;
diff --git a/src/libs/mesa/glut/Jamfile b/src/libs/glut/Jamfile
similarity index 95%
rename from src/libs/mesa/glut/Jamfile
rename to src/libs/glut/Jamfile
index 7f80af4e0e..8558018557 100644
--- a/src/libs/mesa/glut/Jamfile
+++ b/src/libs/glut/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src libs mesa glut ;
+SubDir HAIKU_TOP src libs glut ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
diff --git a/src/libs/mesa/glut/beos_x11.cpp b/src/libs/glut/beos_x11.cpp
similarity index 100%
rename from src/libs/mesa/glut/beos_x11.cpp
rename to src/libs/glut/beos_x11.cpp
diff --git a/src/libs/mesa/glut/beos_x11.h b/src/libs/glut/beos_x11.h
similarity index 100%
rename from src/libs/mesa/glut/beos_x11.h
rename to src/libs/glut/beos_x11.h
diff --git a/src/libs/mesa/glut/glutBlocker.cpp b/src/libs/glut/glutBlocker.cpp
similarity index 100%
rename from src/libs/mesa/glut/glutBlocker.cpp
rename to src/libs/glut/glutBlocker.cpp
diff --git a/src/libs/mesa/glut/glutBlocker.h b/src/libs/glut/glutBlocker.h
similarity index 100%
rename from src/libs/mesa/glut/glutBlocker.h
rename to src/libs/glut/glutBlocker.h
diff --git a/src/libs/mesa/glut/glutCallback.cpp b/src/libs/glut/glutCallback.cpp
similarity index 100%
rename from src/libs/mesa/glut/glutCallback.cpp
rename to src/libs/glut/glutCallback.cpp
diff --git a/src/libs/mesa/glut/glutColor.cpp b/src/libs/glut/glutColor.cpp
similarity index 100%
rename from src/libs/mesa/glut/glutColor.cpp
rename to src/libs/glut/glutColor.cpp
diff --git a/src/libs/mesa/glut/glutCursor.cpp b/src/libs/glut/glutCursor.cpp
similarity index 100%
rename from src/libs/mesa/glut/glutCursor.cpp
rename to src/libs/glut/glutCursor.cpp
diff --git a/src/libs/mesa/glut/glutCursors.h b/src/libs/glut/glutCursors.h
similarity index 100%
rename from src/libs/mesa/glut/glutCursors.h
rename to src/libs/glut/glutCursors.h
diff --git a/src/libs/mesa/glut/glutDstr.cpp b/src/libs/glut/glutDstr.cpp
similarity index 100%
rename from src/libs/mesa/glut/glutDstr.cpp
rename to src/libs/glut/glutDstr.cpp
diff --git a/src/libs/mesa/glut/glutEvent.cpp b/src/libs/glut/glutEvent.cpp
similarity index 100%
rename from src/libs/mesa/glut/glutEvent.cpp
rename to src/libs/glut/glutEvent.cpp
diff --git a/src/libs/mesa/glut/glutGameMode.cpp b/src/libs/glut/glutGameMode.cpp
similarity index 100%
rename from src/libs/mesa/glut/glutGameMode.cpp
rename to src/libs/glut/glutGameMode.cpp
diff --git a/src/libs/mesa/glut/glutGameMode.h b/src/libs/glut/glutGameMode.h
similarity index 100%
rename from src/libs/mesa/glut/glutGameMode.h
rename to src/libs/glut/glutGameMode.h
diff --git a/src/libs/mesa/glut/glutGet.cpp b/src/libs/glut/glutGet.cpp
similarity index 100%
rename from src/libs/mesa/glut/glutGet.cpp
rename to src/libs/glut/glutGet.cpp
diff --git a/src/libs/mesa/glut/glutInit.cpp b/src/libs/glut/glutInit.cpp
similarity index 100%
rename from src/libs/mesa/glut/glutInit.cpp
rename to src/libs/glut/glutInit.cpp
diff --git a/src/libs/mesa/glut/glutMenu.cpp b/src/libs/glut/glutMenu.cpp
similarity index 100%
rename from src/libs/mesa/glut/glutMenu.cpp
rename to src/libs/glut/glutMenu.cpp
diff --git a/src/libs/mesa/glut/glutMenu.h b/src/libs/glut/glutMenu.h
similarity index 100%
rename from src/libs/mesa/glut/glutMenu.h
rename to src/libs/glut/glutMenu.h
diff --git a/src/libs/mesa/glut/glutOverlay.cpp b/src/libs/glut/glutOverlay.cpp
similarity index 100%
rename from src/libs/mesa/glut/glutOverlay.cpp
rename to src/libs/glut/glutOverlay.cpp
diff --git a/src/libs/mesa/glut/glutState.h b/src/libs/glut/glutState.h
similarity index 100%
rename from src/libs/mesa/glut/glutState.h
rename to src/libs/glut/glutState.h
diff --git a/src/libs/mesa/glut/glutWindow.cpp b/src/libs/glut/glutWindow.cpp
similarity index 100%
rename from src/libs/mesa/glut/glutWindow.cpp
rename to src/libs/glut/glutWindow.cpp
diff --git a/src/libs/mesa/glut/glutWindow.h b/src/libs/glut/glutWindow.h
similarity index 100%
rename from src/libs/mesa/glut/glutWindow.h
rename to src/libs/glut/glutWindow.h
diff --git a/src/libs/mesa/glut/glut_8x13.c b/src/libs/glut/glut_8x13.c
similarity index 100%
rename from src/libs/mesa/glut/glut_8x13.c
rename to src/libs/glut/glut_8x13.c
diff --git a/src/libs/mesa/glut/glut_9x15.c b/src/libs/glut/glut_9x15.c
similarity index 100%
rename from src/libs/mesa/glut/glut_9x15.c
rename to src/libs/glut/glut_9x15.c
diff --git a/src/libs/mesa/glut/glut_bitmap.c b/src/libs/glut/glut_bitmap.c
similarity index 100%
rename from src/libs/mesa/glut/glut_bitmap.c
rename to src/libs/glut/glut_bitmap.c
diff --git a/src/libs/mesa/glut/glut_bwidth.c b/src/libs/glut/glut_bwidth.c
similarity index 100%
rename from src/libs/mesa/glut/glut_bwidth.c
rename to src/libs/glut/glut_bwidth.c
diff --git a/src/libs/mesa/glut/glut_ext.c b/src/libs/glut/glut_ext.c
similarity index 100%
rename from src/libs/mesa/glut/glut_ext.c
rename to src/libs/glut/glut_ext.c
diff --git a/src/libs/mesa/glut/glut_hel10.c b/src/libs/glut/glut_hel10.c
similarity index 100%
rename from src/libs/mesa/glut/glut_hel10.c
rename to src/libs/glut/glut_hel10.c
diff --git a/src/libs/mesa/glut/glut_hel12.c b/src/libs/glut/glut_hel12.c
similarity index 100%
rename from src/libs/mesa/glut/glut_hel12.c
rename to src/libs/glut/glut_hel12.c
diff --git a/src/libs/mesa/glut/glut_hel18.c b/src/libs/glut/glut_hel18.c
similarity index 100%
rename from src/libs/mesa/glut/glut_hel18.c
rename to src/libs/glut/glut_hel18.c
diff --git a/src/libs/mesa/glut/glut_mroman.c b/src/libs/glut/glut_mroman.c
similarity index 100%
rename from src/libs/mesa/glut/glut_mroman.c
rename to src/libs/glut/glut_mroman.c
diff --git a/src/libs/mesa/glut/glut_roman.c b/src/libs/glut/glut_roman.c
similarity index 100%
rename from src/libs/mesa/glut/glut_roman.c
rename to src/libs/glut/glut_roman.c
diff --git a/src/libs/mesa/glut/glut_shapes.c b/src/libs/glut/glut_shapes.c
similarity index 100%
rename from src/libs/mesa/glut/glut_shapes.c
rename to src/libs/glut/glut_shapes.c
diff --git a/src/libs/mesa/glut/glut_stroke.c b/src/libs/glut/glut_stroke.c
similarity index 100%
rename from src/libs/mesa/glut/glut_stroke.c
rename to src/libs/glut/glut_stroke.c
diff --git a/src/libs/mesa/glut/glut_swidth.c b/src/libs/glut/glut_swidth.c
similarity index 100%
rename from src/libs/mesa/glut/glut_swidth.c
rename to src/libs/glut/glut_swidth.c
diff --git a/src/libs/mesa/glut/glut_teapot.c b/src/libs/glut/glut_teapot.c
similarity index 100%
rename from src/libs/mesa/glut/glut_teapot.c
rename to src/libs/glut/glut_teapot.c
diff --git a/src/libs/mesa/glut/glut_tr10.c b/src/libs/glut/glut_tr10.c
similarity index 100%
rename from src/libs/mesa/glut/glut_tr10.c
rename to src/libs/glut/glut_tr10.c
diff --git a/src/libs/mesa/glut/glut_tr24.c b/src/libs/glut/glut_tr24.c
similarity index 100%
rename from src/libs/mesa/glut/glut_tr24.c
rename to src/libs/glut/glut_tr24.c
diff --git a/src/libs/mesa/glut/glut_util.c b/src/libs/glut/glut_util.c
similarity index 100%
rename from src/libs/mesa/glut/glut_util.c
rename to src/libs/glut/glut_util.c
diff --git a/src/libs/mesa/glut/glut_vidresize.c b/src/libs/glut/glut_vidresize.c
similarity index 100%
rename from src/libs/mesa/glut/glut_vidresize.c
rename to src/libs/glut/glut_vidresize.c
diff --git a/src/libs/mesa/glut/glutbitmap.h b/src/libs/glut/glutbitmap.h
similarity index 100%
rename from src/libs/mesa/glut/glutbitmap.h
rename to src/libs/glut/glutbitmap.h
diff --git a/src/libs/mesa/glut/glutint.h b/src/libs/glut/glutint.h
similarity index 100%
rename from src/libs/mesa/glut/glutint.h
rename to src/libs/glut/glutint.h
diff --git a/src/libs/mesa/glut/glutstroke.h b/src/libs/glut/glutstroke.h
similarity index 100%
rename from src/libs/mesa/glut/glutstroke.h
rename to src/libs/glut/glutstroke.h
diff --git a/src/libs/mesa/Jamfile b/src/libs/mesa/Jamfile
index 11c0a70763..f4de389579 100644
--- a/src/libs/mesa/Jamfile
+++ b/src/libs/mesa/Jamfile
@@ -1,5 +1,4 @@
 SubDir HAIKU_TOP src libs mesa ;
 
 SubInclude HAIKU_TOP src libs mesa glu ;
-SubInclude HAIKU_TOP src libs mesa glut ;
 SubInclude HAIKU_TOP src libs mesa mesa ;