diff --git a/folly/Makefile.am b/folly/Makefile.am
index 245f4c8..442e070 100644
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -105,8 +105,6 @@ nobase_follyinclude_HEADERS = \
 	experimental/JSONSchema.h \
 	experimental/Select64.h \
 	experimental/SharedMutex.h \
-	experimental/Singleton.h \
-	experimental/Singleton-inl.h \
 	experimental/StringKeyedCommon.h \
 	experimental/StringKeyedUnorderedMap.h \
 	experimental/StringKeyedUnorderedSet.h \
@@ -227,6 +225,8 @@ nobase_follyinclude_HEADERS = \
 	Range.h \
 	RWSpinLock.h \
 	ScopeGuard.h \
+	Singleton.h \
+	Singleton-inl.h \
 	SmallLocks.h \
 	small_vector.h \
 	SocketAddress.h \
@@ -377,6 +377,7 @@ libfolly_la_SOURCES = \
 	Random.cpp \
 	SafeAssert.cpp \
 	SocketAddress.cpp \
+	Singleton.cpp \
 	SpookyHashV1.cpp \
 	SpookyHashV2.cpp \
 	stats/Instantiations.cpp \
@@ -395,7 +396,6 @@ libfolly_la_SOURCES = \
 	experimental/JSONSchema.cpp \
 	experimental/Select64.cpp \
 	experimental/SharedMutex.cpp \
-	experimental/Singleton.cpp \
 	experimental/TestUtil.cpp \
 	wangle/acceptor/Acceptor.cpp \
 	wangle/acceptor/ConnectionManager.cpp \
diff --git a/folly/experimental/Singleton-inl.h b/folly/Singleton-inl.h
similarity index 100%
rename from folly/experimental/Singleton-inl.h
rename to folly/Singleton-inl.h
diff --git a/folly/experimental/Singleton.cpp b/folly/Singleton.cpp
similarity index 98%
rename from folly/experimental/Singleton.cpp
rename to folly/Singleton.cpp
index 1c39326..bfd63e5 100644
--- a/folly/experimental/Singleton.cpp
+++ b/folly/Singleton.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/Singleton.h>
+#include <folly/Singleton.h>
 
 #include <string>
 
diff --git a/folly/experimental/Singleton.h b/folly/Singleton.h
similarity index 99%
rename from folly/experimental/Singleton.h
rename to folly/Singleton.h
index 7af1725..c9868d4 100644
--- a/folly/experimental/Singleton.h
+++ b/folly/Singleton.h
@@ -514,4 +514,4 @@ class Singleton {
 
 }
 
-#include <folly/experimental/Singleton-inl.h>
+#include <folly/Singleton-inl.h>
diff --git a/folly/experimental/SingletonStackTrace.cpp b/folly/SingletonStackTrace.cpp
similarity index 97%
rename from folly/experimental/SingletonStackTrace.cpp
rename to folly/SingletonStackTrace.cpp
index da53574..3e1f87c 100644
--- a/folly/experimental/SingletonStackTrace.cpp
+++ b/folly/SingletonStackTrace.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <folly/experimental/Singleton.h>
+#include <folly/Singleton.h>
 #include <folly/experimental/symbolizer/Symbolizer.h>
 
 namespace folly {
diff --git a/folly/experimental/SingletonVault_c.cpp b/folly/SingletonVault_c.cpp
similarity index 92%
rename from folly/experimental/SingletonVault_c.cpp
rename to folly/SingletonVault_c.cpp
index 92ac83f..5a6d6d4 100644
--- a/folly/experimental/SingletonVault_c.cpp
+++ b/folly/SingletonVault_c.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/SingletonVault_c.h>
-#include <folly/experimental/Singleton.h>
+#include <folly/SingletonVault_c.h>
+#include <folly/Singleton.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/folly/experimental/SingletonVault_c.h b/folly/SingletonVault_c.h
similarity index 100%
rename from folly/experimental/SingletonVault_c.h
rename to folly/SingletonVault_c.h
diff --git a/folly/experimental/JSONSchema.cpp b/folly/experimental/JSONSchema.cpp
index 6978cf6..5413da3 100644
--- a/folly/experimental/JSONSchema.cpp
+++ b/folly/experimental/JSONSchema.cpp
@@ -22,7 +22,7 @@
 #include <folly/Memory.h>
 #include <folly/Optional.h>
 #include <folly/String.h>
-#include <folly/experimental/Singleton.h>
+#include <folly/Singleton.h>
 #include <folly/json.h>
 
 namespace folly {
diff --git a/folly/futures/detail/ThreadWheelTimekeeper.cpp b/folly/futures/detail/ThreadWheelTimekeeper.cpp
index 51965d1..f861af2 100644
--- a/folly/futures/detail/ThreadWheelTimekeeper.cpp
+++ b/folly/futures/detail/ThreadWheelTimekeeper.cpp
@@ -15,7 +15,7 @@
  */
 #include "ThreadWheelTimekeeper.h"
 
-#include <folly/experimental/Singleton.h>
+#include <folly/Singleton.h>
 #include <folly/futures/Future.h>
 #include <future>
 
diff --git a/folly/experimental/test/SingletonTest.cpp b/folly/test/SingletonTest.cpp
similarity index 99%
rename from folly/experimental/test/SingletonTest.cpp
rename to folly/test/SingletonTest.cpp
index f29db47..19baebb 100644
--- a/folly/experimental/test/SingletonTest.cpp
+++ b/folly/test/SingletonTest.cpp
@@ -16,7 +16,7 @@
 
 #include <thread>
 
-#include <folly/experimental/Singleton.h>
+#include <folly/Singleton.h>
 
 #include <folly/Benchmark.h>
 
diff --git a/folly/experimental/test/SingletonVaultCTest.cpp b/folly/test/SingletonVaultCTest.cpp
similarity index 94%
rename from folly/experimental/test/SingletonVaultCTest.cpp
rename to folly/test/SingletonVaultCTest.cpp
index 4fcc1ea..1182278 100644
--- a/folly/experimental/test/SingletonVaultCTest.cpp
+++ b/folly/test/SingletonVaultCTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/Singleton.h>
-#include <folly/experimental/SingletonVault_c.h>
+#include <folly/Singleton.h>
+#include <folly/SingletonVault_c.h>
 
 #include <gtest/gtest.h>
 
diff --git a/folly/wangle/concurrent/GlobalExecutor.cpp b/folly/wangle/concurrent/GlobalExecutor.cpp
index ac7b9ba..36a8215 100644
--- a/folly/wangle/concurrent/GlobalExecutor.cpp
+++ b/folly/wangle/concurrent/GlobalExecutor.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/Singleton.h>
+#include <folly/Singleton.h>
 #include <folly/wangle/concurrent/IOExecutor.h>
 #include <folly/wangle/concurrent/IOThreadPoolExecutor.h>
 #include <folly/futures/InlineExecutor.h>